From 4f97c26b6d8bee0e8be44bef614c238da385d430 Mon Sep 17 00:00:00 2001
From: erichhasl <erich.hasl@gmail.com>
Date: Sat, 18 Nov 2017 13:35:00 +0100
Subject: [PATCH] include header file

---
 web_dev/header.html                           | 129 -----------------
 .../static/public/images}/search_icon.png     | Bin
 web_dev/sas_web/templates/public/base.html    |  16 ++-
 web_dev/sas_web/templates/public/header.html  | 131 ++++++++++++++++++
 4 files changed, 143 insertions(+), 133 deletions(-)
 delete mode 100644 web_dev/header.html
 rename web_dev/{ => sas_web/static/public/images}/search_icon.png (100%)
 create mode 100644 web_dev/sas_web/templates/public/header.html

diff --git a/web_dev/header.html b/web_dev/header.html
deleted file mode 100644
index f8f993e..0000000
--- a/web_dev/header.html
+++ /dev/null
@@ -1,129 +0,0 @@
-        <div id=header>
-            <style>
-                #logo {
-                    width: 90%;
-                    padding-left: 2%;
-                    padding-top: 2%;
-                }
-                .top-links {
-                    color: #929292;
-                    vertical-align: top;
-                    padding-top: 5px;
-                    text-align: center;
-                }
-                #logotablerow {
-                    padding-right: 2%;
-                }
-                #search {
-                    vertical-align: middle;
-                }
-                #search_icon {
-                    width: 80%;
-                    vertical-align: middle;
-                    padding-left: 0px;
-                }
-                table{
-                    border-collapse: collapse;
-                    border: none;
-                }
-                table tr{
-                    border: none;
-                    vertical-align: top;
-                }
-
-                table td{
-                    padding-left: 10px;
-                    padding-top: 2px;
-                    border: none;
-                }
-                .link-container {
-                    text-align: center;
-                    width: 10%;
-                }
-                .allcenter {
-                    vertical-align: middle;
-                    text-align: right;
-                    padding-right: 10px;
-                }
-                #search {
-                    font-size: 16pt;
-                    background: #D6D5D5;
-                    color: black;
-                }
-                #search:focus{
-                    font-size: 16pt;
-                    background: #D6D5D5;
-                    color: black;
-                    outline: none;
-                }
-                ul {
-                    list-style-type: none;
-                    position: relative;
-                    margin-left: 2%;
-                    margin-top: 20px;
-                    width: 96%;
-                    background: #D6D5D5;
-                    border: none;
-                }
-
-                li {
-                    float: left;
-                    width: 30%;
-                    margin-top: 0.5%;
-                    margin-bottom: 0.5%;
-                    vertical-align: middle;
-                    padding-left: 3%;
-                    color: #929292;
-                }
-
-                li a {
-                    display: block;
-                    color: #666;
-                    text-align: center;
-                    padding: 14px 16px;
-                    text-decoration: none;
-                }
-
-                .active {
-                    background: #9F2D17;
-                    color: white;
-                }
-
-                li a:hover:not(.active) {
-                    background: #929292;
-                }
-
-            </style>
-            <table class="table">
-                <tr>
-                <td id ="logotablerow", width="20%">
-                    <img id="logo" src="apb_icon.jpeg" alt="logo">
-                </td>
-                <td class="link-container">
-                    <a class="top-links", href="https://www.tagesschau.de">tagesschau.de</a>
-                </td>
-                <td class="link-container">
-                    <a class="top-links", href="https://www.spiegel.de">spiegel.de</a>
-                </td>
-                <td class="link-container">
-                    <a class="top-links", href="https://www.zeit.de">zeit.de</a>
-                </td>
-                <td class="link-container">
-                    <a class="top-links", href="https://www.bpb.de">bpb.de</a>
-                </td>
-                <td vertical-align="middle", width="25%" class="allcenter">
-                    <input type="text" id="search" maxlength="30" placeholder="Datenbank durchsuchen">
-                </td>
-                <td width="5%" class="allcenter">
-                    <a href="http://www.dohiy.com/wp-content/uploads/2014/06/itsatrap.jpg"><img id="search_icon" src="search_icon.png" alt="search"></a>
-                </td>
-                </tr>
-            </table>
-            <div id="navigation">
-            <ul>
-                <li><a class="active" href="https://www.none.com">Gesetzesblatt</a></li>
-                <li><a href="https://www.none.com">Datenbank</a></li>
-                <li><a href="https://www.none.com">Mein Goethopia</a></li>         
-            </ul>
-            </div>
-        </div>
diff --git a/web_dev/search_icon.png b/web_dev/sas_web/static/public/images/search_icon.png
similarity index 100%
rename from web_dev/search_icon.png
rename to web_dev/sas_web/static/public/images/search_icon.png
diff --git a/web_dev/sas_web/templates/public/base.html b/web_dev/sas_web/templates/public/base.html
index 08f5b5d..c73cd0e 100644
--- a/web_dev/sas_web/templates/public/base.html
+++ b/web_dev/sas_web/templates/public/base.html
@@ -1,8 +1,16 @@
 {% load static %}
 
-<img src="{% static "public/images/apb_icon.png" %}" />
+<html>
+<body> 
+    
+    {% include "public/header.html" %}
 
-{% block content %}
-{% endblock %}
+    {% block content %}
+    {% endblock %}
+
+    <p>Ende Gelände!</p>
+
+</body>
+
+</html>
 
-<p>Impressum: N.H (der ist für alles hier verantwortlich)</p>
diff --git a/web_dev/sas_web/templates/public/header.html b/web_dev/sas_web/templates/public/header.html
new file mode 100644
index 0000000..25f4ee5
--- /dev/null
+++ b/web_dev/sas_web/templates/public/header.html
@@ -0,0 +1,131 @@
+{% load static %}
+
+<div id=header>
+    <style>
+        #logo {
+            width: 90%;
+            padding-left: 2%;
+            padding-top: 2%;
+        }
+        .top-links {
+            color: #929292;
+            vertical-align: top;
+            padding-top: 5px;
+            text-align: center;
+        }
+        #logotablerow {
+            padding-right: 2%;
+        }
+        #search {
+            vertical-align: middle;
+        }
+        #search_icon {
+            width: 80%;
+            vertical-align: middle;
+            padding-left: 0px;
+        }
+        table{
+            border-collapse: collapse;
+            border: none;
+        }
+        table tr{
+            border: none;
+            vertical-align: top;
+        }
+
+        table td{
+            padding-left: 10px;
+            padding-top: 2px;
+            border: none;
+        }
+        .link-container {
+            text-align: center;
+            width: 10%;
+        }
+        .allcenter {
+            vertical-align: middle;
+            text-align: right;
+            padding-right: 10px;
+        }
+        #search {
+            font-size: 16pt;
+            background: #D6D5D5;
+            color: black;
+        }
+        #search:focus{
+            font-size: 16pt;
+            background: #D6D5D5;
+            color: black;
+            outline: none;
+        }
+        ul {
+            list-style-type: none;
+            position: relative;
+            margin-left: 2%;
+            margin-top: 20px;
+            width: 96%;
+            background: #D6D5D5;
+            border: none;
+        }
+
+        li {
+            float: left;
+            width: 30%;
+            margin-top: 0.5%;
+            margin-bottom: 0.5%;
+            vertical-align: middle;
+            padding-left: 3%;
+            color: #929292;
+        }
+
+        li a {
+            display: block;
+            color: #666;
+            text-align: center;
+            padding: 14px 16px;
+            text-decoration: none;
+        }
+
+        .active {
+            background: #9F2D17;
+            color: white;
+        }
+
+        li a:hover:not(.active) {
+            background: #929292;
+        }
+
+    </style>
+    <table class="table">
+        <tr>
+        <td id ="logotablerow", width="20%">
+            <img id="logo" src="{% static "public/images/apb_icon.png" %}" alt="logo">
+        </td>
+        <td class="link-container">
+            <a class="top-links", href="https://www.tagesschau.de">tagesschau.de</a>
+        </td>
+        <td class="link-container">
+            <a class="top-links", href="https://www.spiegel.de">spiegel.de</a>
+        </td>
+        <td class="link-container">
+            <a class="top-links", href="https://www.zeit.de">zeit.de</a>
+        </td>
+        <td class="link-container">
+            <a class="top-links", href="https://www.bpb.de">bpb.de</a>
+        </td>
+        <td vertical-align="middle", width="25%" class="allcenter">
+            <input type="text" id="search" maxlength="30" placeholder="Datenbank durchsuchen">
+        </td>
+        <td width="5%" class="allcenter">
+            <a href="http://www.dohiy.com/wp-content/uploads/2014/06/itsatrap.jpg"><img id="search_icon" src="{% static "public/images/search_icon.png" %}" alt="search"></a>
+        </td>
+        </tr>
+    </table>
+    <div id="navigation">
+    <ul>
+        <li><a class="active" href="https://www.none.com">Gesetzesblatt</a></li>
+        <li><a href="https://www.none.com">Datenbank</a></li>
+        <li><a href="https://www.none.com">Mein Goethopia</a></li>         
+    </ul>
+    </div>
+</div>