From 110c2572a4b45cbf07ad8d26772bd132803b203f Mon Sep 17 00:00:00 2001
From: Diogo Peralta Cordeiro <mail@diogo.site>
Date: Thu, 29 Apr 2021 20:51:13 +0100
Subject: [PATCH] [TEMPLATES] Minor refactoring, extending left was weird

---
 .../templates/directory/actors.html.twig      |  2 +-
 .../templates/directory/groups.html.twig      |  2 +-
 templates/Poll/newpoll.html.twig              |  3 +--
 templates/Poll/respondpoll.html.twig          |  2 +-
 templates/Poll/showpoll.html.twig             |  2 +-
 templates/attachments/show.html.twig          |  2 +-
 templates/base.html.twig                      | 20 ++++---------------
 templates/doc/base.html.twig                  |  2 +-
 templates/network/actors.html.twig            |  2 +-
 templates/network/public.html.twig            |  2 +-
 templates/network/reversefavs.html.twig       |  2 +-
 templates/note/reply.html.twig                |  2 +-
 templates/security/login.html.twig            |  2 +-
 templates/security/register.html.twig         |  2 +-
 templates/settings/base.html.twig             |  2 +-
 templates/{ => sidepanel}/left/left.html.twig | 12 -----------
 .../sidepanel/left/left_stylesheets.html.twig |  3 +++
 templates/sidepanel/right/right.html.twig     | 13 ++++++++++++
 templates/stdgrid.html.twig                   | 11 ++++++++++
 19 files changed, 45 insertions(+), 43 deletions(-)
 rename templates/{ => sidepanel}/left/left.html.twig (87%)
 create mode 100644 templates/sidepanel/left/left_stylesheets.html.twig
 create mode 100644 templates/sidepanel/right/right.html.twig
 create mode 100644 templates/stdgrid.html.twig

diff --git a/plugins/Directory/templates/directory/actors.html.twig b/plugins/Directory/templates/directory/actors.html.twig
index 2ef6e73d82..25592ae2ae 100644
--- a/plugins/Directory/templates/directory/actors.html.twig
+++ b/plugins/Directory/templates/directory/actors.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}
diff --git a/plugins/Directory/templates/directory/groups.html.twig b/plugins/Directory/templates/directory/groups.html.twig
index 7f448d4e43..f3440a5cc6 100644
--- a/plugins/Directory/templates/directory/groups.html.twig
+++ b/plugins/Directory/templates/directory/groups.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}
diff --git a/templates/Poll/newpoll.html.twig b/templates/Poll/newpoll.html.twig
index 2b1d0289bc..d432baabf6 100644
--- a/templates/Poll/newpoll.html.twig
+++ b/templates/Poll/newpoll.html.twig
@@ -1,5 +1,4 @@
-
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
   {{ parent() }}
diff --git a/templates/Poll/respondpoll.html.twig b/templates/Poll/respondpoll.html.twig
index 782b3c765f..26f68f7790 100644
--- a/templates/Poll/respondpoll.html.twig
+++ b/templates/Poll/respondpoll.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}
diff --git a/templates/Poll/showpoll.html.twig b/templates/Poll/showpoll.html.twig
index e8b957b8f0..ed56ef24e4 100644
--- a/templates/Poll/showpoll.html.twig
+++ b/templates/Poll/showpoll.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}
diff --git a/templates/attachments/show.html.twig b/templates/attachments/show.html.twig
index ae564503e2..f94aaca979 100644
--- a/templates/attachments/show.html.twig
+++ b/templates/attachments/show.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block stylesheets %}
     {{ parent() }}
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 8c6e626a98..4608c9e1f8 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -31,28 +31,16 @@
             {% block header %}
                   <div id='header'>
                         <div id='top'>
-                              {% block left %}
-                              {% endblock left %}
+                              {% block leftpanel %}
+                              {% endblock leftpanel %}
                               <nav id='instance'>
                                     <a href="{{ path('main_public') }}">
                                           {{ icon('logo', 'icon icon-logo') | raw }}
                                           <b> {{ config('site', 'name') }} </b>
                                     </a>
                               </nav>
-                              <div id="right-panel">
-                                <input type="checkbox" id="toggle-right" class="larger">
-                                  <div class="arrow right">
-                                    <label for="toggle-right" id='right-panel'></label>
-                                  </div>
-                                  <div class='rss'>
-                                    <div> </div>
-                                  </div>
-                                  <div>
-                                    {% block right %}
-                                    {% endblock right %}
-                                  </div>
-                              </div>
-
+                              {% block rightpanel %}
+                              {% endblock rightpanel %}
                         </div>
                   </div>
             {% endblock header%}
diff --git a/templates/doc/base.html.twig b/templates/doc/base.html.twig
index 04ac3a0e82..4b56499590 100644
--- a/templates/doc/base.html.twig
+++ b/templates/doc/base.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
       {{ parent() }}
diff --git a/templates/network/actors.html.twig b/templates/network/actors.html.twig
index bc4e6a96fd..6c6c2297d7 100644
--- a/templates/network/actors.html.twig
+++ b/templates/network/actors.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}
diff --git a/templates/network/public.html.twig b/templates/network/public.html.twig
index 240523fb8a..29aee29968 100644
--- a/templates/network/public.html.twig
+++ b/templates/network/public.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}
diff --git a/templates/network/reversefavs.html.twig b/templates/network/reversefavs.html.twig
index b62f6bc46a..eb9cca4050 100644
--- a/templates/network/reversefavs.html.twig
+++ b/templates/network/reversefavs.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}
diff --git a/templates/note/reply.html.twig b/templates/note/reply.html.twig
index 6510d82069..a805c08d05 100644
--- a/templates/note/reply.html.twig
+++ b/templates/note/reply.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
   {{ parent() }}
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index c0139d7dfb..be622acf70 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block stylesheets %}
     {{ parent() }}
diff --git a/templates/security/register.html.twig b/templates/security/register.html.twig
index 302915de8a..b1b96b2009 100644
--- a/templates/security/register.html.twig
+++ b/templates/security/register.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block stylesheets %}
     {{ parent() }}
diff --git a/templates/settings/base.html.twig b/templates/settings/base.html.twig
index 75e23b2052..c6d9ce6d28 100644
--- a/templates/settings/base.html.twig
+++ b/templates/settings/base.html.twig
@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}
diff --git a/templates/left/left.html.twig b/templates/sidepanel/left/left.html.twig
similarity index 87%
rename from templates/left/left.html.twig
rename to templates/sidepanel/left/left.html.twig
index 60ed89773c..486fc52ed7 100644
--- a/templates/left/left.html.twig
+++ b/templates/sidepanel/left/left.html.twig
@@ -1,13 +1,3 @@
-{% extends '/base.html.twig' %}
-
-{% block stylesheets %}
-    {{ parent() }}
-    <link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left.css') }}" media="screen and (min-width: 1300px)">
-    <link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left_mid.css') }}" media="screen and (max-width: 1300px)">
-    <link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left_small.css') }}" media="screen and (max-width: 750px)">
-{% endblock %}
-
-{% block left %}
   {% if app.user %}
     <div id='left-panel'>
       <input type="checkbox" id="toggle" class="larger" autofocus>
@@ -80,5 +70,3 @@
         </div>
     </div>
   {% endif %}
-
-{% endblock %}
diff --git a/templates/sidepanel/left/left_stylesheets.html.twig b/templates/sidepanel/left/left_stylesheets.html.twig
new file mode 100644
index 0000000000..2cc8af80ce
--- /dev/null
+++ b/templates/sidepanel/left/left_stylesheets.html.twig
@@ -0,0 +1,3 @@
+<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left.css') }}" media="screen and (min-width: 1300px)">
+<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left_mid.css') }}" media="screen and (max-width: 1300px)">
+<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/left/left_small.css') }}" media="screen and (max-width: 750px)">
diff --git a/templates/sidepanel/right/right.html.twig b/templates/sidepanel/right/right.html.twig
new file mode 100644
index 0000000000..7330874754
--- /dev/null
+++ b/templates/sidepanel/right/right.html.twig
@@ -0,0 +1,13 @@
+<div id="right-panel">
+    <input type="checkbox" id="toggle-right" class="larger">
+    <div class="arrow right">
+        <label for="toggle-right" id='right-panel'></label>
+    </div>
+    <div class='rss'>
+        <div> </div>
+    </div>
+    <div>
+        {% block right %}
+        {% endblock right %}
+    </div>
+</div>
\ No newline at end of file
diff --git a/templates/stdgrid.html.twig b/templates/stdgrid.html.twig
new file mode 100644
index 0000000000..0a8a8cded6
--- /dev/null
+++ b/templates/stdgrid.html.twig
@@ -0,0 +1,11 @@
+{% extends '/base.html.twig' %}
+{% block stylesheets %}
+    {{ parent() }}
+    {% include '/sidepanel/left/left_stylesheets.html.twig' %}
+{% endblock %}
+{% block leftpanel %}
+    {% include '/sidepanel/left/left.html.twig' %}
+{% endblock %}
+{% block rightpanel %}
+    {% include '/sidepanel/right/right.html.twig' %}
+{% endblock %}
\ No newline at end of file