From 88c564634efb8efd3931d2cc4927f7cfc7e32c53 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 1 Feb 2023 13:40:08 +0800
Subject: [PATCH] * Optimize class style.

---
 module/admin/config.php          | 10 ++++++++++
 module/admin/css/index.css       | 12 ++++++------
 module/admin/model.php           |  2 +-
 module/admin/view/index.html.php |  6 +++---
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/module/admin/config.php b/module/admin/config.php
index 5d9dc5023d..7652aef470 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -58,3 +58,13 @@ $config->admin->apiRoot      = 'https://www.zentao.net/';
 $config->admin->classURL     = 'https://www.zentao.net/publicclass.html';
 $config->admin->extensionURL = 'https://www.zentao.net/extension-browse.html';
 
+$config->admin->helpURL['setting']   = 'https://www.zentao.net/book/zentaopms/538.html';
+$config->admin->helpURL['user']      = 'https://www.zentao.net/book/zentaopms/538.html';
+$config->admin->helpURL['switch']    = 'https://www.zentao.net/book/zentaopms/538.html';
+$config->admin->helpURL['model']     = 'https://www.zentao.net/book/zentaopms/533.html';
+$config->admin->helpURL['feature']   = 'https://www.zentao.net/book/zentaopms/538.html';
+$config->admin->helpURL['template']  = 'https://www.zentao.net/book/zentaopms/538.html';
+$config->admin->helpURL['message']   = 'https://www.zentao.net/book/zentaopms/email-notification-541.html';
+$config->admin->helpURL['extension'] = 'https://www.zentao.net/book/zentaopms/536.html';
+$config->admin->helpURL['dev']       = 'https://www.zentao.net/book/zentaopms/537.html';
+$config->admin->helpURL['convert']   = 'https://www.zentao.net/book/zentaopms/656.html';
diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 4e40802b34..6ddcdbe125 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -26,13 +26,13 @@
 
 .official {justify-content: center;}
 .official > .panel-title {position: absolute; top: 0px;}
-.official-img {background-image: url('/static/images/wechat.jpg'); background-repeat: no-repeat; background-size: contain; flex: 1 1 50%; aspect-ratio: 1 / 1; background-position: center;}
-.official-content {flex: 0 0 50%; display: flex; flex-direction: column; justify-content: center;}
+.official-img {background-image: url('/static/images/wechat.jpg'); background-repeat: no-repeat; background-size: contain; flex: 1 1 30%; aspect-ratio: 1 / 1; background-position: center;}
+.official-content {flex: 0 0 60%; display: flex; flex-direction: column; justify-content: center; padding-left: 10px;}
 .official-content > .content {color: #838A9D; font-size: 12px;}
 .official-content > .title {color: #313C52; font-size: 13px;}
 
-.classList > .classItem {flex: 1 1 30%; margin: 5px;}
-.classItem > .imgBack {flex: 1 1 50%; background: #C8EDFF;}
-.classItem > .imgBack > .classImg {background-repeat: no-repeat; background-size: contain; aspect-ratio: 1 / 1; background-position: center; margin: 0 20px;}
-.classItem > .classContent {flex: 1 1 50%; padding: 5px; font-size: 14px; color: #0B0F18; text-align: center; overflow: hidden; height: 24px; font-weight: 700;}
+.classList > .classItem {flex: 1 1 30%; margin: 5px; border: 1px solid #E3E4E9; border-radius: 4px; margin-bottom: 16px;}
+.classItem > .imgBack {flex: 1 1 50%;}
+.classItem > .imgBack > .classImg {background-repeat: no-repeat; background-size: contain; aspect-ratio: 16 / 9;}
+.classItem > .classContent {flex: 1 1 50%; padding: 5px; font-size: 14px; color: #0B0F18; text-align: center; overflow: hidden; height: 30px; line-height: 22px; font-weight: 700;}
 .more {float: right; padding-right: 12px; font-weight: normal;}
diff --git a/module/admin/model.php b/module/admin/model.php
index 8f1802145d..11c636d2a9 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -485,7 +485,7 @@ class adminModel extends model
             $publicClass[$index] = new stdClass();
             $publicClass[$index]->name     = $course->title;
             $publicClass[$index]->image    = $this->config->admin->apiRoot . $course->image->list[0]->largeURL;
-            $publicClass[$index]->viewLink = $this->config->admin->apiRoot . "{$course->alias}-{$course->id}.html";
+            $publicClass[$index]->viewLink = $this->config->admin->apiRoot . 'publicclass/' . ($course->alias ? "{$course->alias}-" : '') . "{$course->id}.html";
             $index ++;
         }
         return $publicClass;
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index a5f529e9db..3732407162 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -17,11 +17,11 @@
     <div class="settings panel">
       <div class="panel-title"><?php echo $lang->admin->setting?></div>
       <div class="settings-list">
-        <?php foreach($lang->admin->menuList as $menu):?>
+        <?php foreach($lang->admin->menuList as $menuKey => $menu):?>
         <div class="setting-box">
           <h4><?php echo $menu['name'];?></h4>
           <p class="text-muted setting-desc"><?php echo $menu['desc'];?></p>
-          <?php echo html::a('', "<i class='icon icon-help'></i> {$lang->help}", '_blank', 'class="text-muted setting-help"');?>
+          <?php echo html::a($config->admin->helpURL[$menuKey], "<i class='icon icon-help'></i> {$lang->help}", '_blank', 'class="text-muted setting-help"');?>
         </div>
         <?php endforeach;?>
       </div>
@@ -65,7 +65,7 @@
         </div>
         <div class="classList flex">
           <?php foreach($publicClass as $class):?>
-          <a class="classItem">
+          <a class="classItem" href='<?php echo $class->viewLink;?>' target='_blank'>
 	    <div class="imgBack">
               <div class="classImg" style="background-image: url('<?php echo $class->image;?>');"></div>
             </div>