reconstruct layouts

* page_list

lib/views/layout-growi/base/page_list_nosidebar.html

@@ -1,4 +1,4 @@
-{% extends '../../page_list.html' %}
+{% extends '../../layout/layout.html' %}
 
 
 {% block layout_main %}
@@ -19,14 +19,12 @@
     {% endblock %}
 
     {% block content_main %}
-      {% parent %}
     {% endblock content_main %}
 
     {% block content_main_after %}
     {% endblock %}
 
     {% block content_footer %}
-      {% parent %}
     {% endblock %}
   </article>
 </div>

lib/views/layout-growi/page_list.html

@@ -1,4 +1,4 @@
-{% extends 'base/page_list_nosidebar.html' %}
+{% extends 'base/page_nosidebar.html' %}
 
 {% block main_css_class %}
   main-crowi-plus-customized
@@ -18,13 +18,17 @@
 {% endblock %} {# /content_head #}
 
 
+{% block content_main_before %}
+{% endblock %}
+
+
 {% block content_main %}
   <div class="container-fluid">
     <div class="row">
 
       <div class="col-lg-10 col-md-9">
 
-        {% parent %}
+          {% include '../widget/page_content.html' %}
 
         {# force remove #revision-toc from #content_main of parent #}
         <script>
@@ -46,3 +50,17 @@
     </div>
   </div>
 {% endblock %}
+
+{% block content_footer %}
+  {% if page %}
+    {% include '../widget/page_attachments.html' %}
+  {% endif %}
+{% endblock %}
+
+{% block body_end %}
+  <div id="presentation-layer" class="fullscreen-layer">
+    <div id="presentation-container"></div>
+  </div>
+
+  {% include '../widget/page_modals.html' %}
+{% endblock %}