diff --git a/module/doc/control.php b/module/doc/control.php index db0d4cbfe4..78696390e4 100644 --- a/module/doc/control.php +++ b/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); } diff --git a/module/doc/css/tablecontents.css b/module/doc/css/tablecontents.css index 435936a186..85629dedfd 100644 --- a/module/doc/css/tablecontents.css +++ b/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;} diff --git a/module/doc/js/editlib.js b/module/doc/js/editlib.js index 94dc79004d..1efd927a62 100644 --- a/module/doc/js/editlib.js +++ b/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; +} diff --git a/module/product/css/kanban.css b/module/product/css/kanban.css index 8100681b52..13e8cba18f 100644 --- a/module/product/css/kanban.css +++ b/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;} diff --git a/module/product/view/kanban.html.php b/module/product/view/kanban.html.php index 0baf449beb..2092f8d447 100644 --- a/module/product/view/kanban.html.php +++ b/module/product/view/kanban.html.php @@ -23,7 +23,7 @@ product->myProduct : $lang->product->otherProduct;?> - + product->unclosedProduct;?> product->unexpiredPlan;?> product->doing;?> @@ -171,14 +171,6 @@