Using the same components for title-text

author: Katharina Fey <kookie@spacekookie.de> 2018-01-22 22:20:24 +0100
committer: Katharina Fey <kookie@spacekookie.de> 2018-01-22 22:20:24 +0100
commit: 7876c2efa6de701d951cfb07ebd70f1248893c0c (patch)
tree: 2ad33d28e124d866603a652482ccab7bc219074a
parent: 26f2dbad6fcecfc97b8e86cd5567076e2b31214e (diff)
5 files changed, 39 insertions, 65 deletions
diff --git a/crumbs/templates/base.html b/crumbs/templates/base.html
index 69ecd4b..dfe7139 100755
--- a/crumbs/templates/base.html
+++ b/crumbs/templates/base.html
@@ -1,21 +1,8 @@
 <!DOCTYPE html>
 <html lang="{{ DEFAULT_LANG }}">
-    <head>
-        <meta charset="utf-8">
-        <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
-
-        <!-- Load bootstrap, then my own CSS -->
-        <!-- <link href="{{ SITEURL }}/theme/css/bootstrap.min.css" rel="stylesheet"> -->
-        <link href="{{ SITEURL }}/theme/css/pygment.css" rel="stylesheet">
-        <link href="{{ SITEURL }}/theme/css/crumbs.css" rel="stylesheet">
-        <link href="{{ SITEURL }}/theme/css/cr_gay_override.css" rel="stylesheet">
-
-        <!-- Load Montserrat, Inconsolata and font-awesome -->
-        <link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,400,500;subset=cyrillic,latin-ext" rel="stylesheet"> 
-        <link href="https://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet"> 
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-        
-    </head>
+    {% with type='base' %}
+    {% include "components/html_head.html" %}
+    {% endwith %}
 
     <body class="not-home">
         <div class="container">
@@ -23,13 +10,9 @@
             <!-- HEADER FOR EVERY PAGE -->
             <div class="navigation">
 
-                <div class="page-title" title="Inconsolata is my favourite monospace font, after all...">
-                    <span id="t-color-red"><b># ~ </b></span>
-                    <span id="t-color-org">Fun</span>
-                    <span id="t-color-ylw">Memory</span>
-                    <span id="t-color-grn">Violations</span>
-                    <span class="cursor" id="cursor">&nbsp;▁</span>
-                </div>
+                {% with title_type='page-title' %}
+                {% include "components/title_text.html" %}
+                {% endwith %}
 
                 <!-- Loop through all pages -->
                 {% for title, link in MENUITEMS %}
diff --git a/crumbs/templates/components/header.html b/crumbs/templates/components/header.html
deleted file mode 100644
index 2d811d8..0000000
--- a/crumbs/templates/components/header.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<head>
-    <meta charset="utf-8">
-    <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
-    <link href="{{ SITEURL }}/theme/css/pygment.css" rel="stylesheet">
-    <link href="{{ SITEURL }}/theme/css/crumbs.css" rel="stylesheet">
-    <link href="{{ SITEURL }}/theme/css/cr_gay_override.css" rel="stylesheet">
-
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,400,500;subset=cyrillic,latin-ext" rel="stylesheet"> 
-    <link href="https://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet"> 
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-    
-</head>
diff --git a/crumbs/templates/components/html_head.html b/crumbs/templates/components/html_head.html
new file mode 100644
index 0000000..3499ffa
--- /dev/null
+++ b/crumbs/templates/components/html_head.html
@@ -0,0 +1,18 @@
+<head>
+    <meta charset="utf-8">
+    <title>{{ SITENAME }}</title>
+
+    {% if type == 'home' %}
+        <link href="{{ SITEURL }}/theme/css/crumbs.css" rel="stylesheet">
+        <link href="{{ SITEURL }}/theme/css/cr_title.css" rel="stylesheet">
+    {% else %}
+        <link href="{{ SITEURL }}/theme/css/pygment.css" rel="stylesheet">
+        <link href="{{ SITEURL }}/theme/css/crumbs.css" rel="stylesheet">
+        <link href="{{ SITEURL }}/theme/css/cr_gay_override.css" rel="stylesheet">
+    {% endif %}
+
+    <link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,400,500;subset=cyrillic,latin-ext" rel="stylesheet"> 
+    <link href="https://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet"> 
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+
+</head>
+\ No newline at end of file
diff --git a/crumbs/templates/components/title_text.html b/crumbs/templates/components/title_text.html
index a86a77d..e0fda8c 100644
--- a/crumbs/templates/components/title_text.html
+++ b/crumbs/templates/components/title_text.html
@@ -1,7 +1,13 @@
-<div class="page-title" title="Inconsolata is my favourite monospace font, after all...">
+<div class="{{ title_type }}" title="Inconsolata is my favourite monospace font, after all...">
+    {% if title_type == 'title' %}
+    <h1>
+    {% endif %}
     <span id="t-color-red"><b># ~ </b></span>
     <span id="t-color-org">Fun</span>
     <span id="t-color-ylw">Memory</span>
     <span id="t-color-grn">Violations</span>
     <span class="cursor" id="cursor">&nbsp;▁</span>
+    {% if title_type == 'title' %}
+    </h1>
+    {% endif %}
 </div>
diff --git a/crumbs/templates/home.html b/crumbs/templates/home.html
index 5106d4b..bb8f24a 100755
--- a/crumbs/templates/home.html
+++ b/crumbs/templates/home.html
@@ -1,20 +1,8 @@
 <!DOCTYPE html>
 <html lang="{{ DEFAULT_LANG }}">
-    <head>
-        <meta charset="utf-8">
-        <title>{{ SITENAME }}</title>
-
-        <!-- Load bootstrap, then my own CSS -->
-        <!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> -->
-        <!-- <link href="{{ SITEURL }}/theme/css/bootstrap.min.css" rel="stylesheet"> -->
-        <link href="{{ SITEURL }}/theme/css/crumbs.css" rel="stylesheet">
-       <link href="{{ SITEURL }}/theme/css/cr_title.css" rel="stylesheet">
-
-        <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,500" rel="stylesheet">
-        <link href="https://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet"> 
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-    </head>
+    {% with type='home' %}
+    {% include "components/html_head.html" %}
+    {% endwith %}
 
     <body class="home">
 
@@ -34,20 +22,11 @@
                     {% endif %}
                 {% endfor %}
             </div>
-            <!-- /Static navbar -->
-
-            <!-- <hr/> -->
-
-            <!-- The page title -->
-            <div class="title" title="Inconsolata is my favourite monospace font, after all...">
-                <h1>
-                    <span id="t-color-red"><b># ~ </b></span>
-                    <span id="t-color-org">Fun</span>
-                    <span id="t-color-ylw">Memory</span>
-                    <span id="t-color-grn">Violations</span>
-                    <span class="cursor" id="cursor">▁</span>
-                </h1>
-            </div>
+            
+            {% with title_type='title' %}
+            {% include "components/title_text.html" %}
+            {% endwith %}
+        
 
         {% include "components/super_gay.html" %}
author	Katharina Fey <kookie@spacekookie.de>	2018-01-22 22:20:24 +0100
committer	Katharina Fey <kookie@spacekookie.de>	2018-01-22 22:20:24 +0100
commit	7876c2efa6de701d951cfb07ebd70f1248893c0c (patch)
tree	2ad33d28e124d866603a652482ccab7bc219074a
parent	26f2dbad6fcecfc97b8e86cd5567076e2b31214e (diff)