Use block system to optimize loading

Mikescops · Jan 30, 2018 · a0880d4 · a0880d4
1 parent cb0af41
commit a0880d4
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 58 deletions.
diff --git a/_footer.twig b/_footer.twig
diff --git a/_header.twig → _master.twig b/_header.twig → _master.twig
@@ -23,31 +23,55 @@
 
 </head>
 <body>
+  <div class="contain-to-grid">
+  <nav class="top-bar" data-topbar>
+    <ul class="title-area">
+      <li class="name">
+        <h1><a href="{{ url('homepage') }}">{{ app.config.get('general/sitename') }}</a></h1>
+      </li>
+      <li class="toggle-topbar menu-icon"><a href="#">Menu</a></li>
+    </ul>
 
-<div class="contain-to-grid">
-<nav class="top-bar" data-topbar>
-  <ul class="title-area">
-    <li class="name">
-      <h1><a href="{{ url('homepage') }}">{{ app.config.get('general/sitename') }}</a></h1>
-    </li>
-    <li class="toggle-topbar menu-icon"><a href="#">Menu</a></li>
-  </ul>
-
-  <section class="top-bar-section">
-    <!-- Right Nav Section -->
-    <ul class="left">
+    <section class="top-bar-section">
+      <!-- Right Nav Section -->
+      <ul class="left">
 
-        {{ menu('main', '_sub_menu.twig') }}
+          {{ menu('main', '_sub_menu.twig') }}
 
-   </ul>
-
+     </ul>
+
+        </ul>
+        <ul class="right">
+        {% include '_sub_searchbox.twig' %}
       </ul>
-      <ul class="right">
-      {% include '_sub_searchbox.twig' %}
-    </ul>
-    </section>
+      </section>
+
+    </nav>
+  </div>
+  <!-- End Header -->
+
+  {% block main %}{% endblock main %}
+
+  <!-- FOOTER -->
+  <footer class="row">
+    <div class="large-12 columns">
+      <hr>
+      <div class="row">
+        <div class="large-6 columns">
+          <p> Themed by <a href="https://pixelswap.fr/" target="_blank">Corentin Mors</a> &copy; Bolt CMS </p>
+        </div>
+      </div>
+    </div>
+  </footer>
+
+      <!-- End Footer -->
+
 
-  </nav>
-</div>
+  <script src="{{ asset('js/vendor/jquery.js', 'theme') }}"></script>
+  <script src="{{ asset('js/foundation.min.js', 'theme') }}"></script>
+  <script>
+    $(document).foundation();
+  </script>
 
-  <!-- End Header and Nav -->
+</body>
+</html>
diff --git a/entry.twig b/entry.twig
@@ -1,4 +1,5 @@
-{% include '_header.twig' %}
+{% extends '_master.twig' %}
+{% block main %}
 
 <div class="row" style="margin-top: 25px;">
     <div class="large-8 columns" style="padding-left: 0; padding-right: 0; z-index: 8;">
@@ -74,4 +75,4 @@
 
     </div>
 
-    {% include '_footer.twig' %}
+{% endblock main %}
diff --git a/index.twig b/index.twig
@@ -1,5 +1,5 @@
-{% include '_header.twig' %}
-
+{% extends '_master.twig' %}
+{% block main %}
 <!-- Main Grid Section -->
 
 {% setcontent records = "entries/latest/6" allowpaging %}
@@ -57,4 +57,4 @@
 
 <!-- End Grid Section -->
 
-{% include '_footer.twig' %}
+{% endblock main %}
diff --git a/listing.twig b/listing.twig
@@ -1,4 +1,5 @@
-{% include '_header.twig' %}
+{% extends '_master.twig' %}
+{% block main %}
 
 <div class="row" style="margin-top: 25px;">
 
@@ -12,7 +13,7 @@
         {% endif %}
         <h3 style="margin-bottom: 0px;">{{ record.title }}</h3>
         <p style="margin-bottom: 0px;">{{ record.excerpt(100) }}</p>
-        <a href="{{ record.link }}" class="button radius tiny">Voir plus ...</a>
+        <a href="{{ record.link }}" class="button radius tiny">View more ...</a>
         <br>
       </div>
     </div>
@@ -28,7 +29,7 @@
             Unfortunately, no content could be found. Try another page, or go to the
             <a href="{{ url('homepage') }}">homepage</a>.
         </p>
-        
+
     </article>
 
 
@@ -44,4 +45,4 @@
 
     </div>
 <br>
-    {% include '_footer.twig' %}
+{% endblock main %}
diff --git a/record.twig b/record.twig
@@ -1,4 +1,5 @@
-{% include '_header.twig' %}
+{% extends '_master.twig' %}
+{% block main %}
 
 <div class="container-fluid" style="margin-top: 100px;">
       <div class="row">
@@ -103,4 +104,4 @@
 
     <hr>
 
-    {% include '_footer.twig' %}
+{% endblock main %}
diff --git a/searchresults.twig b/searchresults.twig
@@ -1,4 +1,5 @@
-{% include '_header.twig' %}
+{% extends '_master.twig' %}
+{% block main %}
 
 <div class="container-fluid" style="margin-top: 100px;">
       <div class="row-fluid">
@@ -60,4 +61,4 @@
 
     <hr>
 
-    {% include '_footer.twig' %}
+{% endblock main %}