Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/doc/control.php

@@ -194,9 +194,13 @@ class doc extends control
                 $actionID = $this->action->create('docLib', $libID, 'edited');
                 $this->action->logHistory($actionID, $changes);
             }
-            $response['message'] = $this->lang->saveSuccess;
-            $response['result']  = 'success';
-            $response['locate']  = 'parent';
+            $docLib     = $this->doc->getLibById($libID);
+            $hasLibPriv = $this->doc->checkPrivLib($docLib) ? 1 : 0;
+
+            $response['message']    = $this->lang->saveSuccess;
+            $response['result']     = 'success';
+            $response['closeModal'] = true;
+            $response['callback']   = "redirectParentWindow($hasLibPriv, $libID)";
             return $this->send($response);
         }
 

module/doc/css/tablecontents.css

@@ -10,7 +10,6 @@
 
 .cell .detail .detail-title {padding-left: 5px; list-style: none;}
 .menu-actions {position: absolute; top: 7px; right: 45px; padding: 7px 8px;}
-.catalog>a {color: #838a9d !important;}
 .detail ul {position: relative;}
 .tail-info {position: absolute; right: 0; padding-left: 10px; padding-top: 1px;}
 .tail-info, .doc-title, span.item {background: #fff;}

module/doc/js/editlib.js

@@ -2,3 +2,17 @@ $(function()
 {
     toggleAcl($('form input[name="acl"]:checked').val(), 'lib');
 })
+
+/**
+ * Redirect the parent window.
+ *
+ * @param  int    hasLibPriv
+ * @param  int    libID
+ * @access public
+ * @return void
+ */
+function redirectParentWindow(hasLibPriv, libID)
+{
+    var link = hasLibPriv ? createLink('doc', 'tableContents', 'type=book&objectID=0&libID=' + libID) : createLink('doc', 'tableContents', 'type=book');
+    parent.location.href = link;
+}

module/product/css/kanban.css

@@ -10,6 +10,7 @@ td.product {padding-top: 10px !important;}
 td.project, td.execution {padding: 0 0 10px 0 !important;}
 td > div:not(.board) > .board-item:first-child {margin-top: 10px;}
 td > div.board:first-child {margin-top: 5px;}
+.fix-table-copy-wrapper thead > tr > th:first-child {background: none!important;}
 
 .board-item {border: 1px solid #ebebeb; padding: 3px 10px; cursor: default; border-radius: 2px; background-color: #fff; text-align: left;}
 .board-item:hover {border-color: #ccc;}
@@ -23,4 +24,4 @@ td > div.board:first-child {margin-top: 5px;}
 
 .project .table-row > .table-col:last-child, .execution .table-row > .table-col:last-child {width: 24px; padding-top: 2px;}
 
-.scroll {overflow-x: hidden;; overflow-y: auto;}
+.scroll {overflow-x: hidden; overflow-y: auto;}

module/product/view/kanban.html.php

@@ -23,7 +23,7 @@
       <caption><?php echo $type == 'myProducts' ? $lang->product->myProduct : $lang->product->otherProduct;?></caption>
       <thead>
         <tr>
-          <th rowspan="2" class="w-20px" style="border: unset; background: #32C5FF;"></th>
+          <th rowspan="2" class="w-20px" style="border-right: 0; border-left: 0; background: #32C5FF;"></th>
           <th rowspan="2" style="border-left: 0px;"><?php echo $lang->product->unclosedProduct;?></th>
           <th rowspan="2"><?php echo $lang->product->unexpiredPlan;?></th>
           <th colspan="2"><?php echo $lang->product->doing;?></th>
@@ -171,14 +171,6 @@
 <script>
 $(function()
 {
-    $(document).scroll(function()
-    {
-        if($('.fix-table-copy-wrapper').length > 0)
-        {
-            $('.fix-table-copy-wrapper table thead tr:first th:first').css('background', 'rgba(255,255,255,0)');
-        }
-    })
-
     $('.board').height($('.project .board').height());
 
     $('.table div.scroll').each(function()

module/program/css/kanban.css

@@ -10,10 +10,11 @@
 .board-item:last-child {margin-bottom: 10px;}
 
 #kanban {overflow-y: auto;}
-#kanban tbody > tr > td {line-height: 24px;}
-#kanban tbody > tr > td{border-right: 3px solid #fff; border-bottom: 2px solid #fff;}
+#kanban tbody > tr > td {line-height: 20px;}
+#kanban tbody > tr > td {border-right: 3px solid #fff; border-bottom: 2px solid #fff;}
 #kanban thead > tr:first-child > th:not(:first-child) {border-right: 2px solid #fff; border-bottom: 2px solid #fff;}
 #kanban thead > tr:last-child > th {border: 2px solid #fff;}
+#kanban a {line-height: 24px;}
 
 .doing-td, .wait-project, .normal-plan, .normal-release {vertical-align: top !important;}