[TEMPLATES] Minor refactoring, extending left was weird

plugins/Directory/templates/directory/actors.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}

plugins/Directory/templates/directory/groups.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}

templates/Poll/newpoll.html.twig

@@ -1,5 +1,4 @@
-
+{% extends 'stdgrid.html.twig' %}
-{% extends 'left/left.html.twig' %}
 
 {% block meta %}
   {{ parent() }}

templates/Poll/respondpoll.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}

templates/Poll/showpoll.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}

templates/attachments/show.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block stylesheets %}
     {{ parent() }}

templates/base.html.twig

@@ -31,28 +31,16 @@
             {% block header %}
                   <div id='header'>
                         <div id='top'>
-                              {% block left %}
+                              {% block leftpanel %}
-                              {% endblock left %}
+                              {% 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">
+                              {% block rightpanel %}
-                                <input type="checkbox" id="toggle-right" class="larger">
+                              {% endblock rightpanel %}
-                                  <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>
-
                         </div>
                   </div>
             {% endblock header%}

templates/doc/base.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
       {{ parent() }}

templates/network/actors.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}

templates/network/public.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}

templates/network/reversefavs.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}

templates/note/reply.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
   {{ parent() }}

templates/security/login.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block stylesheets %}
     {{ parent() }}

templates/security/register.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block stylesheets %}
     {{ parent() }}

templates/settings/base.html.twig

@@ -1,4 +1,4 @@
-{% extends 'left/left.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block meta %}
     {{ parent() }}

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 %}

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)">

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>

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 %}