Merge branch 'master' into 251_popular_concepts

* master: renamed layout-page fixes to templates #247 update to static layout files #247 What's up with base, staticbase and page-layout templates? #247 What's up with base, staticbase and page-layout templates? #247 Conflicts: atramhasis/templates/staticlayout.jinja2
OnroerendErfgoed · Nov 19, 2015 · 7c2bc9a · 7c2bc9a
2 parents bfbe134 + b04c4c2
commit 7c2bc9a
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 81 deletions.
diff --git a/atramhasis/templates/concept.jinja2 b/atramhasis/templates/concept.jinja2
@@ -1,4 +1,4 @@
-{% extends 'layout-page.jinja2' %}
+{% extends 'layout.jinja2' %}
 
 {% block html_title %}Detail{% endblock %}
 

diff --git a/atramhasis/templates/conceptscheme.jinja2 b/atramhasis/templates/conceptscheme.jinja2
@@ -1,4 +1,4 @@
-{% extends 'layout-page.jinja2' %}
+{% extends 'layout.jinja2' %}
 
 {% block html_title %}Concept schemes{% endblock %}
 

diff --git a/atramhasis/templates/conceptschemes.jinja2 b/atramhasis/templates/conceptschemes.jinja2
@@ -1,4 +1,4 @@
-{% extends 'layout-page.jinja2' %}
+{% extends 'layout.jinja2' %}
 
 {% from "macros.jinja2" import
 	get_conceptscheme_label
@@ -16,6 +16,7 @@
         {% endfor %}
       </div>
     </div>
+  </div>
 {% endblock %}
 
 {% block subfooter %}{% endblock %}
diff --git a/atramhasis/templates/footer-page.jinja2 b/atramhasis/templates/footer-page.jinja2
@@ -2,8 +2,9 @@
 	get_language_links
   %}
 
-<footer class="footerpage">
-  <div style="margin-bottom: 10px;">{{ get_language_links(request) }}</div>
-	<small> &copy; Copyright 2014-2015 <a href="https://www.onroerenderfgoed.be/">Flanders Heritage Agency</a></small>
-</footer>
+<div class="row">
+  <footer class="footerpage">
+    <div style="margin-bottom: 10px;">{{ get_language_links(request) }}</div>
+    <small> &copy; Copyright 2014-2015 <a href="https://www.onroerenderfgoed.be/">Flanders Heritage Agency</a></small>
+  </footer>
 </div>
diff --git a/atramhasis/templates/home.jinja2 b/atramhasis/templates/home.jinja2
@@ -1,16 +1,30 @@
-{% extends 'layout-main.jinja2' %}
+{% extends "staticlayout.jinja2" %}
+
 {% set app_package = app_package|default('atramhasis', true) %}
 
 {% block html_title %}Home{% endblock %}
 
-{% from "macros.jinja2" import
-	get_conceptscheme_label
-  %}
+{% block header %}
+  {% include 'header-main.jinja2' %}
+{% endblock %}
 
 {% block content %}
-  <div class="row">
-    {% include 'welcome.jinja2' %}
-    {% include 'search_form.jinja2' %}
-{#    {% include 'd3cloud.jinja2' %}#}
+  <div class="bgcontainer">
+    <div class="row">
+      {% include 'welcome.jinja2' %}
+      {% include 'search_form.jinja2' %}
+      {#    {% include 'd3cloud.jinja2' %}#}
+    </div>
   </div>
 {% endblock %}
+
+{% block subfooter %}
+  {% include 'subfooter-main.jinja2' %}
+{% endblock %}
+
+{% block footer %}
+  {% include 'footer-main.jinja2' %}
+{% endblock %}
+
+{% block custom_js %}{% endblock %}
+
diff --git a/atramhasis/templates/layout-page.jinja2 b/atramhasis/templates/layout-page.jinja2
diff --git a/atramhasis/templates/layout.jinja2 b/atramhasis/templates/layout.jinja2
@@ -0,0 +1 @@
+{% extends "staticlayout-page.jinja2" %}
diff --git a/atramhasis/templates/search_result.jinja2 b/atramhasis/templates/search_result.jinja2
@@ -1,4 +1,4 @@
-{% extends 'layout-page.jinja2' %}
+{% extends 'layout.jinja2' %}
 
 {% block html_title %}Search{% endblock %}
 
@@ -17,13 +17,13 @@
       {%- for c in concepts|sort(attribute='label') %}
         <div class="large-3 large-3-pad columns result-grid"><a href="{{ request.route_path('concept', scheme_id= scheme_id, c_id = c.id) }}"><h5>{{ c.label }}</h5> <span> [ ID : {{ c.id }} ]</span><br><small>{{ c.type }}</small></a></div>
       {%- endfor %}
-
+    </div>
+  </div>
 {% endblock %}
 
 {% block subfooter %}
 {% endblock %}
 
 {% block footer %}
   {% include 'footer-page.jinja2' %}
-  </div>
 {% endblock %}
diff --git a/atramhasis/templates/staticlayout-page.jinja2 b/atramhasis/templates/staticlayout-page.jinja2
@@ -0,0 +1,24 @@
+{% extends "staticlayout.jinja2" %}
+
+{% block js_files_head %}
+  <script src="{{ request.static_path(app_package + ':static/bower_components/jquery/dist/jquery.js') }}"></script>
+  <script src="{{ request.static_path(app_package + ':static/bower_components/jquery.cookie/jquery.cookie.js') }}"></script>
+  <script src="{{ request.static_path(app_package + ':static/bower_components/d3/d3.min.js') }}"></script>
+{% endblock %}
+
+{% block header %}
+  {% include 'header-page.jinja2' %}
+{% endblock %}
+
+{% block content %}
+{% endblock %}
+
+{% block subfooter %}
+  {% include 'subfooter-page.jinja2' %}
+{% endblock %}
+
+{% block footer %}
+  {% include 'footer-page.jinja2' %}
+{% endblock %}
+
+{% block custom_js %}{% endblock %}
diff --git a/atramhasis/templates/layout-main.jinja2 → atramhasis/templates/staticlayout.jinja2 b/atramhasis/templates/layout-main.jinja2 → atramhasis/templates/staticlayout.jinja2
@@ -16,6 +16,11 @@
   <link rel="icon" type="image/x-icon" href="{{request.static_path(app_package + ':static/img/favicon.ico')}}" />
   <script src="{{request.static_path(app_package + ':static/js/vendor/modernizr.js')}}"></script>
 
+  {% block js_files_head %}
+    <script src="{{ request.static_path(app_package + ':static/bower_components/jquery/dist/jquery.js') }}"></script>
+    <script src="{{ request.static_path(app_package + ':static/bower_components/jquery.cookie/jquery.cookie.js') }}"></script>
+  {% endblock %}
+
   {% block ga %}
     {% set ga_key = ga_key|default(request.registry.settings["ga.tracker_key"]) %}
     {% from 'macros.jinja2' import ga_tracker %}
@@ -27,27 +32,22 @@
 <body>
 
 {% block header %}
-  {% include 'header-main.jinja2' %}
 {% endblock %}
 
-<div class="bgcontainer">
-  {% block content %}
-  {% endblock %}
-</div>
+{% block content %}
+{% endblock %}
 
 {% block subfooter %}
-  {% include 'subfooter-main.jinja2' %}
 {% endblock %}
 
 {% block footer %}
-  {% include 'footer-main.jinja2' %}
 {% endblock %}
 
 {% block js_files %}
-  <script src="{{ request.static_path(app_package + ':static/bower_components/jquery/dist/jquery.js') }}"></script>
-  <script src="{{ request.static_path(app_package + ':static/bower_components/jquery.cookie/jquery.cookie.js') }}"></script>
   <script src="{{ request.static_path(app_package + ':static/bower_components/foundation/js/foundation.min.js') }}"></script>
   <script src="{{ request.static_path(app_package + ':static/js/app.js') }}"></script>
 {% endblock %}
+
+{% block custom_js %}{% endblock %}
 </body>
 </html>