Merge branch 'issue-241' into 'master'

Fix http 500 page

Closes #241

circle/common/views.py

@@ -25,9 +25,9 @@ def handler500(request):
                     ctx['error'] = exception.get_admin_text()
                     ctx['error'] = exception.get_admin_text()
             except:
             except:
                 pass
                 pass
-        try:
-            resp = render_to_response("500.html", ctx, RequestContext(request))
-        except:
-            resp = render_to_response("500.html", ctx)
-        resp.status_code = 500
-        return resp
+    try:
+        resp = render_to_response("500.html", ctx, RequestContext(request))
+    except:
+        resp = render_to_response("500.html", ctx)
+    resp.status_code = 500
+    return resp

circle/templates/500.html

@@ -6,11 +6,18 @@
 {% block page_title %}{% trans ":(" %}{% endblock page_title %}
 {% block page_title %}{% trans ":(" %}{% endblock page_title %}
 
 
 {% block content %}
 {% block content %}
-<div style="margin-top: 4em;">
-{% if error %}
-<p>{{ error }}</p>
-{% else %}
-<p>{% trans "Internal Server Error... Please leave the server alone..." %}</p>
-{% endif %}
+<div class="alert alert-danger" style="font-size: 22px; margin-top: 2em;">
+  <div class="row">
+    <div class="col-md-2" style="text-align: center;">
+      HTTP 500
+    </div>
+    <div class="col-md-10" style="text-align: center;">
+      {% if error %}
+        {{ error }}
+      {% else %}
+       {% trans "Internal Server Error... Please leave the server alone..." %}
+      {% endif %}
+    </div>
+  </div>
 </div>
 </div>
 {% endblock content %}
 {% endblock content %}