From 6accae1acd74ed981bb7194972b4d2892440875e Mon Sep 17 00:00:00 2001
From: kevin tessier <kevin@figureslibres.io>
Date: Fri, 14 Dec 2018 11:27:29 +0100
Subject: [PATCH 1/3] test_modif_template

---
 .../templates/partials/base.html.twig         | 31 +++++--------------
 1 file changed, 8 insertions(+), 23 deletions(-)
diff --git a/user/themes/figureslibres/templates/partials/base.html.twig b/user/themes/figureslibres/templates/partials/base.html.twig
index d277634..5bccd54 100644
--- a/user/themes/figureslibres/templates/partials/base.html.twig
+++ b/user/themes/figureslibres/templates/partials/base.html.twig
@@ -37,28 +37,13 @@
 <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">
-
-                        <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>
+        <header class="section">
+            <nav class="dropmenu animated">
+            {% block header_navigation %}
+                {% include 'partials/navigation.html.twig' %}
+            {% endblock %}
+            </nav>
+        </header>
         <div class="mobile-menu">
             <div class="button_container" id="toggle">
                 <span class="top"></span>
@@ -88,7 +73,7 @@
     {% block footer %}
         {% include 'partials/footer.html.twig' %}
     {% endblock %}
-    
+
     <div class="mobile-container">
         <div class="overlay" id="overlay">
             <div class="mobile-logo">

From ed77d6eb2b21c0f953db499eed65b84718279c43 Mon Sep 17 00:00:00 2001
From: kevin tessier <kevin@figureslibres.io>
Date: Fri, 14 Dec 2018 14:57:42 +0100
Subject: [PATCH 2/3] add sidebar

---
 user/pages/02.projets/blog.md                 |  1 -
 .../figureslibres/templates/blog.html.twig    |  4 +-
 .../figureslibres/templates/item.html.twig    |  4 +-
 .../templates/partials/base.html.twig         | 51 ++++++-------------
 .../templates/partials/footer.html.twig       |  4 +-
 .../templates/partials/sidebar.html.twig      | 14 +++++
 6 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/user/pages/02.projets/blog.md b/user/pages/02.projets/blog.md
index 3e416d3..9e9d590 100644
--- a/user/pages/02.projets/blog.md
+++ b/user/pages/02.projets/blog.md
@@ -10,4 +10,3 @@ content:
     pagination: true
     url_taxonomy_filters: true
 ---
-
diff --git a/user/themes/figureslibres/templates/blog.html.twig b/user/themes/figureslibres/templates/blog.html.twig
index ec349ae..0f649ac 100644
--- a/user/themes/figureslibres/templates/blog.html.twig
+++ b/user/themes/figureslibres/templates/blog.html.twig
@@ -43,9 +43,7 @@
 
             {% endblock %}
 
-            {% block sidebar %}
-                {% include 'partials/sidebar.html.twig' %}
-            {% endblock %}
+  
         {% endembed %}
         </section>
     </section>
diff --git a/user/themes/figureslibres/templates/item.html.twig b/user/themes/figureslibres/templates/item.html.twig
index f73fc52..3ecf48d 100644
--- a/user/themes/figureslibres/templates/item.html.twig
+++ b/user/themes/figureslibres/templates/item.html.twig
@@ -31,9 +31,7 @@
             {% block item %}
                 {% include 'partials/blog-item.html.twig' %}
             {% endblock %}
-            {% block sidebar %}
-                {% include 'partials/sidebar.html.twig' %}
-            {% endblock %}
+
         {% endembed %}
 
     </section>
diff --git a/user/themes/figureslibres/templates/partials/base.html.twig b/user/themes/figureslibres/templates/partials/base.html.twig
index 5bccd54..23aaa4d 100644
--- a/user/themes/figureslibres/templates/partials/base.html.twig
+++ b/user/themes/figureslibres/templates/partials/base.html.twig
@@ -35,55 +35,36 @@
 {% endblock head %}
 </head>
 <body id="top" class="{% block body_classes %}{{ body_classes }}{% endblock %}">
-    <div id="page-wrapper">
+
     {% block header %}
         <header class="section">
+            <h1>{{ site.title }}</h1>
+
             <nav class="dropmenu animated">
             {% block header_navigation %}
                 {% include 'partials/navigation.html.twig' %}
             {% endblock %}
             </nav>
         </header>
-        <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 id="start">
+      {% block body %}
+        <section class="container {{ grid_size }}">
+            {% block content %}{% endblock %}
         </section>
 
-    </div>
+        {% block aside %}
+          {% include 'partials/sidebar.html.twig' %}
+        {% endblock %}
 
-    {% block footer %}
-        {% include 'partials/footer.html.twig' %}
-    {% endblock %}
+        {% 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>
-        </div>
-    </div>
+      {% endblock %}
+    </section>
 
 {% block bottom %}
     {{ assets.js('bottom')|raw }}
diff --git a/user/themes/figureslibres/templates/partials/footer.html.twig b/user/themes/figureslibres/templates/partials/footer.html.twig
index 15ea155..c89fa3f 100644
--- a/user/themes/figureslibres/templates/partials/footer.html.twig
+++ b/user/themes/figureslibres/templates/partials/footer.html.twig
@@ -1,5 +1,3 @@
-<section id="footer" class="section bg-gray">
-    <section class="container {{ grid_size }}">
+<footer class="section bg-gray">
         <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>
 </section>
diff --git a/user/themes/figureslibres/templates/partials/sidebar.html.twig b/user/themes/figureslibres/templates/partials/sidebar.html.twig
index ea6a34c..4038efb 100644
--- a/user/themes/figureslibres/templates/partials/sidebar.html.twig
+++ b/user/themes/figureslibres/templates/partials/sidebar.html.twig
@@ -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>

From 111b575321f657732f7b63dcb320bc68682d8953 Mon Sep 17 00:00:00 2001
From: kevin tessier <kevin@figureslibres.io>
Date: Mon, 17 Dec 2018 14:38:34 +0100
Subject: [PATCH 3/3] suppr footer

---
 user/themes/figureslibres/templates/partials/footer.html.twig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/user/themes/figureslibres/templates/partials/footer.html.twig b/user/themes/figureslibres/templates/partials/footer.html.twig
index c89fa3f..4365822 100644
--- a/user/themes/figureslibres/templates/partials/footer.html.twig
+++ b/user/themes/figureslibres/templates/partials/footer.html.twig
@@ -1,3 +1,2 @@
 <footer class="section bg-gray">
-        <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>
