From a67d020489c6fc096701993a8fbb01dc28c466b0 Mon Sep 17 00:00:00 2001
From: zhujinyong <vimrus.com@gmail.com>
Date: Sat, 3 Apr 2021 16:49:34 +0800
Subject: [PATCH] * Fix doc dashboard.

---
 module/doc/control.php           |  2 +-
 module/doc/css/objectlibs.css    | 16 ++++++++++------
 module/doc/view/content.html.php |  8 ++++----
 module/doc/view/index.html.php   | 28 +++++++++++++++-------------
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index a8d6324861..618a46a0f4 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -55,9 +55,9 @@ class doc extends control
 
         $this->view->latestEditedDocs = $this->doc->getDocsByBrowseType(0, 'byediteddate', 0, 0, 'editedDate_desc, id_desc', $pager);
         $this->view->myDocs           = $this->doc->getDocsByBrowseType(0, 'openedbyme', 0, 0, 'addedDate_desc', $pager);
+        $this->view->collectedDocs    = $this->doc->getDocsByBrowseType(0, 'collectedbyme', 0, 0, 'addedDate_desc', $pager);
         $this->view->statisticInfo    = $this->doc->getStatisticInfo();
         $this->view->users            = $this->user->getPairs('noletter');
-        $this->view->doingExecutions  = $this->execution->getByProject($this->projectID, 'undone', 5);
 
         $this->display();
     }
diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css
index c07e5bb1d7..1a60898cfd 100644
--- a/module/doc/css/objectlibs.css
+++ b/module/doc/css/objectlibs.css
@@ -8,12 +8,16 @@
 .main-col .block-files .panel-heading .panel-title {height: 35px; line-height: 30px;}
 .side-col .action a {margin: 0 auto 3px; display: block; max-width: 200px;}
 .side-col .tips {padding: 0 10px;}
-.main-col .detail-title {display: flex;}
-.main-col .detail-title .title {margin-right: 10px;}
-.main-col .detail-title .info {flex: 1 1 0;}
-.main-col .detail-title .actions i {font-size: 15px; color: #8c8c8c; margin-left: 5px;}
-#sidebar {width: 280px;}
+.main-col .doc-title {display: flex; font-size: 16px; margin-bottom: 15px;}
+.main-col .doc-title .title {margin-right: 10px;}
+.main-col .doc-title .info {flex: 1 1 0;}
+.main-col .doc-title .actions a {margin-right: 8px;}
+.main-col .doc-title .actions i {font-size: 15px; color: #8c8c8c;}
+#sidebar {width: 275px;}
 #sidebar>.cell {width: 265px;}
-#sidebar>.sidebar-toggle {left: 5px; right: auto;}
+#sidebar>.sidebar-toggle {left: 3px; right: auto;}
+.hide-sidebar #sidebar>.cell {left: -270px;}
 .hide-sidebar #sidebar>.sidebar-toggle>.icon:before {content: "\e314";}
 .detail.empty {line-height: 200px;}
+.main-col+.side-col {padding-left: 16px;}
+.main-col iframe {min-height: 380px;}
diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php
index b2571382c7..a4d175a197 100644
--- a/module/doc/view/content.html.php
+++ b/module/doc/view/content.html.php
@@ -3,7 +3,7 @@
   <div class="main-col col-8">
     <div class="cell">
       <div class="detail no-padding">
-        <div class="detail-title no-margin no-padding">
+        <div class="detail-title no-padding doc-title">
           <div class="title"><?php echo $doc->title;?></div>
           <div class="info">
             <div class="version"></div>
@@ -12,15 +12,15 @@
           </div>
           <div class="actions">
             <?php
-            if(common::hasPriv('doc', 'edit')) echo html::a(inlink('edit', "docID=$doc->id&comment=false&objectType=$objectType&objectID=$object->id&libID=$libID"), '<i class="icon-edit"></i>', '', "title='{$lang->doc->edit}'");
+            if(common::hasPriv('doc', 'edit')) echo html::a(inlink('edit', "docID=$doc->id&comment=false&objectType=$objectType&objectID=$object->id&libID=$libID"), '<i class="icon-edit"></i>', '', "title='{$lang->doc->edit}' class='btn btn-link'");
             if(common::hasPriv('doc', 'delete'))
             {
                 $deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes&from=lib");
-                echo html::a("javascript:ajaxDeleteDoc(\"$deleteURL\", \"docList\", confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->doc->delete}'");
+                echo html::a("javascript:ajaxDeleteDoc(\"$deleteURL\", \"docList\", confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->doc->delete}' class='btn btn-link'");
             }
             ?>
             <?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
-            <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $lang->doc->collect;?>" class='ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
+            <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $lang->doc->collect;?>" class='ajaxCollect btn btn-link'><i class='icon <?php echo $star;?>'></i></a>
           </div>
         </div>
         <div class="detail-content article-content">
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php
index 336898342a..c581fa5042 100644
--- a/module/doc/view/index.html.php
+++ b/module/doc/view/index.html.php
@@ -125,26 +125,28 @@
       <div class="col-sm-7">
         <div class="panel block-files block-sm" style="height: 290px;">
           <div class="panel-heading">
-            <div class="panel-title"><?php echo $lang->execution->undone . (common::checkNotCN() ? "{$lang->executionCommon}s" : "$lang->executionCommon");?></div>
+          <div class="panel-title"><?php echo $lang->doc->myDoc;?></div>
             <nav class="panel-actions nav nav-default">
-              <li><?php echo html::a($this->createLink('doc', 'allLibs', 'type=execution'), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
+              <li><?php echo html::a($this->createLink('doc', 'browse', "libID=0&browseTyp=openedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
             </nav>
           </div>
           <div class="panel-body has-table">
             <table class="table table-borderless table-fixed-head table-hover">
               <thead>
                 <tr>
-                  <th class="c-name"><?php echo $lang->execution->name;?></th>
-                  <th class="c-date"><?php echo $lang->execution->begin;?></th>
-                  <th class="c-date"><?php echo $lang->execution->end;?></th>
+                  <th class="c-name"><?php echo $lang->doc->title;?></th>
+                  <th class="c-num text-right"><?php echo $lang->doc->size;?></th>
+                  <th class="c-user"><?php echo $lang->doc->addedBy;?></th>
+                  <th class="c-datetime"><?php echo $lang->doc->editedDate;?></th>
                 </tr>
               </thead>
               <tbody>
-                <?php foreach($doingExecutions as $execution):?>
-                <tr data-url="<?php echo $this->createLink('doc', 'objectLibs', "type=execution&objectID={$execution->id}")?>">
-                  <td class="c-name"><i class="icon icon-folder text-yellow"></i> <?php echo $execution->name;?></td>
-                  <td class="c-datetime"><?php echo formatTime($execution->begin);?></td>
-                  <td class="c-datetime"><?php echo formatTime($execution->end);?></td>
+                <?php foreach($myDocs as $doc):?>
+                <tr data-url="<?php echo $this->createLink('doc', 'view', "docID={$doc->id}");?>">
+                  <td class="c-name" title="<?php echo $doc->title;?>"><?php echo $doc->title;?></td>
+                  <td class="c-num text-right"><?php echo $doc->fileSize ? $doc->fileSize : '-';?></td>
+                  <td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>
+                  <td class="c-datetime"><?php echo formatTime($doc->editedDate) ? formatTime($doc->editedDate, 'Y-m-d') : formatTime($doc->addedDate, 'y-m-d');?></td>
                 </tr>
                 <?php endforeach;?>
               </tbody>
@@ -155,9 +157,9 @@
       <div class="col-sm-5">
         <div class="panel block-files block-sm" style="height: 290px;">
           <div class="panel-heading">
-          <div class="panel-title"><?php echo $lang->doc->myDoc;?></div>
+          <div class="panel-title"><?php echo $lang->doc->myCollection;?></div>
             <nav class="panel-actions nav nav-default">
-              <li><?php echo html::a($this->createLink('doc', 'browse', "libID=0&browseTyp=openedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
+              <li><?php echo html::a($this->createLink('doc', 'browse', "libID=0&browseTyp=collectedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
             </nav>
           </div>
           <div class="panel-body has-table">
@@ -170,7 +172,7 @@
                 </tr>
               </thead>
               <tbody>
-                <?php foreach($myDocs as $doc):?>
+                <?php foreach($collectedDocs as $doc):?>
                 <tr data-url="<?php echo $this->createLink('doc', 'view', "docID={$doc->id}");?>">
                   <td class="c-name" title="<?php echo $doc->title;?>"><?php echo $doc->title;?></td>
                   <td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>