Merge branch 'dev/gfl_task_#83327' into 'sprint/285'

Dev/gfl task #83327

See merge request easycorp/zentaopms!6864

module/admin/css/index.css

@@ -1,3 +1,17 @@
+/* atomic class */
+.flex {display: flex;}
+.align-center {align-items: center;}
+.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;}
+
 #notice {margin: -20px -20px 20px; padding: 20px;}
 #zentaoLinks {margin-top: 20px;}
 #zentaoLinks .panel .panel-heading {padding: 6px 10px;}
@@ -7,7 +21,6 @@
 .admin > .main {flex: 1 1 70%;}
 .admin > .side {flex: 1 1 30%; padding-left: 10px; margin-left: 16px;}
 .panel-title {padding: 10px 0px;}
-.flex {display: flex;}
 .panel {padding: 0 0 0 16px;}
 .settings.panel, .plug.panel {margin-bottom: 16px;}
 
@@ -19,7 +32,6 @@
 .settings-list > .setting-box > h4 > img {padding-right: 8px; padding-bottom: 3px; width: 32px; height: 27px;}
 .settings-list > .setting-box > .setting-desc {padding-bottom: 16px; color: #5E626D;}
 .settings-list.lite-setting > .setting-box {flex: 1 1 30%;}
-.panel-title > a {display: flex; align-items: center;}
 
 .plugin-list {display: flex; flex-wrap: wrap; padding: 12px 4px 4px 4px;}
 .plugin-list > .plugin-item {flex: 1 1 26%; padding: 16px 10px; border: 1px solid #EDEEF2; border-radius: 4px; margin-right: 10px; margin-bottom: 16px; width: 0px; cursor: pointer;}
@@ -38,6 +50,7 @@
 .official-content > .content {color: #838A9D; font-size: 12px; line-height: 22px; padding-top: 6px;}
 .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;}
 .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;}
@@ -55,3 +68,16 @@
 .main.without-internet > .plug.panel {flex: 1 1 60%; margin-bottom: unset; margin-right: 16px;}
 .main.without-internet > .bottom > .official.panel {margin-right: unset;}
 .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;}
+
+.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;}

module/admin/lang/de.php

@@ -170,4 +170,10 @@ $lang->admin->menuSetting['dev']['desc']       = 'Support for secondary developm
 $lang->admin->menuSetting['convert']['name']   = 'Data Import';
 $lang->admin->menuSetting['convert']['desc']   = 'Data import from third-party systems.';
 
+$lang->admin->mon              = 'month';
+$lang->admin->day              = 'day';
+$lang->admin->updateDynamics   = 'updateDynamics';
+$lang->admin->updatePatch      = 'updatePatch';
+$lang->admin->upgradeRecommend = 'upgradeRecommend';
+
 include dirname(__FILE__) . '/menu.php';

module/admin/lang/en.php

@@ -170,4 +170,10 @@ $lang->admin->menuSetting['dev']['desc']       = 'Support for secondary developm
 $lang->admin->menuSetting['convert']['name']   = 'Data Import';
 $lang->admin->menuSetting['convert']['desc']   = 'Data import from third-party systems.';
 
+$lang->admin->mon              = 'month';
+$lang->admin->day              = 'day';
+$lang->admin->updateDynamics   = 'updateDynamics';
+$lang->admin->updatePatch      = 'updatePatch';
+$lang->admin->upgradeRecommend = 'upgradeRecommend';
+
 include dirname(__FILE__) . '/menu.php';

module/admin/lang/fr.php

@@ -170,4 +170,10 @@ $lang->admin->menuSetting['dev']['desc']       = 'Support for secondary developm
 $lang->admin->menuSetting['convert']['name']   = 'Data Import';
 $lang->admin->menuSetting['convert']['desc']   = 'Data import from third-party systems.';
 
+$lang->admin->mon              = 'month';
+$lang->admin->day              = 'day';
+$lang->admin->updateDynamics   = 'updateDynamics';
+$lang->admin->updatePatch      = 'updatePatch';
+$lang->admin->upgradeRecommend = 'upgradeRecommend';
+
 include dirname(__FILE__) . '/menu.php';

module/admin/lang/vi.php

@@ -93,4 +93,10 @@ $lang->admin->safe->noticeMode   = 'Mật khẩu sẽ được kiểm tra khi ng
 $lang->admin->safe->noticeStrong = '';
 $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->mon              = 'month';
+$lang->admin->day              = 'day';
+$lang->admin->updateDynamics   = 'updateDynamics';
+$lang->admin->updatePatch      = 'updatePatch';
+$lang->admin->upgradeRecommend = 'upgradeRecommend';
+
 include dirname(__FILE__) . '/menu.php';

module/admin/lang/zh-cn.php

@@ -170,4 +170,10 @@ $lang->admin->menuSetting['dev']['desc']       = '支持对系统进行二次开
 $lang->admin->menuSetting['convert']['name']   = '数据导入';
 $lang->admin->menuSetting['convert']['desc']   = '第三方系统的数据导入。';
 
+$lang->admin->mon              = '月';
+$lang->admin->day              = '日';
+$lang->admin->updateDynamics   = '更新动态';
+$lang->admin->updatePatch      = '补丁更新';
+$lang->admin->upgradeRecommend = '推荐升级';
+
 include dirname(__FILE__) . '/menu.php';

module/admin/view/index.html.php

@@ -32,7 +32,7 @@
     <div class="plug panel">
       <div class="panel-title">
         <?php echo $lang->admin->pluginRecommendation;?>
-        <?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right'></i>", '_blank', 'class="more text-muted"');?>
+        <?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right'></i>", '_blank', 'class="more text-muted flex align-center"');?>
       </div>
       <div class="plugin-list" <?php if($langNotCN) echo 'style="flex-wrap: nowrap"';?>>
         <?php foreach($plugins as $plugin):?>
@@ -68,7 +68,7 @@
       <div class="panel publicClass">
         <div class="panel-title">
           <?php echo $lang->admin->publicClass;?>
-          <?php echo html::a($config->admin->classURL, "{$lang->more} <i class='icon icon-caret-right'></i>", '_blank', 'class="more text-muted"');?>
+          <?php echo html::a($config->admin->classURL, "{$lang->more} <i class='icon icon-caret-right'></i>", '_blank', 'class="more text-muted flex align-center"');?>
         </div>
         <div class="classList flex">
           <?php foreach($publicClass as $class):?>
@@ -87,8 +87,71 @@
   </div>
 
   <?php if($hasInternet and !$langNotCN):?>
-  <div class="side panel hidden">
-    <div class="panel-title"><?php echo $lang->admin->zentaoInfo?></div>
+  <div class="side panel">
+    <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>
+    <div class="border-gray mb-16">
+      <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"');?>
+      </div>
+      <div class="dynamic-block">
+        <div class="dynamic-content"><i class="icon icon-horn text-primary"></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-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-time">2022-03-12</div>
+      </div>
+    </div>
+    <div class="border-gray mb-16">
+      <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"');?>
+      </div>
+      <?php foreach($this->view->patches as $patch):?>
+      <div class="patch-block">
+	<div class="title flex justify-between">
+	  <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">
+           <?php echo $patch->desc?>
+        </div>
+      </div>
+      <?php endforeach;?>
+    </div>
+    <div class="border-gray mb-16">
+      <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"');?>
+      </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>
+        <div class="upgrade-content color-gray">工时管理、甘特图、导入导出</div>
+        <div class="upgrade-content color-gray">40+内置统计报表、自定义报表功能</div>
+        <div class="upgrade-content color-gray">强大的自定义工作流、反馈管理功能</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>
+        <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>
+    </div>
   </div>
   <?php endif;?>
 </div>