拆分域管理与系统管理

templates/domain_base.html

@@ -0,0 +1,33 @@
+{% extends "layout/basic.html" %}
+{% block content %}
+<div class="row" data-sticky-parent>
+  <div class="medium-9 columns">
+  {% block domain_content %}{% endblock %}
+  </div>
+  <div class="medium-3 columns"><div data-sticky="large">
+    <div class="section side">
+      <ol class="menu">
+        <li class="menu__item">
+          <div class="menu__link expandable">
+            <span class="icon icon-info"></span> {{ _('Properties') }}
+          </div>
+          <ol class="menu collapsed">
+            {{ sidemenu.render_item(null, 'domain_dashboard', '/domain/dashboard') }}
+            {{ sidemenu.render_item(null, 'domain_edit', '/domain/edit') }}
+          </ol>
+        </li>
+        <li class="menu__item">
+          <div class="menu__link expandable">
+            <span class="icon icon-user"></span> {{ _('Access Control') }}
+          </div>
+          <ol class="menu collapsed">
+            {{ sidemenu.render_item(null, 'domain_role', '/domain/role') }}
+            {{ sidemenu.render_item(null, 'domain_user', '/domain/user') }}
+            {{ sidemenu.render_item(null, 'domain_permission', '/domain/permission') }}
+          </ol>
+        </li>
+      </ol>
+    </div>
+  </div></div>
+</div>
+{% endblock %}

templates/domain_dashboard.html

@@ -0,0 +1,22 @@
+{% import "components/user.html" as user %}
+{% extends "domain_base.html" %}
+{% block domain_content %}
+{% if domain.bulletin %}
+<div class="section">
+  <div class="section__body typo">
+    {{ domain.bulletin|markdown|safe }}
+  </div>
+</div>
+{% endif %}
+<div class="section">
+  <div class="section__header">
+    <h1 class="section__title" data-heading>{{ _('Information') }}</h1>
+  </div>
+  <div class="section__body typo">
+    <dl class="large horizontal">
+    <dt>{{ _('Gravatar') }}</dt><dd><img src="{{ gravatar(domain.gravatar) }}" width="32" height="32"></dd>
+    <dt>{{ _('Name') }}</dt><dd>{{ domain.name }}</dd>
+    </dl>
+  </div>
+</div>
+{% endblock %}

templates/domain_edit.html

@@ -1,6 +1,5 @@
-{% import "components/form.html" as form with context %}
-{% extends "manage_base.html" %}
-{% block manage_content %}
+{% extends "domain_base.html" %}
+{% block domain_content %}
 <div class="section">
   <div class="section__body">
     <form method="post">

templates/domain_permission.html

@@ -1,5 +1,5 @@
-{% extends "manage_base.html" %}
-{% block manage_content %}
+{% extends "domain_base.html" %}
+{% block domain_content %}
 <form method="post">
 <div class="section">
   <div class="section__header">

templates/domain_role.html

@@ -1,5 +1,5 @@
-{% extends "manage_base.html" %}
-{% block manage_content %}
+{% extends "domain_base.html" %}
+{% block domain_content %}
 <div style="display: none" class="dialog__body--create-role">
   <div>
     <div class="row"><div class="columns">

templates/domain_user.html

@@ -1,5 +1,5 @@
-{% extends "manage_base.html" %}
-{% block manage_content %}
+{% extends "domain_base.html" %}
+{% block domain_content %}
 <div style="display: none" class="dialog__body--add-user">
   <div>
     <div class="row"><div class="columns">

templates/home_file.html

@@ -7,7 +7,7 @@
     {% if handler.has_priv(vj4.model.builtin.PRIV_CREATE_FILE) %}
       <a class="primary rounded button" href="{{ reverse_url('fs_upload') }}" target="_blank"><span class="icon icon-add"></span> {{ _('Upload File') }}</a>
     {% endif %}
-      <a class="tool-button" href="/wiki/help#file"><span class="icon icon-help"></span> {{ _('What\'s file?') }}</a>
+      <a class="tool-button" href="/wiki/help#file"><span class="icon icon-help"></span> {{ _("What's file?") }}</a>
     </div>
   </div>
   <div class="section__body no-padding">

templates/manage_base.html

@@ -13,21 +13,10 @@
           </div>
           <ol class="menu collapsed">
             {{ sidemenu.render_item(null, 'manage_dashboard', '/manage/dashboard') }}
-            {{ sidemenu.render_item(null, 'manage_edit', '/manage/edit') }}
             {{ sidemenu.render_item(null, 'manage_module', '/manage/module') }}
             {{ sidemenu.render_item(null, 'manage_setting', '/manage/setting') }}
           </ol>
         </li>
-        <li class="menu__item">
-          <div class="menu__link expandable">
-            <span class="icon icon-user"></span> {{ _('Access Control') }}
-          </div>
-          <ol class="menu collapsed">
-            {{ sidemenu.render_item(null, 'manage_role', '/manage/role') }}
-            {{ sidemenu.render_item(null, 'manage_user', '/manage/user') }}
-            {{ sidemenu.render_item(null, 'manage_permission', '/manage/permission') }}
-          </ol>
-        </li>
       </ol>
     </div>
   </div></div>

templates/partials/setting.html

@@ -53,6 +53,13 @@
           value:current[setting.key] or setting.value,
           markdown:true
         }) }}
+  {% elif setting.ui == 'checkbox' %}
+    {{ form.form_checkbox({
+          label:setting.name,
+          help_text:setting.desc,
+          name:setting.key,
+          value:current[setting.key] or setting.value
+    })}}
   {% endif %}
   {% endfor %}
   </div>