Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3

module/doc/js/view.js

@@ -199,4 +199,16 @@ $(function()
     })
 
     $('.outline .outline-toggle i.icon-angle-right').trigger("click");
+    $('#hisTrigger').on('click', function()
+    {
+        var $history = $('#history');
+        if($history.hasClass('hidden'))
+        {
+            $history.removeClass('hidden');
+        }
+        else
+        {
+            $history.addClass('hidden');
+        }
+    })
 })

module/doc/view/content.html.php

@@ -56,7 +56,7 @@
                 $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}' class='btn btn-link'");
             }?>
-            <a href="###" class="btn btn-link" title=<?php echo $lang->history?>><i class="icon icon-clock"></i></a>
+            <a id="hisTrigger" href="###" class="btn btn-link" title=<?php echo $lang->history?>><i class="icon icon-clock"></i></a>
 
             <?php if($this->config->edition == 'max' and $this->app->tab == 'project'):?>
             <?php
@@ -162,7 +162,7 @@
         <?php common::printPreAndNext($preAndNext);?>
       </div>
     </div>
-    <div id="history" class='panel'>
+    <div id="history" class='panel hidden' style="margin-left: 2px;">
       <?php
       $canBeChanged = common::canBeChanged('doc', $doc);
       if($canBeChanged) $actionFormLink = $this->createLink('action', 'comment', "objectType=doc&objectID=$doc->id");