WIP: reconstruct layouts

* page_list

lib/views/layout-growi/page.html

@@ -49,7 +49,7 @@
     {% if 'crowi-plus' === behaviorType() %}
     <div class="row page-list">
       <div class="col-md-12">
-        {% include '../widget/page_list_container.html' %}
+        {% include '../widget/page_list_and_timeline.html' %}
       </div>
     </div>
     {% endif %}

lib/views/layout-growi/page_list.html

@@ -52,7 +52,7 @@
 
     <div class="row page-list">
       <div class="col-md-12">
-        {% include '../widget/page_list_container.html' %}
+        {% include '../widget/page_list_and_timeline.html' %}
       </div>
     </div>
   </div>

lib/views/page_list.html

@@ -79,7 +79,7 @@
 
   <div class="row page-list">
     <div class="col-md-12">
-      {% include 'widget/page_list_container.html' %}
+      {% include 'widget/page_list_and_timeline.html' %}
     </div>
   </div>
 

lib/views/widget/page_content.html

@@ -14,22 +14,24 @@
 
   <div class="tab-content">
 
-    {% if not page.isLatestRevision() %}
-    <div class="alert alert-warning">
-      <strong>{{ t('Warning') }}: </strong> {{ t('page_page.notice.version') }} <i class="fa fa-magic"></i> <a href="{{ page.path }}">{{ t('Show latest') }}</a>
-    </div>
-    {% endif %}
+    {% if page %}
+      {% if not page.isLatestRevision() %}
+      <div class="alert alert-warning">
+        <strong>{{ t('Warning') }}: </strong> {{ t('page_page.notice.version') }} <i class="fa fa-magic"></i> <a href="{{ page.path }}">{{ t('Show latest') }}</a>
+      </div>
+      {% endif %}
 
-    <script type="text/template" id="raw-text-original">{{ revision.body }}</script>
+      <script type="text/template" id="raw-text-original">{{ revision.body }}</script>
 
-    {# formatted text #}
-    <div class="tab-pane {% if not req.body.pageForm %}active{% endif %}" id="revision-body">
-      <div class="revision-toc" id="revision-toc">
-        <a data-toggle="collapse" data-parent="#revision-toc" href="#revision-toc-content" class="revision-toc-head">{{ t('Table of Contents') }}</a>
-        <div id="revision-toc-content" class="revision-toc-content collapse in"></div>
+      {# formatted text #}
+      <div class="tab-pane {% if not req.body.pageForm %}active{% endif %}" id="revision-body">
+        <div class="revision-toc" id="revision-toc">
+          <a data-toggle="collapse" data-parent="#revision-toc" href="#revision-toc-content" class="revision-toc-head">{{ t('Table of Contents') }}</a>
+          <div id="revision-toc-content" class="revision-toc-content collapse in"></div>
+        </div>
+        <div id="page" class="m-t-15"></div>
       </div>
-      <div id="page" class="m-t-15"></div>
-    </div>
+    {% endif %}
 
     {# edit form #}
     {% if not page.isDeleted() %}

lib/views/widget/page_list_container.html → lib/views/widget/page_list_and_timeline.html

@@ -1,4 +1,4 @@
-<div class="page-list-container crowi-plus-widget">
+<div class="page-list-container">
   <ul class="nav nav-tabs">
       <li class="active"><a href="#view-list" data-toggle="tab">{{ t('List View') }}</a></li>
       {% if isEnabledTimeline() %}

resource/styles/scss/_layout_crowi.scss

@@ -35,4 +35,9 @@
       background: #fcfcfc;
     }
   }
+
+  .row.page-list {
+    margin-left: 0;
+    margin-right: 0;
+  }
 }

resource/styles/scss/_page_crowi-plus.scss

@@ -67,6 +67,6 @@
   }
 }
 
-.crowi-plus .crowi-plus-widget.page-list-container {
+.crowi-plus .page-list-container {
   margin-top: 30px;
 }