From 594364c4e08e1e70cf22cd995ed877fb081289db Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 11 Apr 2023 16:43:46 +0800
Subject: [PATCH]  * code for task #90775.

---
 module/doc/css/view.css          |  7 ++++---
 module/doc/lang/de.php           |  1 +
 module/doc/lang/en.php           |  1 +
 module/doc/lang/fr.php           |  1 +
 module/doc/lang/zh-cn.php        |  1 +
 module/doc/view/content.html.php | 19 ++++++++++---------
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index 9d3f5f0e0b..c2760c1ea5 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -1,7 +1,7 @@
 .h-full-adjust {overflow-y: auto; height: calc(100vh - 120px);}
 .main-col .block-files .panel-heading {padding-right: 20px;}
 .main-col .block-files .panel-heading .panel-title {height: 35px; line-height: 30px;}
-.main-col .doc-title {display: flex; font-size: 16px; margin-bottom: 15px;}
+.main-col .doc-title {display: flex; font-size: 16px; margin-bottom: 10px;}
 .main-col .doc-title .title {margin-right: 10px; line-height: 32px; font-size: 25px;}
 .main-col .doc-title .info {flex: 1 1 0;}
 .main-col .doc-title .version a {font-size: 13px; color: #8c8c8c;}
@@ -9,7 +9,6 @@
 .main-col .doc-title .actions a + a {margin-left: 0px;}
 .main-col .doc-title .actions i {font-size: 15px; color: #8c8c8c;}
 #content .title {max-width: 54%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-#content .detail-content {padding-left: 10px;}
 #mainContent .scrollbar-hover {max-height: 2000px; overflow: scroll;}
 #content .editor-preview {background: #fff}
 #content .CodeMirror{border: none}
@@ -20,7 +19,9 @@
 .hide-sidebar #sidebar>.sidebar-toggle>.icon:before {content: "\e314";}
 .detail.empty {line-height: 200px;}
 .main-col iframe {min-height: 380px;}
-.article-content .keywords {margin-bottom: 15px;}
+.article-content .info {margin-bottom: 15px; width:100%; overflow:hidden;}
+.article-content .info .user-time{margin-right: 16px}
+.article-content .info .keywords .label {padding-right:8px; padding-left:8px; color:#18A6FD; border-color:rgba(24, 166, 253, 0.25); height:22px; line-height:14px; margin-right:4px;}
 
 .article-content {width: 100%; display: inline-block;}
 /* .outline-toggle i.icon-angle-right, i.icon-angle-left {width: 18px; height: 18px; border-radius: 50%; position: absolute; padding-left: 2px; padding-top: 1px;} */
diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index 96b543a40d..9160c53d5f 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -117,6 +117,7 @@ $lang->doc->main         = 'Main Document Library';
 $lang->doc->order        = 'Order';
 $lang->doc->doc          = 'Document';
 $lang->doc->updateOrder  = 'Update Order';
+$lang->doc->update       = 'Update';
 $lang->doc->nextStep     = 'Next';
 $lang->doc->closed       = 'Closed';
 $lang->doc->saveDraft    = 'Save Draft';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 8f37a1dcf2..31bb9cbb6a 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -117,6 +117,7 @@ $lang->doc->main         = 'Main Document Library';
 $lang->doc->order        = 'Order';
 $lang->doc->doc          = 'Document';
 $lang->doc->updateOrder  = 'Update Order';
+$lang->doc->update       = 'Update';
 $lang->doc->nextStep     = 'Next';
 $lang->doc->closed       = 'Closed';
 $lang->doc->saveDraft    = 'Save Draft';
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index c6b8a3e9c5..3b102798d3 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -117,6 +117,7 @@ $lang->doc->main         = 'Main Document Library';
 $lang->doc->order        = 'Order';
 $lang->doc->doc          = 'Document';
 $lang->doc->updateOrder  = 'Update Order';
+$lang->doc->update       = 'Update';
 $lang->doc->nextStep     = 'Next';
 $lang->doc->closed       = 'Closed';
 $lang->doc->saveDraft    = 'Save Draft';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 5d6130f3a2..5a3b442aaf 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -117,6 +117,7 @@ $lang->doc->main         = '文档主库';
 $lang->doc->order        = '排序';
 $lang->doc->doc          = '文档';
 $lang->doc->updateOrder  = '更新排序';
+$lang->doc->update       = '更新';
 $lang->doc->nextStep     = '下一步';
 $lang->doc->closed       = '已关闭';
 $lang->doc->saveDraft    = '存为草稿';
diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php
index ad693bd0f1..44b3a49911 100644
--- a/module/doc/view/content.html.php
+++ b/module/doc/view/content.html.php
@@ -26,8 +26,6 @@
                 </ul>
               </div>
             </div>
-            <div class="user"></div>
-            <div class="time"></div>
           </div>
           <div class="actions">
             <span class='text'><?php echo$lang->doc->diff?></span>
@@ -75,13 +73,16 @@
         </div>
         <div class="">
           <div class="detail-content article-content table-col">
-            <?php if($doc->keywords):?>
-            <p class='keywords'>
-              <?php foreach($doc->keywords as $keywords):?>
-              <?php if($keywords) echo "<span class='label label-outline'>$keywords</span>";?>
-              <?php endforeach;?>
-            </p>
-            <?php endif;?>
+            <div class='info'>
+              <span class='user-time text-muted'><i class='icon icon-account'></i> <?php echo zget($users, $doc->editedBy) . " {$lang->colon} " . substr($doc->editedDate, 0, 10) . (common::checkNotCN() ? ' ' : '') . $lang->doc->update;?></span>
+              <?php if($doc->keywords):?>
+              <span class='keywords'>
+                <?php foreach($doc->keywords as $keywords):?>
+                <?php if($keywords) echo "<span class='label label-outline' title='{$keywords}'>{$keywords}</span>";?>
+                <?php endforeach;?>
+              </span>
+              <?php endif;?>
+            </div>
             <?php
             if($doc->type == 'url' and $autoloadPage)
             {