From 350f1c14055ad01ddba8d0feef291afb3b53a723 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 28 Aug 2014 18:01:00 +0200
Subject: [PATCH] Use inherited templates for error page.

---
 qutebrowser/html/base.html  |  29 ++++++++++
 qutebrowser/html/error.html | 110 ++++++++++++++++--------------------
 2 files changed, 77 insertions(+), 62 deletions(-)
 create mode 100644 qutebrowser/html/base.html
diff --git a/qutebrowser/html/base.html b/qutebrowser/html/base.html
new file mode 100644
index 000000000..51bf2f431
--- /dev/null
+++ b/qutebrowser/html/base.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- vim: ft=html fileencoding=utf-8 sts=4 sw=4 et: -->
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>{{ title }}</title>
+        {% if icon %}
+            <link rel='icon' type='image/png' href="{{ icon }}">
+        {% endif %}
+        <style type="text/css">
+            {% block style %}
+            body {
+                background-color: #fff;
+                margin: 0;
+                padding: 0;
+            }
+            {% endblock %}
+        </style>
+        <script type="text/javascript">
+            {% block script %}
+            {% endblock %}
+        </script>
+    </head>
+    <body>
+        {% block content %}
+        {% endblock %}
+    </body>
+</html>
diff --git a/qutebrowser/html/error.html b/qutebrowser/html/error.html
index fc05a54d3..664725f1e 100644
--- a/qutebrowser/html/error.html
+++ b/qutebrowser/html/error.html
@@ -1,67 +1,53 @@
-<!DOCTYPE html>
-<!--
-vim: ft=html fileencoding=utf-8 sts=4 sw=4 et:
-Based on html/error.html from dwb
--->
+{% extends "base.html" %}
+{% block style %}
+{{ super() }}
+#errorContainer {
+    background: #fff;
+    min-width: 35em;
+    max-width: 35em;
+    position: absolute;
+    top: 2em;
+    left: 1em;
+    padding: 10px;
+    border: 2px solid #eee;
+    -webkit-border-radius: 5px;
+}
 
-<html>
-    <head>
-        <meta charset="utf-8">
-        <title>{{ title }}</title>
-        <!--<link rel='icon' type='image/png' href="{{ icon }}">-->
-        <style type="text/css">
-            body {
-                background-color: #fff;
-                margin: 0;
-                padding: 0;
-            }
+#errorTitleText {
+    font-size: 118%;
+    font-weight: bold;
+}
 
-            #errorContainer {
-                background: #fff;
-                min-width: 35em;
-                max-width: 35em;
-                position: absolute;
-                top: 2em;
-                left: 1em;
-                padding: 10px;
-                border: 2px solid #eee;
-                -webkit-border-radius: 5px;
-            }
+#errorMessageText {
+    font-size: 80%;
+}
+{% endblock %}
 
-            #errorTitleText {
-                font-size: 118%;
-                font-weight: bold;
-            }
+{% block script %}
+{{ super() }}
+function tryagain()
+{
+    location.reload();
+}
+function searchFor(uri) {
+    location.href = uri;
+}
+{% endblock %}
 
-            #errorMessageText {
-                font-size: 80%;
-            }
-        </style>
-        <script type="text/javascript">
-            function tryagain()
-            {
-                location.reload();
-            }
-            function searchFor(uri) {
-                location.href = uri;
-            }
-        </script>
-    </head>
-    <body>
-        <div id="errorContainer">
-            <div id="errorTitle">
-                <p id="errorTitleText">Unable to load page</p>
-            </div>
-            <div id="errorMessage">
-                <p>Problem occurred while loading the URL {{ url }}</p>
-                <p id="errorMessageText">{{ error }}</p>
-            </p>
-            </div>
+{% block content %}
+<div id="errorContainer">
+    <div id="errorTitle">
+        <p id="errorTitleText">Unable to load page</p>
+    </div>
+    <div id="errorMessage">
+        <p>Problem occurred while loading the URL {{ url }}</p>
+        <p id="errorMessageText">{{ error }}</p>
+    </p>
+    </div>
 
-            <form name="bl">
-                <input type="button" value="Try again" onclick="javascript:tryagain()" />
-                <!--<input type="button" value="Search" style="visibility:%s" onclick="javascript:searchFor('%s')" />-->
-            </form>
-        </div>
-    </body>
-</html>
+    <form name="bl">
+        <input type="button" value="Try again" onclick="javascript:tryagain()" />
+        <!--<input type="button" value="Search" style="visibility:%s" onclick="javascript:searchFor('%s')" />-->
+    </form>
+</div>
+{% endblock %}
