Skip to content

Commit 6c2d1a8

Browse files
rouiljrouilj
committed
Updated _generic.404.html to use the page template so 404 errors still
look like they are associated with the tracker. Added a section header to updgrading.txt for an existing change in release 1.6 since I added a new section.
1 parent 39d368f commit 6c2d1a8

File tree

6 files changed

+71
-32
lines changed

6 files changed

+71
-32
lines changed

‎CHANGES.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ Features:
3333
counts etc. where a decimal point isn't needed. Developed by
3434
Anthony (antmail). Doc updates written by John Rouillard. (applied
3535
by John Rouillard)
36+
- Updated html/_generic.404.html to use the page template. So 404
37+
errors now include the left hand menu, a proper page title and
38+
body content. Note added to doc/upgrading.txt on how to add it to
39+
deployed trackers. (John Rouillard)
3640

3741
Fixed:
3842

‎doc/upgrading.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ Contents:
2323
Migrating from 1.5.1 to 1.6.0
2424
=============================
2525

26+
Database back end specified in config.ini
27+
--------------------
28+
2629
The ``db/backend_name`` file is no longer used to configure the database
2730
backend being used for a tracker. The backend is now configured in the
2831
``config.ini`` file using the ``backend`` option located in the ``[rdbms]``
@@ -44,6 +47,18 @@ Note: the ``backend_name`` file may be located in a directory other than
4447
``db/`` if you have configured the ``database`` option in the ``[main]``
4548
section of the ``config.ini`` file to be something other than ``db``.
4649

50+
html/_generic.404.html in trackers use page template
51+
--------------------
52+
53+
The original generic 404 error pages for many trackers did not use the
54+
standard page layout. This change replaces the html/_generic.404.html
55+
page with one that uses the page template.
56+
57+
If your deployed tracker is based on: classic, minimal, responsive or
58+
devel templates and has not changed the html/_generic.404.html file,
59+
you can copy in the new file to get this additional functionality.
60+
61+
4762
Migrating from 1.5.0 to 1.5.1
4863
=============================
4964

‎share/roundup/templates/classic/html/_generic.404.html‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
<html>
2-
<head>
3-
<title>Item Not Found</title>
4-
</head>
1+
<!-- dollarId: issue.item,v 1.4 2001/08/03 01:19:43 richard Exp dollar-->
2+
<tal:block metal:use-macro="templates/page/macros/icing">
3+
<title metal:fill-slot="head_title">
4+
Item Not Found
5+
</title>
6+
<tal:block metal:fill-slot="body_title">
7+
Item Not Found
8+
</tal:block>
59

6-
<body>
7-
There is no <span tal:content="context/_classname" /> with id <span tal:content="context/id"/>
8-
</body>
9-
</html>
10+
<td class="content" metal:fill-slot="content">
11+
There is no <span tal:content="context/_classname" /> with id
12+
<span tal:content="context/id"/>
13+
</td>
14+
</tal:block>

‎share/roundup/templates/devel/html/_generic.404.html‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
<html>
2-
<head>
3-
<title>Item Not Found</title>
4-
</head>
1+
<!-- dollarId: issue.item,v 1.4 2001/08/03 01:19:43 richard Exp dollar-->
2+
<tal:block metal:use-macro="templates/page/macros/icing">
3+
<title metal:fill-slot="head_title">
4+
Item Not Found
5+
</title>
6+
<tal:block metal:fill-slot="body_title">
7+
Item Not Found
8+
</tal:block>
59

6-
<body>
7-
There is no <span tal:content="context/_classname" /> with id <span tal:content="context/id"/>
8-
</body>
9-
</html>
10+
<td class="content" metal:fill-slot="content">
11+
There is no <span tal:content="context/_classname" /> with id
12+
<span tal:content="context/id"/>
13+
</td>
14+
</tal:block>

‎share/roundup/templates/minimal/html/_generic.404.html‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
<html>
2-
<head>
3-
<title>Item Not Found</title>
4-
</head>
1+
<!-- dollarId: issue.item,v 1.4 2001/08/03 01:19:43 richard Exp dollar-->
2+
<tal:block metal:use-macro="templates/page/macros/icing">
3+
<title metal:fill-slot="head_title">
4+
Item Not Found
5+
</title>
6+
<tal:block metal:fill-slot="body_title">
7+
Item Not Found
8+
</tal:block>
59

6-
<body>
7-
There is no <span tal:content="context/_classname" /> with id <span tal:content="context/id"/>
8-
</body>
9-
</html>
10+
<td class="content" metal:fill-slot="content">
11+
There is no <span tal:content="context/_classname" /> with id
12+
<span tal:content="context/id"/>
13+
</td>
14+
</tal:block>

‎share/roundup/templates/responsive/html/_generic.404.html‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
<html>
2-
<head>
3-
<title>Item Not Found</title>
4-
</head>
1+
<!-- dollarId: issue.item,v 1.4 2001/08/03 01:19:43 richard Exp dollar-->
2+
<tal:block metal:use-macro="templates/page/macros/icing">
3+
<title metal:fill-slot="head_title">
4+
Item Not Found
5+
</title>
6+
<tal:block metal:fill-slot="body_title">
7+
Item Not Found
8+
</tal:block>
59

6-
<body>
7-
There is no <span tal:content="context/_classname" /> with id <span tal:content="context/id"/>
8-
</body>
9-
</html>
10+
<td class="content" metal:fill-slot="content">
11+
There is no <span tal:content="context/_classname" /> with id
12+
<span tal:content="context/id"/>
13+
</td>
14+
</tal:block>

0 commit comments

Comments
 (0)