Added "pretty" CSRF error page. Bug 616323.

settings.py

@@ -141,6 +141,8 @@ def __new__(self):
 
 # Templates
 
+CSRF_FAILURE_VIEW = '%s.urls.handler_csrf' % ROOT_PACKAGE
+
 TEMPLATE_DIRS = (
     path('templates'),
 )
@@ -258,7 +260,7 @@ def JINJA_CONFIG():
     'commonware.middleware.FrameOptionsHeader',
 )
 
-ROOT_URLCONF = 'reporter.urls'
+ROOT_URLCONF = '%s.urls' % ROOT_PACKAGE
 
 INSTALLED_APPS = [
     'input',  # comes first so it always takes precedence.

templates/csrf_error.html

@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="block prose">
+  <h2>{% block page_title %}{{ _('CSRF Protection Error') }}{% endblock %}</h2>
+
+  <p>
+    {% trans %}
+    There was an error verifying your CSRF token. Your request could not be
+    processed. We apologize for the inconvenience!
+    {% endtrans %}
+  </p>
+
+  <p>
+    {% trans cookies_url='http://support.mozilla.com/kb/Cookies' %}
+    The most likely cause of this error is that your browser is set up
+    <strong>not to accept cookies</strong> from us. Please follow
+    <a href="{{ cookies_url }}">these instructions</a> to enable cookies in
+    Firefox, then try again.
+    {% endtrans %}
+  </p>
+
+  <p>
+    {% trans bug_url='https://bugzilla.mozilla.org/enter_bug.cgi?product=Webtools&component=Input' %}
+    If the problem persists, please <a href="{{ bug_url }}">file a bug.</a> Thanks!
+    {% endtrans %}
+  </p>
+</div>
+{% endblock %}

templates/includes/channel_switcher.html

@@ -1,13 +1,15 @@
-<form class="channels go" method="get" action="{{ url('dashboard') }}">
-  <span class="selectbox">
-    <span>{{ CHANNELS[CHANNEL].pretty }}</span>
-    <select id="channel" name="channel" dir="ltr">
-      {% for ch in CHANNEL_USAGE -%}
-        <option value="{{ ch.short }}" {{ ch.short|ifeq(CHANNEL, "selected") }}>
-          {{ ch.pretty }}
-        </option>
-      {%- endfor %}
-    </select>
-  </span>
-  <button type="submit">{{ _('Go') }}</button>
-</form>
+{% if CHANNEL %}
+  <form class="channels go" method="get" action="{{ url('dashboard') }}">
+    <span class="selectbox">
+      <span>{{ CHANNELS[CHANNEL].pretty }}</span>
+      <select id="channel" name="channel" dir="ltr">
+        {% for ch in CHANNEL_USAGE -%}
+          <option value="{{ ch.short }}" {{ ch.short|ifeq(CHANNEL, "selected") }}>
+            {{ ch.pretty }}
+          </option>
+        {%- endfor %}
+      </select>
+    </span>
+    <button type="submit">{{ _('Go') }}</button>
+  </form>
+{% endif %}

urls.py

@@ -10,6 +10,7 @@ def _error_page(request, status):
     return jingo.render(request, '%d.html' % status, status=status)
 handler404 = lambda r: _error_page(r, 404)
 handler500 = lambda r: _error_page(r, 500)
+handler_csrf = lambda r, reason: jingo.render(r, 'csrf_error.html')
 
 
 admin.autodiscover()