reorganize layout for admin pages

src/client/styles/scss/_admin.scss

@@ -1,6 +1,7 @@
 .admin-page {
   .title {
-    padding: 0.5rem 15px;
+    padding-top: 1rem;
+    padding-bottom: 1rem;
 
     line-height: 1em;
 

src/server/views/admin/app.html

@@ -11,10 +11,7 @@
 
 
 {% block content_main %}
-<div class="content-main admin-app row">
-  {% parent %}
-  <div class="col-lg-9" id="admin-app"></div>
-</div>
+  <div id="admin-app"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/admin/customize.html

@@ -17,13 +17,10 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main admin-customize row">
-  {% parent %}
-  <div id="grw-hljs-container-for-demo">
-    {{ cdnHighlightJsStyleTag(getConfig('crowi', 'customize:highlightJsStyle')) }}
-  </div>
-  <div class="col-lg-9" id="admin-customize"></div>
+<div id="grw-hljs-container-for-demo">
+  {{ cdnHighlightJsStyleTag(getConfig('crowi', 'customize:highlightJsStyle')) }}
 </div>
+<div id="admin-customize" class="admin-customize"></div>
 {% endblock content_main %}
 
 {% block content_footer %} {% endblock content_footer %}

src/server/views/admin/export.html

@@ -7,11 +7,7 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main admin-export row">
-  {% parent %}
-  <div id="admin-export-page" class="col-lg-9"></div>
-</div>
-
+<div id="admin-export-page" class="admin-export"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/admin/external-accounts.html

@@ -7,10 +7,7 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main row">
-  {% parent %}
-  <div class="col-lg-9" id="admin-external-account-setting"></div>
-</div>
+<div id="admin-external-account-setting"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/admin/global-notification-detail.html

@@ -7,13 +7,9 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main row">
-  {% parent %}
-  <div class="col-lg-9" id="admin-global-notification-setting"
-      data-global-notification="{{ globalNotification|json }}"></div>
-</div>
+<div id="admin-global-notification-setting"
+    data-global-notification="{{ globalNotification|json }}"></div>
+{% endblock content_main %}
 
-  {% endblock content_main %}
-
-  {% block content_footer %}
-  {% endblock content_footer %}
+{% block content_footer %}
+{% endblock content_footer %}

src/server/views/admin/importer.html

@@ -7,11 +7,7 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main admin-importer row">
-  {% parent %}
-  <div class="col-lg-9" id="admin-importer"></div>
-</div>
-
+<div id="admin-importer" class="admin-importer"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/admin/index.html

@@ -7,10 +7,7 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main row">
-  {% parent %}
-  <div class="col-lg-9" id="admin-home"></div>
-</div>
+<div id="admin-home"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/admin/markdown.html

@@ -7,11 +7,7 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main row">
-  {% parent %}
-  <div class="col-lg-9" id="admin-markdown-setting"></div>
-</div>
-
+<div id="admin-markdown-setting"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/admin/notification.html

@@ -7,10 +7,7 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main admin-notification row">
-  {% parent %}
-  <div class="col-lg-9" id="admin-notification-setting"></div>
-</div>
+<div id="admin-notification-setting" class="admin-notification"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/admin/search.html

@@ -7,16 +7,7 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main row">
-  {% parent %}
-    <div
-      class="col-lg-9"
-      id ="admin-full-text-search-management"
-    >
-    </div>
-</div>
-
-
+  <div id ="admin-full-text-search-management"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/admin/security.html

@@ -7,10 +7,7 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main admin-security row">
-  {% parent %}
-  <div class="col-lg-9" id="admin-security-setting"></div>
-</div>
+<div id="admin-security-setting" class="admin-security"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/admin/user-group-detail.html

@@ -7,14 +7,10 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main row">
-  {% parent %}
-  <div
-    id="admin-user-group-detail"
-    class="col-lg-9"
-    data-user-group="{{ userGroup|json }}"
-  >
-  </div>
+<div
+  id="admin-user-group-detail"
+  data-user-group="{{ userGroup|json }}"
+>
 </div>
 {% endblock content_main %}
 

src/server/views/admin/user-groups.html

@@ -7,10 +7,7 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main row">
-  {% parent %}
-  <div id ="admin-user-group-page" class="col-lg-9"></div>
-</div>
+<div id ="admin-user-group-page"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/admin/users.html

@@ -7,14 +7,7 @@
 {% endblock %}
 
 {% block content_main %}
-<div class="content-main row">
-  {% parent %}
-  <div
-    class="col-lg-9"
-    id ="admin-user-page"
-  >
-  </div>
-</div>
+<div id ="admin-user-page"></div>
 {% endblock content_main %}
 
 {% block content_footer %}

src/server/views/layout/admin.html

@@ -1,17 +1,40 @@
-{% extends '../layout-growi/base/layout.html' %}
-
+{% extends './layout.html' %}
 
 {% block html_base_css %}admin-page{% endblock %}
 
-
 {% block html_head_loading_app %}
 <script src="{{ webpack_asset('js/admin.js') }}" defer></script>
 {% endblock %}
 
-{% block content_main %}
-  <div class="col-lg-3" id="admin-navigation"></div>
-{% endblock content_main %}
+{% block layout_main %}
 
-{# disable custom script in admin page #}
-{% block custom_script %}
+{% block content_header_wrapper %}
+<header class="container-fluid py-0">
+  {% block content_header %}
+    <div id="grw-subnav-container"></div>
+  {% endblock %}
+</header>
 {% endblock %}
+
+<div id="main" class="main {% block main_css_class %}{% endblock %}">
+
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-lg-3" id="admin-navigation"></div>
+      <div class="col-lg-9">
+        {% block content_main_before %}
+        {% endblock %}
+
+        {% block content_main %}
+        {% endblock content_main %}
+
+        {% block content_main_after %}
+        {% endblock %}
+      </div>
+    </div>
+  </div>
+</div><!-- /.main -->
+
+<footer class="footer">
+</footer>
+{% endblock %} {# layout_main #}