templates: Use a common template for error pages.

templates/404.html

@@ -1,4 +1,4 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Error") }} | Zulip</title>
@@ -6,10 +6,7 @@
 
 {% block portico_class_name %}error{% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/400art.svg') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -22,7 +19,4 @@
         </p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
 {% endblock %}

templates/4xx.html

@@ -1,4 +1,4 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Error") }} | Zulip</title>
@@ -6,10 +6,7 @@
 
 {% block portico_class_name %}error{% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <div class="errorbox">
     <div class="errorcontent">
         {% if csrf_failure %}
@@ -47,7 +44,4 @@
         {% endif %}
     </div>
 </div>
-        </div>
-    </div>
-</div>
 {% endblock %}

templates/500.html

@@ -1,4 +1,4 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Internal server error") }} | Zulip</title>
@@ -11,10 +11,7 @@
 
 {% block portico_class_name %}error{% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/500art.svg') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -49,8 +46,4 @@
         {% endif %}
     </div>
 </div>
-        </div>
-    </div>
-</div>
-
 {% endblock %}

templates/confirmation/link_does_not_exist.html

@@ -1,13 +1,10 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Confirmation link does not exist") }} | Zulip</title>
 {% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/400art.svg') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -19,7 +16,4 @@
         </p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
 {% endblock %}

templates/confirmation/link_expired.html

@@ -1,13 +1,10 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Confirmation link expired or deactivated") }} | Zulip</title>
 {% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img class="hourglass-img" src="{{ static('images/errors/timeout_hourglass.png') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -15,7 +12,4 @@
         <p>{{ _("Please contact your organization administrator for a new link.") }}</p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
 {% endblock %}

templates/confirmation/link_malformed.html

@@ -1,13 +1,10 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Confirmation link malformed") }} | Zulip</title>
 {% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/500art.svg') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -20,7 +17,4 @@
         </p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
 {% endblock %}

templates/corporate/billing/remote_realm_login_error_for_server_on_active_plan.html

@@ -1,4 +1,4 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Plan management not available") }} | Zulip</title>
@@ -6,10 +6,7 @@
 
 {% block portico_class_name %}error{% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/400art.svg') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -32,7 +29,4 @@
         </p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
 {% endblock %}

templates/corporate/billing/remote_server_login_error_for_any_realm_on_active_plan.html

@@ -1,4 +1,4 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Plan management not available") }} | Zulip</title>
@@ -6,10 +6,7 @@
 
 {% block portico_class_name %}error{% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/400art.svg') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -28,7 +25,4 @@
         </p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
 {% endblock %}

templates/corporate/billing/remote_server_rate_limit_exceeded.html

@@ -1,14 +1,10 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Rate limit exceeded") }} | Zulip</title>
 {% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/500art.svg') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -20,8 +16,4 @@
         </p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
-
 {% endblock %}

templates/zerver/auth_subdomain.html

@@ -1,14 +1,10 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Authentication subdomain error") }} | Zulip</title>
 {% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/500art.svg') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -24,8 +20,4 @@
         </p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
-
 {% endblock %}

templates/zerver/insecure_desktop_app.html

@@ -1,14 +1,10 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Update required") }} | Zulip</title>
 {% endblock %}
 
-{% block content %}
+{% block error_page_content%}
-
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/400art.svg') }}" alt=""/>
 <div class="errorbox config-error">
     <div class="errorcontent">
@@ -35,10 +31,5 @@
             </a>
         </p>
     </div>
-
 </div>
-        </div>
-    </div>
-</div>
-
 {% endblock %}

templates/zerver/portico_error_page.html

@@ -0,0 +1,12 @@
+{% extends "zerver/portico.html" %}
+
+{% block portico_content %}
+<div class="error_page">
+    <div class="container">
+        <div class="row-fluid">
+            {% block error_page_content %}
+            {% endblock %}
+        </div>
+    </div>
+</div>
+{% endblock %}

templates/zerver/rate_limit_exceeded.html

@@ -1,14 +1,10 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Rate limit exceeded") }} | Zulip</title>
 {% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/500art.svg') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -20,8 +16,4 @@
         </p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
-
 {% endblock %}

templates/zerver/realm_creation_disabled.html

@@ -1,13 +1,10 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Organization creation link required") }} | Zulip</title>
 {% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/500art.svg') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -20,7 +17,4 @@
         </p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
 {% endblock %}

templates/zerver/realm_creation_link_invalid.html

@@ -1,13 +1,10 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Organization creation link expired or invalid") }} | Zulip</title>
 {% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img class="hourglass-img" src="{{ static('images/errors/timeout_hourglass.png') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -19,7 +16,4 @@
         </p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
 {% endblock %}

templates/zerver/remote_realm_server_mismatch_error.html

@@ -1,4 +1,4 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Error") }} | Zulip</title>
@@ -6,10 +6,7 @@
 
 {% block portico_class_name %}error{% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/400art.svg') }}" alt=""/>
 <div class="errorbox">
     <div class="errorcontent">
@@ -25,7 +22,4 @@
         </p>
     </div>
 </div>
-        </div>
-    </div>
-</div>
 {% endblock %}

templates/zerver/unsupported_browser.html

@@ -1,14 +1,10 @@
-{% extends "zerver/portico.html" %}
+{% extends "zerver/portico_error_page.html" %}
 
 {% block title %}
 <title>{{ _("Unsupported browser") }} | Zulip</title>
 {% endblock %}
 
-{% block portico_content %}
+{% block error_page_content %}
-
-<div class="error_page">
-    <div class="container">
-        <div class="row-fluid">
 <img src="{{ static('images/errors/400art.svg') }}" alt=""/>
 <div class="errorbox config-error">
     <div class="errorcontent">
@@ -30,10 +26,5 @@
             {% endtrans %}
         </p>
     </div>
-
 </div>
-        </div>
-    </div>
-</div>
-
 {% endblock %}