Merge branch 'template'

Test C C C .
2018-12-18 13:09:04 +01:00
parent 8341b9dab9 111b575321
commit e955181216
6 changed files with 44 additions and 72 deletions
@@ -10,4 +10,3 @@ content:
    pagination: true
    url_taxonomy_filters: true
 ---
-
@@ -43,9 +43,7 @@

            {% endblock %}

-            {% block sidebar %}
-                {% include 'partials/sidebar.html.twig' %}
-            {% endblock %}
+  
        {% endembed %}
        </section>
    </section>
@@ -31,9 +31,7 @@
            {% block item %}
                {% include 'partials/blog-item.html.twig' %}
            {% endblock %}
-            {% block sidebar %}
-                {% include 'partials/sidebar.html.twig' %}
-            {% endblock %}
+
        {% endembed %}

    </section>
@@ -35,70 +35,36 @@
 {% endblock head %}
 </head>
 <body id="top" class="{% block body_classes %}{{ body_classes }}{% endblock %}">
-    <div id="page-wrapper">
+
    {% block header %}
-        <section id="header" class="section">
-            <section class="container {{ grid_size }}">
-                <nav class="navbar">
-                    <section class="navbar-section logo">
-                        {% include 'partials/logo.html.twig' %}
-                    </section>
-                    <section class="navbar-section desktop-menu">
+        <header class="section">
+            <h1>{{ site.title }}</h1>

-                        <nav class="dropmenu animated">
-                        {% block header_navigation %}
-                            {% include 'partials/navigation.html.twig' %}
-                        {% endblock %}
-                        </nav>
-
-                        {% if config.plugins.login.enabled and grav.user.username %}
-                            <span class="login-status-wrapper"><i class="fa fa-user"></i> {% include 'partials/login-status.html.twig' %}</span>
-                        {% endif %}
-
-                    </section>
-                </nav>
-            </section>
-        </section>
-        <div class="mobile-menu">
-            <div class="button_container" id="toggle">
-                <span class="top"></span>
-                <span class="middle"></span>
-                <span class="bottom"></span>
-            </div>
-        </div>
-    {% endblock %}
-
-    {% block hero %}{% endblock %}
-
-        <section id="start">
-        {% block body %}
-            <section id="body-wrapper" class="section">
-                <section class="container {{ grid_size }}">
-                    {% block messages %}
-                        {% include 'partials/messages.html.twig' ignore missing %}
-                    {% endblock %}
-                    {% block content %}{% endblock %}
-                </section>
-            </section>
-        {% endblock %}
-        </section>
-
-    </div>
-
-    {% block footer %}
-        {% include 'partials/footer.html.twig' %}
-    {% endblock %}
-    
-    <div class="mobile-container">
-        <div class="overlay" id="overlay">
-            <div class="mobile-logo">
-                {% include 'partials/logo.html.twig' with {mobile: true} %}
-            </div>
-            <nav class="overlay-menu">
-                {% include 'partials/navigation.html.twig' with {tree: true} %}
+            <nav class="dropmenu animated">
+            {% block header_navigation %}
+                {% include 'partials/navigation.html.twig' %}
+            {% endblock %}
            </nav>
-        </div>
-    </div>
+        </header>
+
+    {% endblock %}
+
+    <section id="start">
+      {% block body %}
+        <section class="container {{ grid_size }}">
+            {% block content %}{% endblock %}
+        </section>
+
+        {% block aside %}
+          {% include 'partials/sidebar.html.twig' %}
+        {% endblock %}
+
+        {% block footer %}
+            {% include 'partials/footer.html.twig' %}
+        {% endblock %}
+
+      {% endblock %}
+    </section>

 {% block bottom %}
    {{ assets.js('bottom')|raw }}
@@ -1,5 +1,2 @@
-<section id="footer" class="section bg-gray">
-    <section class="container {{ grid_size }}">
-        <p><a href="http://getgrav.org">Grav</a> was <i class="fa fa-code"></i> with <i class="fa fa-heart-o pulse "></i> by <a href="https://trilby.media">Trilby Media</a>.</p>
-    </section>
+<footer class="section bg-gray">
 </section>
@@ -41,3 +41,17 @@
    {% if config.plugins.feed.enable_json_feed %}<a class="btn" href="{{ feed_url }}.json"><i class="fa fa-rss-square"></i> JSON</a>{% endif %}
 </div>
 {% endif %}
+
+<div class="sidebar-left">
+</div>
+
+<div class="sidebar-right">
+  {% set options = { items: {'@page': '/projets' } } %}
+  {% set my_collection = page.collection(options) %}
+
+  <ul>
+    {% for p in my_collection %}
+      <a href="{{p.url}}"><li>{{ p.title }}</li></a>
+    {% endfor %}
+  </ul>
+</div>