WIP: reconstruct layouts

lib/views/admin/app.html

@@ -2,7 +2,7 @@
 
 {% block html_title %}{{ t('App settings') }} · {% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id="">{{ t('App settings') }}</h1>

lib/views/admin/customize.html

@@ -15,7 +15,7 @@
 {% endblock %}
 
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id="">{{ t('Customize') }} </h1>

lib/views/admin/external-accounts.html

@@ -2,7 +2,7 @@
 
 {% block html_title %}外部アカウント管理 · {% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id="">ユーザー管理/外部アカウント管理</h1>

lib/views/admin/index.html

@@ -2,7 +2,7 @@
 
 {% block html_title %}{{ t('admin_top.Management Wiki') }}· {{ path }}{% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id=""> {{ t('admin_top.Management Wiki') }}</h1>

lib/views/admin/markdown.html

@@ -3,7 +3,7 @@
 {% block html_title %}{{ t('Markdown settings') }}
  · {{ path }}{% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id="">{{ t('Markdown settings') }}</h1>

lib/views/admin/notification.html

@@ -2,7 +2,7 @@
 
 {% block html_title %}{{ t('Notification settings') }} · {{ path }}{% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id="">{{ t('Notification settings') }}</h1>

lib/views/admin/search.html

@@ -2,7 +2,7 @@
 
 {% block html_title %}検索管理 · {{ path }}{% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id="">検索管理</h1>

lib/views/admin/security.html

@@ -2,7 +2,7 @@
 
 {% block html_title %}{{ t('Security settings') }} · {% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id="">{{ t('Security settings') }}</h1>

lib/views/admin/users.html

@@ -2,7 +2,7 @@
 
 {% block html_title %}{{ t('user_management.User management') }}· {% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id="">{{ t('user_management.User management') }}</h1>

lib/views/index.html

@@ -1,6 +1,6 @@
 {% extends 'layout/2column.html' %}
 
-{% block layout_header %}
+{% block content_header %}
 <header>
   <h2>Index</h2>
 </header>

lib/views/installer.html

@@ -1,4 +1,4 @@
-{% extends 'layout/single-nologin.html' %}
+{% extends 'layout-growi/base/layout.html' %}
 
 {% block html_title %}セットアップ {% endblock %}
 

lib/views/invited.html

@@ -1,4 +1,4 @@
-{% extends 'layout/single-nologin.html' %}
+{% extends 'layout-growi/base/layout.html' %}
 
 {% block html_title %}Registration · {% endblock %}
 

lib/views/layout-crowi/base/layout.html

@@ -0,0 +1,68 @@
+{% extends '../../layout/layout.html' %}
+
+
+{% block layout_main %}
+<div class="container-fluid">
+
+  <a href="" class=" hidden-xs hidden-sm layout-control" id="toggle-sidebar"><i class="fa fa-chevron-right"></i> <span class="hide-on-affix-top"></span></a>
+  <aside class="crowi-sidebar col-md-3 hidden-xs hidden-sm hidden-print">
+
+    {% block side_header %}
+    {% endblock %}
+
+    <div class="side-content">
+      {% block side_content %}
+      {% endblock %}
+    </div>
+
+    {% block side_footer %}
+    {% endblock %}
+
+    <div id="footer-container" class="footer">
+      <footer class="">
+        <p>
+          <a href="https://github.com/weseek/crowi-plus">crowi-plus</a> {{ crowiVersion() }}
+          <a href="" class="pull-right" data-target="#shortcuts-modal" data-toggle="modal"><i class="fa fa-keyboard-o"></i>&nbsp;<span class="cmd-key"></span>-/</a>
+        </p>
+      </footer>
+    </div>
+  </aside>
+
+  <div class="row bg-title">
+    <div class="col-md-9">
+      {% block content_header %}
+      {% endblock %}
+    </div>
+  </div><!-- /.bg-title -->
+
+  <div class="row m-t-15">
+    <div id="main" class="main col-md-9 {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
+      {% if page && page.grant != 1 %}
+      <p class="page-grant">
+        <i class="fa fa-lock"></i> {{ consts.pageGrants[page.grant] }} ({{ t('Browsing of this page is restricted') }})
+      </p>
+      {% endif %}
+      {% if page && page.grant == 2 %}
+      <p class="alert alert-info">
+        {{ t('Shareable Link') }}
+        <input type="text" class="copy-link form-control" value="{{ baseUrl }}/{{ page._id.toString() }}" readonly>
+      </p>
+      {% endif %}
+      <article>
+        {% block content_main_before %}
+        {% endblock %}
+
+        {% block content_main %}
+        {% endblock content_main %}
+
+        {% block content_main_after %}
+        {% endblock %}
+
+        {% block content_footer %}
+        {% endblock %}
+      </article>
+    </div>
+  </div>
+
+</div><!-- /.container-fluid -->
+{% endblock %} {# layout_main #}

lib/views/layout-crowi/not_found.html

@@ -1,8 +1,8 @@
-{% extends '../layout/2column.html' %}
+{% extends 'base/layout.html' %}
 
-{% block layout_header %}
+{% block content_header %}
 
-  {% block layout_header_before %}
+  {% block content_header_before %}
   {% endblock %}
 
   <div class="header-wrap">
@@ -17,7 +17,7 @@
     </header>
   </div>
 
-  {% block layout_header_after %}
+  {% block content_header_after %}
   {% endblock %}
 
 {% endblock %} {# /content_head #}

lib/views/layout-crowi/page.html

@@ -1,10 +1,10 @@
-{% extends '../layout/2column.html' %}
+{% extends 'base/layout.html' %}
 
 {% block html_title %}{{ path|path2name }} · {{ path }}{% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 
-  {% block layout_header_before %}
+  {% block content_header_before %}
   {% endblock %}
 
   <div class="header-wrap">
@@ -34,7 +34,7 @@
     </header>
   </div>
 
-  {% block layout_header_after %}
+  {% block content_header_after %}
   {% endblock %}
 
 {% endblock %}

lib/views/layout-crowi/page_list.html

@@ -1,4 +1,4 @@
-{% extends '../layout/2column.html' %}
+{% extends 'base/layout.html' %}
 
 {% block html_title %}{{ path|path2name }} · {{ path }}{% endblock %}
 
@@ -7,9 +7,9 @@
   data-target="#search-result-list"
 {% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 
-{% block layout_header_before %}
+{% block content_header_before %}
 {% endblock %}
 
 <div class="header-wrap">

lib/views/layout-crowi/user_page.html

@@ -3,7 +3,7 @@
 {% block main_css_class %}user-page{% endblock %}
 
 
-{% block layout_header %}
+{% block content_header %}
   {% if pageUser %}
     {% include '../widget/user_page_header.html' %}
   {% else %}

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

@@ -2,37 +2,45 @@
 
 
 {% block layout_main %}
-<div id="main" class="main col-md-12 {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
-  {% if page && page.grant != 1 %}
-  <p class="page-grant">
-    <i class="fa fa-lock"></i> {{ consts.pageGrants[page.grant] }} ({{ t('Browsing of this page is restricted') }})
-  </p>
-  {% endif %}
-  {% if page && page.grant == 2 %}
-  <p class="alert alert-info">
-    {{ t('Shareable Link') }}
-    <input type="text" class="copy-link form-control" value="{{ baseUrl }}/{{ page._id.toString() }}" readonly>
-  </p>
-  {% endif %}
-  <article>
-    {% block content_main_before %}
-    {% endblock %}
-
-    {% block content_main %}
-    {% endblock content_main %}
-
-    {% block content_main_after %}
-    {% endblock %}
-
-    {% block content_footer %}
-    {% endblock %}
-  </article>
-</div>
-
-{% endblock %} {# layout_main #}
-
-
-{% block layout_footer %}
-  {% parent %}
+<div class="container-fluid">
+
+  <div class="row bg-title">
+    <div class="col-xs-12">
+      {% block content_header %}
+      {% endblock %}
+    </div>
+  </div><!-- /.bg-title -->
+
+  <div class="row m-t-15">
+    <div id="main" class="main col-md-12 {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
+      {% if page && page.grant != 1 %}
+      <p class="page-grant">
+        <i class="fa fa-lock"></i> {{ consts.pageGrants[page.grant] }} ({{ t('Browsing of this page is restricted') }})
+      </p>
+      {% endif %}
+      {% if page && page.grant == 2 %}
+      <p class="alert alert-info">
+        {{ t('Shareable Link') }}
+        <input type="text" class="copy-link form-control" value="{{ baseUrl }}/{{ page._id.toString() }}" readonly>
+      </p>
+      {% endif %}
+      <article>
+        {% block content_main_before %}
+        {% endblock %}
+
+        {% block content_main %}
+        {% endblock content_main %}
+
+        {% block content_main_after %}
+        {% endblock %}
+      </article>
+    </div>
+
+  </div>
+
+</div><!-- /.container-fluid -->
+
+<footer class="footer">
   {% include '../widget/system-version.html' %}
-{% endblock %}
+</footer>
+{% endblock %} {# layout_main #}

lib/views/layout-growi/not_found.html

@@ -1,20 +1,9 @@
 {% extends 'base/layout.html' %}
 
-{% block main_css_class %}
-  main-crowi-plus-customized
-{% endblock %}
-
-{% block layout_header %}
-
-  {% block layout_header_before %}
-  {% endblock %}
 
+{% block content_header %}
   {% include 'widget/header.html' %}
-
-  {% block layout_header_after %}
-  {% endblock %}
-
-{% endblock %} {# /content_head #}
+{% endblock %}
 
 
 {% block content_main_before %}

lib/views/layout-growi/page.html

@@ -1,20 +1,9 @@
 {% extends 'base/layout.html' %}
 
-{% block main_css_class %}
-  {% parent %}
-{% endblock %}
-
-{% block layout_header %}
-
-  {% block layout_header_before %}
-  {% endblock %}
 
+{% block content_header %}
   {% include 'widget/header.html' %}
-
-  {% block layout_header_after %}
-  {% endblock %}
-
-{% endblock %} {# /content_head #}
+{% endblock %}
 
 
 {% block content_main_before %}
@@ -56,10 +45,7 @@
 
 {% block content_main_after %}
   {% include 'widget/comments.html' %}
-{% endblock %}
-
 
-{% block content_footer %}
   {% if page %}
     {% include '../widget/page_attachments.html' %}
   {% endif %}

lib/views/layout-growi/page_list.html

@@ -1,25 +1,12 @@
 {% extends 'base/layout.html' %}
 
-{% block main_css_class %}
-  main-crowi-plus-customized
-  {% parent %}
-{% endblock %}
-
-{% block layout_header %}
-
-  {% block layout_header_before %}
-  {% endblock %}
 
+{% block content_header %}
   {% include 'widget/header.html' %}
-
-  {% block layout_header_after %}
-  {% endblock %}
-
-{% endblock %} {# /content_head #}
+{% endblock %}
 
 
 {% block content_main_before %}
-
 {% endblock %}
 
 

lib/views/layout-growi/user_page.html

@@ -5,7 +5,7 @@
   user-page
 {% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
   {% if pageUser %}
     {% include '../widget/user_page_header.html' %}
   {% else %}

lib/views/layout/2column.html

@@ -1,55 +0,0 @@
-{% extends 'layout.html' %}
-
-{% block layout_main %}
-<a href="" class=" hidden-xs hidden-sm layout-control" id="toggle-sidebar"><i class="fa fa-chevron-right"></i> <span class="hide-on-affix-top"></span></a>
-<aside class="crowi-sidebar col-md-3 hidden-xs hidden-sm hidden-print">
-
-  {% block side_header %}
-  {% endblock %}
-
-  <div class="side-content">
-    {% block side_content %}
-    {% endblock %}
-  </div>
-
-  {% block side_footer %}
-  {% endblock %}
-
-  <div id="footer-container" class="footer">
-    <footer class="">
-      <p>
-        <a href="https://github.com/weseek/crowi-plus">crowi-plus</a> {{ crowiVersion() }}
-        <a href="" class="pull-right" data-target="#shortcuts-modal" data-toggle="modal"><i class="fa fa-keyboard-o"></i>&nbsp;<span class="cmd-key"></span>-/</a>
-      </p>
-    </footer>
-  </div>
-</aside>
-
-<div id="main" class="main col-md-9 {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
-  {% if page && page.grant != 1 %}
-  <p class="page-grant">
-    <i class="fa fa-lock"></i> {{ consts.pageGrants[page.grant] }} ({{ t('Browsing of this page is restricted') }})
-  </p>
-  {% endif %}
-  {% if page && page.grant == 2 %}
-  <p class="alert alert-info">
-    {{ t('Shareable Link') }}
-    <input type="text" class="copy-link form-control" value="{{ baseUrl }}/{{ page._id.toString() }}" readonly>
-  </p>
-  {% endif %}
-  <article>
-    {% block content_main_before %}
-    {% endblock %}
-
-    {% block content_main %}
-    {% endblock content_main %}
-
-    {% block content_main_after %}
-    {% endblock %}
-
-    {% block content_footer %}
-    {% endblock %}
-  </article>
-</div>
-
-{% endblock %} {# layout_main #}

lib/views/layout/admin.html

@@ -1,4 +1,4 @@
-{% extends 'single.html' %}
+{% extends '../layout-growi/base/layout.html' %}
 
 {% block html_additional_headers %}
   {% parent %}

lib/views/layout/layout.html

@@ -227,26 +227,8 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
 
   <!-- Page Content -->
   <div id="page-wrapper">
-    <div class="container-fluid">
-      <div class="row bg-title">
-        <div class="col-xs-12">
-          {% block layout_header %}
-          {% endblock %}
-        </div>
-      </div>
-      <!-- /.row -->
-
-      <div class="row m-t-15">
-        {% block layout_main %}
-        {% endblock %} {# layout_main #}
-      </div>
-
-    </div><!-- /.container-fluid -->
-
-    <footer class="footer">
-      {% block layout_footer %}
-      {% endblock %}
-    </footer>
+    {% block layout_main %}
+    {% endblock %} {# layout_main #}
   </div><!-- /#page-wrapper -->
 
 </div><!-- /#wrapper -->

lib/views/layout/single-nologin.html

@@ -1,16 +0,0 @@
-{% extends 'layout.html' %}
-
-{% block html_base_css %}single nologin{% endblock %}
-
-{% block layout_head_nav %}
-{% endblock  %} {# layout_head_nav #}
-
-{% block layout_main %}
-
-  {% block content_main %}
-  {% endblock content_main %}
-
-  {% block content_footer %}
-  {% endblock %}
-
-{% endblock %} {# layout_main #}

lib/views/layout/single.html

@@ -1,42 +0,0 @@
-{% extends 'layout.html' %}
-
-{% block layout_main %}
-<div id="main" class="main col-md-12">
-  <article>
-    {% block content_main %}
-    {% endblock content_main %}
-
-    {% block content_footer %}
-    {% endblock %}
-  </article>
-</div>
-
-{% endblock %} {# layout_main #}
-
-{% block layout_footer %}
-{% parent %}
-<div class="system-version">
-  <span>
-    <a href="https://github.com/weseek/crowi-plus">crowi-plus</a> {{ crowiVersion() }}
-  </span>
-  <span>
-    <a href="" data-target="#shortcuts-modal" data-toggle="modal"><i class="fa fa-keyboard-o"></i>&nbsp;<span class="cmd-key"></span>-/</a>
-  </span>
-</div>
-<script>
-  /*
-  * add classes to cmd-key by OS
-  */
-  var platform = navigator.platform.toLowerCase();
-  var isMac = (platform.indexOf('mac') > -1);
-
-  document.querySelectorAll('.system-version .cmd-key').forEach((element) => {
-    if (isMac) {
-      element.classList.add('mac');
-    }
-    else {
-      element.classList.add('win', 'key-longer');
-    }
-  })
-</script>
-{% endblock %}

lib/views/login.html

@@ -1,4 +1,4 @@
-{% extends 'layout/single-nologin.html' %}
+{% extends 'layout-growi/base/layout.html' %}
 
 {% block html_title %}{{ t('Sign in') }} · {% endblock %}
 

lib/views/me/api_token.html

@@ -1,9 +1,9 @@
-{% extends '../layout/2column.html' %}
+{% extends '../layout-growi/base/layout.html' %}
 
 
 {% block html_title %}{{ t('API Settings') }} · {{ path }}{% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
   <h1 class="title" id="">{{ t('Home') }}</h1>

lib/views/me/external-accounts.html

@@ -1,8 +1,8 @@
-{% extends '../layout/2column.html' %}
+{% extends '../layout-growi/base/layout.html' %}
 
 {% block html_title %}{{ t('Password Settings') }} · {{ path }}{% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id="">{{ t('Home') }}</h1>

lib/views/me/index.html

@@ -1,8 +1,8 @@
-{% extends '../layout/2column.html' %}
+{% extends '../layout-growi/base/layout.html' %}
 
 {% block html_title %}{{ t('Home') }} · {{ path }}{% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id="">{{ t('Home') }}</h1>

lib/views/me/password.html

@@ -1,8 +1,8 @@
-{% extends '../layout/2column.html' %}
+{% extends '../layout-growi/base/layout.html' %}
 
 {% block html_title %}{{ t('Password Settings') }} · {{ path }}{% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title" id="">{{ t('Home') }}</h1>

lib/views/search.html

@@ -1,4 +1,4 @@
-{% extends 'layout/single.html' %}
+{% extends 'layout-growi/base/layout.html' %}
 
 {% block main_css_class %}search-page{% endblock %}
 {% block html_base_attr %}

lib/views/user/bookmarks.html

@@ -1,10 +1,10 @@
-{% extends '../layout/2column.html' %}
+{% extends '../layout/layout.html' %}
 
 {% block main_css_class %}bookmark-page{% endblock %}
 
 {% block html_title %}{{ pageUser.name }}'s Bookmarks · {% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title">{{ pageUser.name }}'s Bookmarks</h1>

lib/views/user/recent-create.html

@@ -1,10 +1,10 @@
-{% extends '../layout/2column.html' %}
+{% extends '../layout/layout.html' %}
 
 {% block main_css_class %}recent-create-page{% endblock %}
 
 {% block html_title %}{{ pageUser.name }}'s Recent Created Pages 揃 {% endblock %}
 
-{% block layout_header %}
+{% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
     <h1 class="title">{{ pageUser.name }}'s Created Pages</h1>