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

Merge branch 'dev/gfl_task_#88327_refactors' into 'sprint/285'

Browse Source 
Dev/gfl task #88327 refactors

See merge request easycorp/zentaopms!6880
This commit is contained in:
王怡栋
2023-02-08 03:13:27 +00:00
parent c29df55df8 8700d05e87
commit 98c99cf572
3 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/css/index.css
+18 -9
View File
@@ -4,13 +4,22 @@
.justify-between {justify-content: space-between;}
.title-color {color: #313C52}
.font-13 {font-size: 13px;}
.color-gray {color: #5E626D;}
.border-gray {border: 1px solid #E3E4E9;}
.h-56 {height: 56px;}
.h-40 {height: 40px;}
.pl-16 {padding-left: 16px;}
.px-16 {padding: 0 16px;}
.mb-16 {margin-bottom: 16px;}
.mr-16 {margin-right: 16px;}
.mx-16 {margin: 0 16px;}
.pd-3 {padding: 3px;}
.pb-3 {padding-bottom: 3px;}
.pr-4 {padding-right: 4px;}
.mt-6 {margin-top: 6px;}
.font-18 {font-size: 18px;}
.font-20 {font-size: 20px;}
.font-24 {font-size: 24px;}
.radius-4 {border-radius: 4px;}
#notice {margin: -20px -20px 20px; padding: 20px;}
#zentaoLinks {margin-top: 20px;}
@@ -19,7 +28,7 @@
.admin {display: flex; background: unset; box-shadow: none;}
.admin h4 {color: #0B0F18;}
.admin > .main {flex: 1 1 70%;}
.admin > .side {flex: 1 1 30%; padding-left: 10px; margin-left: 16px;}
.admin > .side {flex: 1 1 30%; margin-left: 16px; padding-right: 16px;}
.panel-title {padding: 10px 0px;}
.panel {padding: 0 0 0 16px;}
.settings.panel, .plug.panel {margin-bottom: 16px;}
@@ -51,7 +60,7 @@
.official-content > .title {color: #313C52; font-size: 13px; line-height: 14px;}
.classList {aspect-ratio: 4/1;}
.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;}
.classList > .classItem {flex: 1 1 30%; margin: 5px; border: 1px solid rgba(227, 228, 233, 0.6); border-radius: 4px; padding-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-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;}
@@ -61,7 +70,6 @@
.setting-help {width: 45px; color: #9EA3B0;}
.pointer-none {pointer-events: none;}
.pd-3 {padding: 3px;}
/* css for without internet */
.main.without-internet {display: flex; flex-wrap: wrap;}
@@ -70,14 +78,15 @@
.main.without-internet > .bottom > .official.panel > .main-panel {flex-direction: row-reverse;}
/* css in side */
.time-block {background: #EDEEF2; padding: 4px; border-radius: 4px; color: #0B0F18; font-size: 15px;}
.dynamic-block {height: 64px; padding: 12px 16px; display: flex; justify-content: space-between; position: relative; line-height: 20px; border-top: 1px solid #E3E4E9;}
.dynamic-content {height: 40px; overflow: hidden;}
.dynamic-time {white-space: nowrap; position: absolute; right: 20px; bottom: 10px; padding-right: 12px; background: white;}
.time-block {background: #EDEEF2; padding:2px 4px; border-radius: 4px; color: #0B0F18; font-size: 15px;}
.dynamic-block {height: 74px; padding: 12px 16px; display: flex; justify-content: space-between; position: relative; line-height: 20px; border-top: 1px solid #E3E4E9;}
.dynamic-content {height: 50px; line-height: 25px; overflow: hidden;}
.dynamic-time {white-space: nowrap; position: absolute; right: 12px; bottom: 10px; padding-right: 12px; background: white;}
.time-count {letter-spacing: 2px;}
.patch-block {padding: 12px 16px; line-height: 20px; border-top: 1px solid #E3E4E9;}
.patch-content {height: 40px; overflow: hidden;}
.upgrade-block {padding: 16px 16px; line-height: 20px; border-top: 1px solid #E3E4E9;}
.upgrade-content {height: 20px; padding-left: 20px; position: relative; margin: 5px 0;}
.upgrade-content:before {content: ' '; width: 10px; height: 10px; background: #E3E4E9; border-radius: 50%; position: absolute; left: 0px; top: 5px;}
.upgrade-content:before {content: ' '; width: 8px; height: 8px; background: #E3E4E9; border-radius: 50%; position: absolute; left: 0px; top: 5px;}
module/admin/lang/zh-cn.php
+1 -1
View File
@@ -171,7 +171,7 @@ $lang->admin->menuSetting['convert']['name'] = '数据导入';
$lang->admin->menuSetting['convert']['desc'] = '第三方系统的数据导入。';
$lang->admin->mon = '月';
$lang->admin->day = '日';
$lang->admin->day = '天';
$lang->admin->updateDynamics = '更新动态';
$lang->admin->updatePatch = '补丁更新';
$lang->admin->upgradeRecommend = '推荐升级';
module/admin/view/index.html.php
+24 -24
View File
@@ -15,7 +15,7 @@
<div id='mainContent' class='main-content admin'>
<div class="main <?php if(!$hasInternet) echo 'without-internet';?>">
<div class="settings panel">
<div class="panel-title"><?php echo $lang->admin->setting?></div>
<div class="panel-title mt-6"><?php echo $lang->admin->setting?></div>
<div class="settings-list <?php if($config->vision == 'lite') echo 'lite-setting';?>">
<?php foreach($lang->admin->menuList as $menuKey => $menu):?>
<?php if($config->vision == 'lite' and !in_array($menuKey, $config->admin->liteMenuList)) continue;?>
@@ -87,33 +87,33 @@
</div>
<?php if($hasInternet and !$langNotCN):?>
<div class="side panel">
<div class="side panel" style="background: #FCFDFE">
<div class="h-56 flex align-center justify-between">
<div class="panel-title"><?php echo $lang->admin->zentaoInfo?></div>
<div class="time-count color-gray">您已使用禅道<span class="time-block">05</span><?php echo $lang->year?><span class="time-block">09</span><?php echo $lang->admin->day?><span class="time-block">19</span>日</div>
<div class="time-count">您已使用禅道<span class="time-block">5</span><?php echo $lang->year?><span class="time-block">9</span><?php echo $lang->admin->mon?><span class="time-block">19</span><?php echo $lang->admin->day?></div>
</div>
<div class="border-gray mb-16">
<div class="border-gray mb-16 radius-4">
<div class="h-40 pl-16 flex align-center justify-between">
<div class="panel-title"><?php echo $lang->admin->updateDynamics?></div>
<?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right'></i>", '_blank', 'class="more text-muted flex align-center"');?>
<?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
</div>
<div class="dynamic-block">
<div class="dynamic-content"><i class="icon icon-horn text-primary"></i>禅道18.0发布,新增自动化测试方案、使用帮助及全新IDE风格</div>
<div class="dynamic-content"><i class="icon icon-horn text-primary pr-4 font-20"></i>禅道18.0发布,新增自动化测试方案、使用帮助及全新IDE风格</div>
<div class="dynamic-time">2022-03-12</div>
</div>
<div class="dynamic-block">
<div class="dynamic-content"><i class="icon icon-horn text-primary"></i>禅道18.0发布,新增自动化测试方案、使用帮助及全新IDE风格</div>
<div class="dynamic-content"><i class="icon icon-horn text-primary pr-4 font-20"></i>禅道18.0发布,新增自动化测试方案、使用帮助及全新IDE风格</div>
<div class="dynamic-time">2022-03-12</div>
</div>
<div class="dynamic-block">
<div class="dynamic-content"><i class="icon icon-horn text-primary"></i>禅道18.0发布,新增自动化测试方案、使用帮助及全新IDE风格</div>
<div class="dynamic-content"><i class="icon icon-horn text-primary pr-4 font-20"></i>禅道18.0发布,新增自动化测试方案、使用帮助及全新IDE风格</div>
<div class="dynamic-time">2022-03-12</div>
</div>
</div>
<div class="border-gray mb-16">
<div class="border-gray mb-16 radius-4">
<div class="h-40 pl-16 flex align-center justify-between">
<div class="panel-title"><?php echo $lang->admin->updatePatch?></div>
<?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right'></i>", '_blank', 'class="more text-muted flex align-center"');?>
<?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
</div>
<?php foreach($this->view->patches as $patch):?>
<div class="patch-block">
@@ -121,35 +121,35 @@
<div class="panel-title"><?php echo $patch->name?></div>
<a href="<?php echo $patch->viewLink;?>" class='ext-download flex align-center' target='_blank'><i class='icon icon-download-alt text-primary bg-primary-100 pd-3'></i></a>
</div>
<div class="patch-content color-gray">
<div class="patch-content">
<?php echo $patch->desc?>
</div>
</div>
<?php endforeach;?>
</div>
<div class="border-gray mb-16">
<div class="border-gray mb-16 radius-4">
<div class="h-40 pl-16 flex align-center justify-between">
<div class="panel-title"><?php echo $lang->admin->upgradeRecommend?></div>
<?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right'></i>", '_blank', 'class="more text-muted flex align-center"');?>
<?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
</div>
<div class="upgrade-block">
<div class="title text-primary flex justify-between">
<div>禅道企业版</div>
<div class="flex align-center"><div>查看详情</div><i class="icon icon-caret-right text-primary"></i></div>
<div class="panel-title"><i class="icon icon-zentao text-primary pr-4 font-18"></i>禅道企业版</div>
<div class="flex align-center"><div>查看详情</div><i class="icon icon-caret-right text-primary pb-3"></i></div>
</div>
<div class="upgrade-content color-gray">工时管理、甘特图、导入导出</div>
<div class="upgrade-content color-gray">40+内置统计报表、自定义报表功能</div>
<div class="upgrade-content color-gray">强大的自定义工作流、反馈管理功能</div>
<div class="upgrade-content">工时管理、甘特图、导入导出</div>
<div class="upgrade-content">40+内置统计报表、自定义报表功能</div>
<div class="upgrade-content">强大的自定义工作流、反馈管理功能</div>
</div>
<div class="upgrade-block">
<div class="title text-primary flex justify-between">
<div>禅道旗舰版</div>
<div class="flex align-center"><div>查看详情</div><i class="icon icon-caret-right text-primary"></i></div>
<div class="panel-title"><i class="icon icon-zentao text-primary pr-4 font-18"></i>禅道旗舰版</div>
<div class="flex align-center"><div>查看详情</div><i class="icon icon-caret-right text-primary pb-3"></i></div>
</div>
<div class="upgrade-content color-gray">工时管理、甘特图、导入导出</div>
<div class="upgrade-content color-gray">40+内置统计报表、自定义报表功能</div>
<div class="upgrade-content color-gray">强大的自定义工作流、反馈管理功能</div>
<div class="upgrade-content color-gray">工时管理、甘特图、导入导出</div>
<div class="upgrade-content">工时管理、甘特图、导入导出</div>
<div class="upgrade-content">40+内置统计报表、自定义报表功能</div>
<div class="upgrade-content">强大的自定义工作流、反馈管理功能</div>
<div class="upgrade-content">工时管理、甘特图、导入导出</div>
</div>
</div>
</div>