awstrial

Merge lp:~mhall119/awstrial/add-error-code-872318 into lp:awstrial

  1. add-error-code-872318
  2. Merge into trunk
Proposed by Michael Hall
Status: Merged
Approved by: Matthew Nuzum
Approved revision: 265
Merged at revision: 265
Proposed branch: lp:~mhall119/awstrial/add-error-code-872318
Merge into: lp:awstrial
Diff against target: 86 lines (+39/-5)
3 files modified
awstrial/templates/404.html (+8/-2)
awstrial/templates/500.html (+7/-1)
awstrial/templates/503.html (+24/-2)
To merge this branch: bzr merge lp:~mhall119/awstrial/add-error-code-872318
Reviewer Review Type Date Requested Status
Matthew Nuzum (community) Approve
Review via email: mp+79958@code.launchpad.net

Commit message

Add HTTP status code to error pages. Fix images on error pages

Description of the change

Add HTTP status code to error pages. Fix images on error pages

To post a comment you must log in.
Revision history for this message
Matthew Nuzum (newz) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'awstrial/templates/404.html'
2--- awstrial/templates/404.html 2011-10-04 15:26:38 +0000
3+++ awstrial/templates/404.html 2011-10-20 13:16:25 +0000
4@@ -9,6 +9,12 @@
5 {% endwith %}
6 {% endblock %}
7
8+{% block logo_img %}
9+{% with '/ubuntu-website/media' as ubuntu_website_media %}
10+{{ block.super }}
11+{% endwith %}
12+{% endblock %}
13+
14 {% block extrahead %}
15 {% with '/media' as MEDIA_URL %}
16 {{ block.super }}
17@@ -18,6 +24,6 @@
18
19
20 {% block content %}
21-<h3>Oops!</h3>
22-<p>This page could not be found (404)</p>
23+<h2>404</h2>
24+<p>This page could not be found</p>
25 {% endblock %}
26
27=== modified file 'awstrial/templates/500.html'
28--- awstrial/templates/500.html 2011-10-04 15:26:38 +0000
29+++ awstrial/templates/500.html 2011-10-20 13:16:25 +0000
30@@ -9,6 +9,12 @@
31 {% endwith %}
32 {% endblock %}
33
34+{% block logo_img %}
35+{% with '/ubuntu-website/media' as ubuntu_website_media %}
36+{{ block.super }}
37+{% endwith %}
38+{% endblock %}
39+
40 {% block extrahead %}
41 {% with '/media' as MEDIA_URL %}
42 {{ block.super }}
43@@ -17,6 +23,6 @@
44 {% block main_nav_links %}{% endblock %}
45
46 {% block content %}
47-<h3>Oops!</h3>
48+<h2>500</h2>
49 <p>It seems an error has been encountered, we have been informed. Please try again later.</p>
50 {% endblock %}
51
52=== modified file 'awstrial/templates/503.html'
53--- awstrial/templates/503.html 2011-09-15 15:20:29 +0000
54+++ awstrial/templates/503.html 2011-10-20 13:16:25 +0000
55@@ -1,7 +1,29 @@
56 {% extends "base.html" %}
57-{% block header %}
58+
59+
60+{% block title %}Error | Try Ubuntu Cloud Guest{% endblock %}
61+
62+{% block defaulthead %}
63+{% with '/ubuntu-website/media' as ubuntu_website_media %}
64+{{ block.super }}
65+{% endwith %}
66+{% endblock %}
67+
68+{% block logo_img %}
69+{% with '/ubuntu-website/media' as ubuntu_website_media %}
70+{{ block.super }}
71+{% endwith %}
72+{% endblock %}
73+
74+{% block extrahead %}
75+{% with '/media' as MEDIA_URL %}
76+{{ block.super }}
77+{% endwith %}
78 <meta http-equiv="REFRESH" content="0;url=http://ubuntu.com/cloud"></HEAD>
79 {% endblock %}
80+{% block main_nav_links %}{% endblock %}
81+
82 {% block content %}
83-<h1>There was an error fulfilling the request at this time. Please try again later.</h1>
84+<h2>503</h2>
85+<p>There was an error fulfilling the request at this time. Please try again later.</p>
86 {% endblock %}

Subscribers

People subscribed via source and target branches