diff --git a/module/doc/css/common.css b/module/doc/css/common.css index d290dc04d7..8e02d37e43 100644 --- a/module/doc/css/common.css +++ b/module/doc/css/common.css @@ -92,3 +92,5 @@ ol, ul {margin-bottom: 0} .side-col .menu-actions {position: absolute; top: 0; right: 0; padding: 7px 8px;} .menu-actions i {font-size: 15px; color: #8c8c8c;} #whiteListBox .chosen-container .chosen-results {max-height: 180px;} + +.c-product, .c-execution, .c-lib {width: 80px !important;} diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index 1ef239223a..749c11feb4 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -161,18 +161,18 @@ $sessionString .= session_name() . '=' . session_id(); productName):?> - doc->product;?> + doc->product;?> productName;?> executionName):?> - doc->execution;?> + doc->execution;?> executionName;?> - doc->lib;?> + doc->lib;?> name;?> diff --git a/module/entry/view/browse.html.php b/module/entry/view/browse.html.php index 87a98b62c8..3dc711095a 100644 --- a/module/entry/view/browse.html.php +++ b/module/entry/view/browse.html.php @@ -20,9 +20,9 @@ recTotal&recPerPage=$pager->recPerPage&pageID=$pager->pageID";?> entry->id);?> entry->name);?> - entry->code);?> - entry->key);?> - entry->ip);?> + entry->code);?> + entry->key);?> + entry->ip);?> entry->desc);?> actions;?> diff --git a/module/entry/view/log.html.php b/module/entry/view/log.html.php index b9b343a69b..2e54673f9c 100644 --- a/module/entry/view/log.html.php +++ b/module/entry/view/log.html.php @@ -5,7 +5,7 @@ * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) * @author Gang Liu - * @package entry + * @package entry * @version $Id$ * @link http://www.zentao.net */ @@ -28,8 +28,8 @@ id}&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> - entry->id);?> - entry->date);?> + entry->id);?> + entry->date);?> entry->url);?> diff --git a/module/execution/css/all.css b/module/execution/css/all.css index c838652fbc..f02927c604 100644 --- a/module/execution/css/all.css +++ b/module/execution/css/all.css @@ -1,5 +1,22 @@ #product_chosen .chosen-single {width: 180px;} +.table-children {border-left: 2px solid #cbd0db; border-right: 2px solid #cbd0db;} +.table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;} +.table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;} +.table td.has-child > a:not(.plan-toggle) {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.table td.has-child > .plan-toggle {color: #838a9d; position: relative; top: 1px;} +.table td.has-child > .plan-toggle:hover {color: #006af1; cursor: pointer;} +.table td.has-child > .plan-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform:rotate(-90deg); -moz-transform:rotate(-90deg); -o-transform:rotate(-90deg); -webkit-transform:rotate(-90deg); transform: rotate(-90deg);} +.table td.has-child > .plan-toggle > .icon:before {text-align: left;} +.table td.has-child > .plan-toggle.collapsed > .icon {-ms-transform:rotate(90deg); -moz-transform:rotate(90deg); -o-transform:rotate(90deg); -webkit-transform:rotate(90deg); transform: rotate(90deg);} +.table th.hours {padding-right: 8px !important;} +.main-table tbody > tr.table-children > td:first-child::before {width: 3px;} +td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;} td.flex span.label-badge {margin-left: 5px; min-width: 50px;} td.flex span.project-type-label {margin-left: 5px; min-width: 36px;} +@-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}} + +.c-status, .c-date {width: 80px;} +.c-estimate, .c-consumed, .c-left {width: 70px;} +.c-progress, .c-burn {width: 60px;} diff --git a/module/execution/css/bug.css b/module/execution/css/bug.css index dd5a022939..efe9b23e31 100644 --- a/module/execution/css/bug.css +++ b/module/execution/css/bug.css @@ -7,3 +7,5 @@ .dropdown-list > li > a:hover, .dropdown-list > li > a:focus {color: #1a4f85; text-decoration: none; background-color: #ddd;} td.delayed {color: #fff; background: #e84e0f !important;} + +.c-severity {width: 80px;} diff --git a/module/execution/css/importtask.css b/module/execution/css/importtask.css index e0bf8f4689..942bf6c0f9 100644 --- a/module/execution/css/importtask.css +++ b/module/execution/css/importtask.css @@ -1 +1,2 @@ #fromproject_chosen .chosen-single {width: 220px;} +.c-name {width: 150px;} diff --git a/module/execution/css/managemembers.css b/module/execution/css/managemembers.css index d9566fc8b1..113cd948de 100644 --- a/module/execution/css/managemembers.css +++ b/module/execution/css/managemembers.css @@ -20,3 +20,6 @@ #teamForm .table tr > td:first-child {padding-left: 10px;} #teamForm .table tr > td:last-child {padding-right: 10px;} + +.c-limited {width: 110px;} +.c-actions {width: 90px;} diff --git a/module/execution/css/story.css b/module/execution/css/story.css index 1155892628..5189f5adf3 100644 --- a/module/execution/css/story.css +++ b/module/execution/css/story.css @@ -7,3 +7,5 @@ tbody > tr > td > .btn-icon {margin-right: 4px;} @media (max-width: 820px) {#storyList .c-sort, #storyList .c-stage {display: none !important;};} #batchToTask .checkbox-primary {display: inline-block; margin-left: 10px;} th.c-pri{width:50px;} +.c-estimate {width: 40px;} +.c-status {width: 80px;} diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 85590cc2e0..51004233d6 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -11,21 +11,6 @@ ?> -