diff --git a/module/admin/config.php b/module/admin/config.php old mode 100644 new mode 100755 diff --git a/module/admin/control.php b/module/admin/control.php old mode 100644 new mode 100755 diff --git a/module/admin/css/index.css b/module/admin/css/index.css old mode 100644 new mode 100755 index e954c9c911..ec95e71c69 --- a/module/admin/css/index.css +++ b/module/admin/css/index.css @@ -1,3 +1,18 @@ #notice {margin: -20px -20px 20px; padding: 20px;} #zentaoLinks {margin-top: 20px;} #zentaoLinks .panel .panel-heading {padding: 6px 10px;} +.admin {display: flex; background: unset;} +.admin > .main {flex: 1 1 60%; padding-right: 10px;} +.admin > .side {flex: 1 1 40%; padding-left: 10px;} +.panel-title {padding: 10px 0px;} +.flex {display: flex;} +.panel {padding: 0 16px;} + +.settings-list {display: flex; flex-wrap: wrap; padding: 12px 4px 16px 4px;} +.settings-list > .setting-box {flex: 0 0 20%; padding: 18px 0;} + +.plugin-list {display: flex; flex-wrap: wrap; padding: 12px 4px 4px 4px;} +.plugin-list > .plugin-item {flex: 1 1 33%; padding: 16px 4px;} + +.bottom.flex > .official {flex: 1 1 30%;} +.bottom.flex > .openClass {flex: 1 1 60%; margin-left: 20px;} diff --git a/module/admin/css/safe.en.css b/module/admin/css/safe.en.css old mode 100644 new mode 100755 diff --git a/module/admin/css/safe.vi.css b/module/admin/css/safe.vi.css old mode 100644 new mode 100755 diff --git a/module/admin/css/safe.zh-cn.css b/module/admin/css/safe.zh-cn.css old mode 100644 new mode 100755 diff --git a/module/admin/css/safe.zh-tw.css b/module/admin/css/safe.zh-tw.css old mode 100644 new mode 100755 diff --git a/module/admin/css/setmodule.css b/module/admin/css/setmodule.css old mode 100644 new mode 100755 diff --git a/module/admin/js/checkweak.js b/module/admin/js/checkweak.js old mode 100644 new mode 100755 diff --git a/module/admin/js/log.js b/module/admin/js/log.js old mode 100644 new mode 100755 diff --git a/module/admin/js/safe.js b/module/admin/js/safe.js old mode 100644 new mode 100755 diff --git a/module/admin/js/setmodule.js b/module/admin/js/setmodule.js old mode 100644 new mode 100755 diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php old mode 100644 new mode 100755 diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php old mode 100644 new mode 100755 diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php old mode 100644 new mode 100755 diff --git a/module/admin/lang/vi.php b/module/admin/lang/vi.php old mode 100644 new mode 100755 diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php old mode 100644 new mode 100755 index 33831b046d..6a37c3cd4a --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -25,11 +25,15 @@ $lang->admin->resetPWDSetting = '重置密码设置'; $lang->admin->tableEngine = '表引擎'; $lang->admin->setModuleIndex = '系统功能配置'; -$lang->admin->api = '接口'; -$lang->admin->log = '日志'; -$lang->admin->setting = '设置'; -$lang->admin->days = '日志保存天数'; -$lang->admin->resetPWDByMail = '通过邮箱重置密码'; +$lang->admin->api = '接口'; +$lang->admin->log = '日志'; +$lang->admin->setting = '设置'; +$lang->admin->pluginRecommendation = '插件推荐'; +$lang->admin->zentaoInfo = '禅道信息'; +$lang->admin->officialAccount = '官方公众号'; +$lang->admin->openClass = '公开课'; +$lang->admin->days = '日志保存天数'; +$lang->admin->resetPWDByMail = '通过邮箱重置密码'; $lang->admin->changeEngine = "更换到InnoDB"; $lang->admin->changingTable = '正在更换数据表%s引擎...'; diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php old mode 100644 new mode 100755 diff --git a/module/admin/model.php b/module/admin/model.php old mode 100644 new mode 100755 diff --git a/module/admin/view/bind.html.php b/module/admin/view/bind.html.php old mode 100644 new mode 100755 diff --git a/module/admin/view/certifyztemail.html.php b/module/admin/view/certifyztemail.html.php old mode 100644 new mode 100755 diff --git a/module/admin/view/certifyztmobile.html.php b/module/admin/view/certifyztmobile.html.php old mode 100644 new mode 100755 diff --git a/module/admin/view/checkweak.html.php b/module/admin/view/checkweak.html.php old mode 100644 new mode 100755 diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php old mode 100644 new mode 100755 index 2ac6cdc8a8..dbc150d456 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -11,25 +11,45 @@ */ ?> -
- -
- ' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?> -
admin->notice->register, html::a(inlink('register'), $lang->admin->registerNotice->click, '', 'class="alert-link"'));?>
+
+
+
+
admin->setting?>
+
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
+
+
+
+
admin->pluginRecommendation?>
+
+
1
+
2
+
3
+
4
+
5
+
6
+
+
+
+
+
admin->officialAccount?>
+
+
+
admin->openClass?>
+
+
- - -
-

- version; - if(trim($config->visions, ',') == 'lite') $versionName = $lang->liteName . $config->liteVersion; - printf($lang->admin->info->version, $versionName); - if($bind) echo sprintf($lang->admin->info->account, '' . $account . ''); - echo $lang->admin->info->links; - ?> -

+
+
admin->zentaoInfo?>
-
diff --git a/module/admin/view/log.html.php b/module/admin/view/log.html.php old mode 100644 new mode 100755 diff --git a/module/admin/view/register.html.php b/module/admin/view/register.html.php old mode 100644 new mode 100755 diff --git a/module/admin/view/resetpwdsetting.html.php b/module/admin/view/resetpwdsetting.html.php old mode 100644 new mode 100755 diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php old mode 100644 new mode 100755 diff --git a/module/admin/view/setmodule.html.php b/module/admin/view/setmodule.html.php old mode 100644 new mode 100755 diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php old mode 100644 new mode 100755 diff --git a/module/admin/view/tableengine.html.php b/module/admin/view/tableengine.html.php old mode 100644 new mode 100755 diff --git a/module/admin/view/ztcompany.html.php b/module/admin/view/ztcompany.html.php old mode 100644 new mode 100755