qmsk_www templates: move layout into site template
authorTero Marttila <terom@paivola.fi>
Sun, 14 Sep 2014 14:26:32 +0300
changeset 227 7688463b295d
parent 226 26ec457d0eb2
child 228 5b43febfe484
qmsk_www templates: move layout into site template
qmsk_www/templates/site.html
qmsk_www_pages/templates/pages/page.html
--- a/qmsk_www/templates/site.html	Sun Sep 14 13:54:07 2014 +0300
+++ b/qmsk_www/templates/site.html	Sun Sep 14 14:26:32 2014 +0300
@@ -12,14 +12,50 @@
         <!-- qmsk.www.pages -->
         <link rel="stylesheet" href="{% static "style.css" %}">
         <link rel="stylesheet" href="{% static "pages/pages.css" %}">
+        
+        {% block head %}
+
+        {% endblock %}
     </head>
     <body>
-        {% block content %}{% endblock %}
+        <div class="container">
+            <div id="header">
+                {% block header %}
+
+                {% endblock %}
+            </div>
+            <div id="breadcrumb">
+                {% block breadcrumb %}
+
+                {% endblock %}
+            </div>
+            <div class="row">
+                <div class="col-sm-2" id="nav">
+                {% block nav %}
+
+                {% endblock %}
+                </div>
+                <div class="col-sm-8" id="content">
+                {% block content %}
+
+                {% endblock %}
+                </div>
+            </div>
+            <div id="footer">
+            {% block footer %}
+
+            {% endblock %}
+            </div>
+        </div>
 
         <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 
         <!-- Include all compiled plugins (below), or include individual files as needed -->
         <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+        
+        {% block body %}
+
+        {% endblock %}
     </body>
 </html>
--- a/qmsk_www_pages/templates/pages/page.html	Sun Sep 14 13:54:07 2014 +0300
+++ b/qmsk_www_pages/templates/pages/page.html	Sun Sep 14 14:26:32 2014 +0300
@@ -2,50 +2,49 @@
 
 {% block title %}{{ site_name }} :: {{ page_title }}{% endblock %}
 
+{% block header %}
+    <h1 class="page-header-title">
+        <a href="{% url 'page' '' %}">{{ site_name }}</a>
+    </h1>
+{% endblock %}
+
+{% block breadcrumb %}
+    <ol class="breadcrumb">
+    {% for page, title in page_breadcrumb %}
+        <li><a href="{% url 'page' page %}">{{ title }}</a></li>
+    {% endfor %}
+    </ol>
+{% endblock %}
+
+{% block nav %}
+{% for tree, tree_name in page_hierarchy %}
+    {% if not forloop.first %}
+    <hr />
+    {% endif %}
+    <ul class="nav">
+    {% for name, page, type, title in tree.list_sorted %}
+        <li class="page-tree-item{% if type %} page-tree-{{type}}{% else %} page-tree-tree{% endif %}{% if name == tree_name %} page-tree-active{% endif %}">
+            <a href="{% url 'page' page %}">
+            {% if not type %}
+                <i class="glyphicon glyphicon-chevron-right"></i>
+            {% endif %}
+                {{ title }}
+            </a>
+        </li>
+    {% endfor %}
+    </ul>
+{% endfor %}
+{% endblock %}
+
 {% block content %}
-    <div class="container">
-        <div id="header">
-            <h1 class="page-header-title">
-                <a href="{% url 'page' '' %}">{{ site_name }}</a>
-            </h1>
-        </div>
-        <div id="breadcrumb">
-            <ol class="breadcrumb">
-                {% for page, title in page_breadcrumb %}
-                <li><a href="{% url 'page' page %}">{{ title }}</a></li>
-                {% endfor %}
-            </ol>
-        </div>
-        <div class="row">
-            <div class="col-sm-2" id="nav">
-                {% for tree, tree_name in page_hierarchy %}
-                {% if not forloop.first %}
-                <hr />
-                {% endif %}
-                <ul class="nav">
-                    {% for name, page, type, title in tree.list_sorted %}
-                    <li class="page-tree-item{% if type %} page-tree-{{type}}{% else %} page-tree-tree{% endif %}{% if name == tree_name %} page-tree-active{% endif %}">
-                        <a href="{% url 'page' page %}">
-                            {% if not type %}
-                            <i class="glyphicon glyphicon-chevron-right"></i>
-                            {% endif %}
-                            {{ title }}
-                        </a>
-                    </li>
-                    {% endfor %}
-                </ul>
-                {% endfor %}
-            </div>
-            <div class="col-sm-8" id="content">
-                <h1>{{ page_title }}</h1>
+    <h1>{{ page_title }}</h1>
 
-                {{ page_html|safe }}
-            </div>
-        </div>
-        <div id="footer">
-            <p class="page-footer-modified">
-                Page modified <span title="{{ page_modified|date:'DATETIME_FORMAT' }}">{{ page_modified|date }}</span>
-            </p>
-        </div>
-    </div>
+    {{ page_html|safe }}
 {% endblock %}
+
+{% block footer %}
+    <p class="page-footer-modified">
+        Page modified <span title="{{ page_modified|date:'DATETIME_FORMAT' }}">{{ page_modified|date }}</span>
+    </p>
+{% endblock %}
+