Merge lp:~milo/linaro-android-frontend/bug1020010 into lp:linaro-android-frontend

Proposed by Milo Casagrande
Status: Merged
Approved by: Stevan Radaković
Approved revision: 292
Merged at revision: 292
Proposed branch: lp:~milo/linaro-android-frontend/bug1020010
Merge into: lp:linaro-android-frontend
Diff against target: 34 lines (+25/-0)
2 files modified
android_build/templates/404.html (+11/-0)
android_build/templates/500.html (+14/-0)
To merge this branch: bzr merge lp:~milo/linaro-android-frontend/bug1020010
Reviewer Review Type Date Requested Status
Stevan Radaković Approve
Данило Шеган Pending
Review via email: mp+137610@code.launchpad.net

Description of the change

The proposed branch adds two new simple templates to handle 404 and 500 errors.
When debug is off, Django looks for these templates in the templates directory,
if they are not found the default 500 error page is shown.

To post a comment you must log in.
Revision history for this message
Stevan Radaković (stevanr) wrote :

Thanks Milo.
Tested locally and it works good.
I see that it's already deployed on staging and that it also works.
Approve +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'android_build/templates/404.html'
--- android_build/templates/404.html 1970-01-01 00:00:00 +0000
+++ android_build/templates/404.html 2012-12-03 15:51:26 +0000
@@ -0,0 +1,11 @@
1{% extends "base.html" %}
2
3{% block content %}
4<h1>Page Not Found!</h1>
5
6<div>
7 <p>
8 The requested page could not be found.
9 </p>
10</div>
11{% endblock %}
012
=== added file 'android_build/templates/500.html'
--- android_build/templates/500.html 1970-01-01 00:00:00 +0000
+++ android_build/templates/500.html 2012-12-03 15:51:26 +0000
@@ -0,0 +1,14 @@
1{% extends "base.html" %}
2
3{% block content %}
4<h1>Page Not Available!</h1>
5
6<div>
7 <p>
8 The requested page is not available due to a server error.
9 </p>
10 <p>
11 The error has been reported. Please check back later.
12 </p>
13</div>
14{% endblock %}

Subscribers

People subscribed via source and target branches