Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285

Browse Source
This commit is contained in:
wangyidong
2023-02-01 17:07:24 +08:00
parent 96e8ac519d 2ef5fe6d4a
commit 85bcf30edf
6 changed files with 71 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/css/index.css
+4 -3
View File
@@ -11,7 +11,7 @@
.settings.panel, .plug.panel {margin-bottom: 16px;}
.settings-list {display: flex; flex-wrap: wrap; padding: 0 4px 16px 4px;}
.settings-list > .setting-box {flex: 1 1 18%; padding: 8px; border: 1px solid #E3E4E9; margin-right: 10px; margin-top: 16px; display: flex; flex-direction: column; justify-content: space-between; cursor: pointer;}
.settings-list > .setting-box {flex: 1 1 18%; padding: 8px; border: 1px solid rgba(227, 228, 233, 0.6); margin-right: 10px; margin-top: 16px; display: flex; flex-direction: column; justify-content: space-between; cursor: pointer;}
.settings-list > .setting-box > h4 > img {padding-right: 16px;}
.settings-list > .setting-box > .setting-desc {padding-bottom: 16px;}
@@ -32,9 +32,10 @@
.official-content > .content {color: #838A9D; font-size: 12px;}
.official-content > .title {color: #313C52; font-size: 13px;}
.classList > .classItem {flex: 1 1 30%; margin: 5px; border: 1px solid #E3E4E9; border-radius: 4px; margin-bottom: 16px; align-items: center;}
.classList > .classItem {flex: 1 1 30%; margin: 5px; border: 1px solid rgba(227, 228, 233, 0.6); border-radius: 4px; margin-bottom: 16px; align-items: center;}
.classItem > .imgBack {flex: 1 1 50%;}
.classItem > .imgBack > .classImg {background-repeat: no-repeat; background-size: contain; aspect-ratio: 16 / 9; background-position: center; margin: 0px; border-radius: 4px;}
.classItem > .imgBack > .classImg {background-repeat: no-repeat; background-size: contain; aspect-ratio: 16 / 9; background-position: center; margin: 0px; border-top-left-radius: 4px; border-top-right-radius: 4px;}
.classItem > .classContent {flex: 1 1 50%; padding: 5px; font-size: 14px; color: #0B0F18; text-align: center; overflow: hidden; height: 24px; margin-bottom: 6px; font-weight: 700;}
.more {float: right; padding-right: 12px; font-weight: normal;}
.panel.publicClass {padding: 0 10px;}
.setting-help {width: 45px;}
module/admin/lang/de.php
+19 -19
View File
@@ -149,25 +149,25 @@ $lang->admin->safe->noticeWeakMode = 'The password will be checked when logging
$lang->admin->safe->noticeStrong = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!';
$lang->admin->safe->noticeGd = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.';
$lang->admin->menuSetting['system']['name'] = 'System';
$lang->admin->menuSetting['system']['desc'] = '';
$lang->admin->menuSetting['user']['name'] = 'User';
$lang->admin->menuSetting['user']['desc'] = '';
$lang->admin->menuSetting['switch']['name'] = 'Switch';
$lang->admin->menuSetting['switch']['desc'] = '';
$lang->admin->menuSetting['model']['name'] = 'Model';
$lang->admin->menuSetting['model']['desc'] = '';
$lang->admin->menuSetting['feature']['name'] = 'Feature';
$lang->admin->menuSetting['feature']['desc'] = '';
$lang->admin->menuSetting['template']['name'] = 'Template';
$lang->admin->menuSetting['template']['desc'] = '';
$lang->admin->menuSetting['message']['name'] = 'Message';
$lang->admin->menuSetting['message']['desc'] = '';
$lang->admin->menuSetting['system']['name'] = 'System';
$lang->admin->menuSetting['system']['desc'] = 'System elements configuration, such as backup, chat, security etc.';
$lang->admin->menuSetting['user']['name'] = 'User';
$lang->admin->menuSetting['user']['desc'] = 'Manage departments,add members and group configuration permissions.';
$lang->admin->menuSetting['switch']['name'] = 'Switch';
$lang->admin->menuSetting['switch']['desc'] = 'Turn on and off some functions of the system.';
$lang->admin->menuSetting['model']['name'] = 'Model';
$lang->admin->menuSetting['model']['desc'] = 'Configure different project management models and project common elements.';
$lang->admin->menuSetting['feature']['name'] = 'Feature';
$lang->admin->menuSetting['feature']['desc'] = 'Configure the elements of the system according to the function menu.';
$lang->admin->menuSetting['template']['name'] = 'Template';
$lang->admin->menuSetting['template']['desc'] = 'Configure the template type and template content of the document.';
$lang->admin->menuSetting['message']['name'] = 'Message';
$lang->admin->menuSetting['message']['desc'] = 'Configure notification paths and customize the actions to be notified.';
$lang->admin->menuSetting['extension']['name'] = 'Extension';
$lang->admin->menuSetting['extension']['desc'] = '';
$lang->admin->menuSetting['dev']['name'] = 'Develop';
$lang->admin->menuSetting['dev']['desc'] = '';
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
$lang->admin->menuSetting['convert']['desc'] = '';
$lang->admin->menuSetting['extension']['desc'] = 'Browse and install plugins.';
$lang->admin->menuSetting['dev']['name'] = 'Develop';
$lang->admin->menuSetting['dev']['desc'] = 'Support for secondary development of the system.';
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
$lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.';
include dirname(__FILE__) . '/menu.php';
module/admin/lang/en.php
+19 -19
View File
@@ -149,25 +149,25 @@ $lang->admin->safe->noticeWeakMode = 'The password will be checked when logging
$lang->admin->safe->noticeStrong = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!';
$lang->admin->safe->noticeGd = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.';
$lang->admin->menuSetting['system']['name'] = 'System';
$lang->admin->menuSetting['system']['desc'] = '';
$lang->admin->menuSetting['user']['name'] = 'User';
$lang->admin->menuSetting['user']['desc'] = '';
$lang->admin->menuSetting['switch']['name'] = 'Switch';
$lang->admin->menuSetting['switch']['desc'] = '';
$lang->admin->menuSetting['model']['name'] = 'Model';
$lang->admin->menuSetting['model']['desc'] = '';
$lang->admin->menuSetting['feature']['name'] = 'Feature';
$lang->admin->menuSetting['feature']['desc'] = '';
$lang->admin->menuSetting['template']['name'] = 'Template';
$lang->admin->menuSetting['template']['desc'] = '';
$lang->admin->menuSetting['message']['name'] = 'Message';
$lang->admin->menuSetting['message']['desc'] = '';
$lang->admin->menuSetting['system']['name'] = 'System';
$lang->admin->menuSetting['system']['desc'] = 'System elements configuration, such as backup, chat, security etc.';
$lang->admin->menuSetting['user']['name'] = 'User';
$lang->admin->menuSetting['user']['desc'] = 'Manage departments,add members and group configuration permissions.';
$lang->admin->menuSetting['switch']['name'] = 'Switch';
$lang->admin->menuSetting['switch']['desc'] = 'Turn on and off some functions of the system.';
$lang->admin->menuSetting['model']['name'] = 'Model';
$lang->admin->menuSetting['model']['desc'] = 'Configure different project management models and project common elements.';
$lang->admin->menuSetting['feature']['name'] = 'Feature';
$lang->admin->menuSetting['feature']['desc'] = 'Configure the elements of the system according to the function menu.';
$lang->admin->menuSetting['template']['name'] = 'Template';
$lang->admin->menuSetting['template']['desc'] = 'Configure the template type and template content of the document.';
$lang->admin->menuSetting['message']['name'] = 'Message';
$lang->admin->menuSetting['message']['desc'] = 'Configure notification paths and customize the actions to be notified.';
$lang->admin->menuSetting['extension']['name'] = 'Extension';
$lang->admin->menuSetting['extension']['desc'] = '';
$lang->admin->menuSetting['dev']['name'] = 'Develop';
$lang->admin->menuSetting['dev']['desc'] = '';
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
$lang->admin->menuSetting['convert']['desc'] = '';
$lang->admin->menuSetting['extension']['desc'] = 'Browse and install plugins.';
$lang->admin->menuSetting['dev']['name'] = 'Develop';
$lang->admin->menuSetting['dev']['desc'] = 'Support for secondary development of the system.';
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
$lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.';
include dirname(__FILE__) . '/menu.php';
module/admin/lang/fr.php
+19 -19
View File
@@ -149,25 +149,25 @@ $lang->admin->safe->noticeWeakMode = "Le mot de passe sera vérifié lors de la
$lang->admin->safe->noticeStrong = "Le mot de passe est d'autant plus sécurisé qu'il est long, qu'il contient plus de lettres, de chiffres ou de caractères spéciaux, et que les lettres du mot de passe sont peu répétitives !";
$lang->admin->safe->noticeGd = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.';
$lang->admin->menuSetting['system']['name'] = 'System';
$lang->admin->menuSetting['system']['desc'] = '';
$lang->admin->menuSetting['user']['name'] = 'User';
$lang->admin->menuSetting['user']['desc'] = '';
$lang->admin->menuSetting['switch']['name'] = 'Switch';
$lang->admin->menuSetting['switch']['desc'] = '';
$lang->admin->menuSetting['model']['name'] = 'Model';
$lang->admin->menuSetting['model']['desc'] = '';
$lang->admin->menuSetting['feature']['name'] = 'Feature';
$lang->admin->menuSetting['feature']['desc'] = '';
$lang->admin->menuSetting['template']['name'] = 'Template';
$lang->admin->menuSetting['template']['desc'] = '';
$lang->admin->menuSetting['message']['name'] = 'Message';
$lang->admin->menuSetting['message']['desc'] = '';
$lang->admin->menuSetting['system']['name'] = 'System';
$lang->admin->menuSetting['system']['desc'] = 'System elements configuration, such as backup, chat, security etc.';
$lang->admin->menuSetting['user']['name'] = 'User';
$lang->admin->menuSetting['user']['desc'] = 'Manage departments,add members and group configuration permissions.';
$lang->admin->menuSetting['switch']['name'] = 'Switch';
$lang->admin->menuSetting['switch']['desc'] = 'Turn on and off some functions of the system.';
$lang->admin->menuSetting['model']['name'] = 'Model';
$lang->admin->menuSetting['model']['desc'] = 'Configure different project management models and project common elements.';
$lang->admin->menuSetting['feature']['name'] = 'Feature';
$lang->admin->menuSetting['feature']['desc'] = 'Configure the elements of the system according to the function menu.';
$lang->admin->menuSetting['template']['name'] = 'Template';
$lang->admin->menuSetting['template']['desc'] = 'Configure the template type and template content of the document.';
$lang->admin->menuSetting['message']['name'] = 'Message';
$lang->admin->menuSetting['message']['desc'] = 'Configure notification paths and customize the actions to be notified.';
$lang->admin->menuSetting['extension']['name'] = 'Extension';
$lang->admin->menuSetting['extension']['desc'] = '';
$lang->admin->menuSetting['dev']['name'] = 'Develop';
$lang->admin->menuSetting['dev']['desc'] = '';
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
$lang->admin->menuSetting['convert']['desc'] = '';
$lang->admin->menuSetting['extension']['desc'] = 'Browse and install plugins.';
$lang->admin->menuSetting['dev']['name'] = 'Develop';
$lang->admin->menuSetting['dev']['desc'] = 'Support for secondary development of the system.';
$lang->admin->menuSetting['convert']['name'] = 'Data Import';
$lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.';
include dirname(__FILE__) . '/menu.php';
module/admin/model.php
+6 -2
View File
@@ -379,12 +379,16 @@ class adminModel extends model
if(empty($currentMenuKey)) return null;
$currentMenu = $this->lang->admin->menuList->$currentMenuKey;
$output = "<div class='btn-group header-btn dropdown'><button class='btn pull-right btn-link' data-toggle='dropdown'> <span class='text'>{$currentMenu['name']}</span> <span class='caret'></span></button><ul class='dropdown-menu' id='adminMenu' style='width:135px;'>";
$output = "<div class='btn-group header-btn'>";
$output .= "<button class='btn pull-right btn-link' data-toggle='dropdown'>";
$output .= "<span class='text'>{$currentMenu['name']}</span> ";
$output .= "<span class='caret'></span></button>";
$output .= "<ul class='dropdown-menu' id='adminMenu'>";
foreach($this->lang->admin->menuList as $menuKey => $menuGroup)
{
$class = $menuKey == $currentMenuKey ? "class='active'" : '';
if($menuGroup['disabled']) $class .= ' disabled';
$output .= "<li $class>" . html::a($menuGroup['disabled'] ? '###' : $menuGroup['link'], "<img src='{$this->config->webRoot}static/svg/admin-{$menuKey}.svg' style='padding-right:10px;' />" . $menuGroup['name']) . "</li>";
$output .= "<li $class>" . html::a($menuGroup['disabled'] ? '###' : $menuGroup['link'], "<img src='{$this->config->webRoot}static/svg/admin-{$menuKey}.svg' style='padding-right:10px;' />" . $menuGroup['name']) . "</li>";
}
$output .= "</ul></div>";