diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index 38bc5b3f03..98c907c2c5 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -19,7 +19,7 @@ icons['testcase']);?> icons['batchCreate']);?> testcase->batchCreate;?> - icons['story']) . '#' . $story->id . ' ' . $story->title ?> + icons['story']) . ' ' . $story->title ?> diff --git a/module/tree/css/common.css b/module/tree/css/common.css index 14137db4e4..fbc9b78596 100644 --- a/module/tree/css/common.css +++ b/module/tree/css/common.css @@ -4,3 +4,6 @@ .outer .row .col-md-8 .table-form {max-width: 600px} #moduleBox span > .form-control {margin-bottom: 5px;} +#moduleBox .copy {display: table; width: 100%} +#moduleBox .copy > .form-control, #moduleBox .copy > .btn {display: table-cell; width: auto} +#moduleBox .copy > .form-control {margin-right: -1px; min-width: 100px} diff --git a/module/tree/model.php b/module/tree/model.php index 5077561d2e..3018c0960b 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -588,7 +588,7 @@ class treeModel extends model if(common::hasPriv('tree', 'edit')) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'edit', "module={$module->id}&type=$type"), $this->lang->tree->edit, '', 'class="iframe"'); if(common::hasPriv('tree', 'browse') and strpos('productdoc,projectdoc', $module->type) === false and $module->type != 'webapp') $linkHtml .= ' ' . html::a(helper::createLink('tree', 'browse', "root={$module->root}&type=$type&module={$module->id}"), $this->lang->tree->child); if(common::hasPriv('tree', 'delete')) $linkHtml .= ' ' . html::a(helper::createLink('tree', 'delete', "root={$module->root}&module={$module->id}"), $this->lang->delete, 'hiddenwin'); - if(common::hasPriv('tree', 'updateorder')) $linkHtml .= ' ' . html::input("orders[$module->id]", $module->order, 'style="width:30px;text-align:center"'); + if(common::hasPriv('tree', 'updateorder')) $linkHtml .= ' ' . html::input("orders[$module->id]", $module->order, 'class="text-center w-30px form-control inline input-sm"'); } return $linkHtml; } diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index e25b1610b8..d59a6208a8 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -61,22 +61,22 @@ { if($allProject) { - echo ""; + echo "
"; echo html::select('allProject', $allProject, '', "class='form-control' onchange=\"syncProductOrProject(this,'project')\""); echo html::select('projectModule', $projectModules, '', "class='form-control'"); echo html::commonButton($lang->tree->syncFromProject, "id='copyModule' onclick='syncModule($currentProject, \"task\")'"); - echo ''; + echo '
'; } } else if($viewType == 'story') { if($allProduct) { - echo ""; + echo "
"; echo html::select('allProduct', $allProduct, '', "class='form-control' onchange=\"syncProductOrProject(this,'product')\""); echo html::select('productModule', $productModules, '', "class='form-control'"); echo html::commonButton($lang->tree->syncFromProduct, "id='copyModule' onclick='syncModule($currentProduct, \"story\")'"); - echo ''; + echo '
'; } } $maxOrder = 0; diff --git a/www/theme/default/style.css b/www/theme/default/style.css index f03da7d952..888e3cd969 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -130,9 +130,9 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable .done, [class$="-done"] {color:#078F0E;} .wait, [class$="-wait"] {color:#888;} .doing, [class$="-doing"] {color:#F30;} -.delayed, [class$="-delayed"] {background:#e84e0f; color:white;} +.delayed, [class$="-delayed"] {background:#e84e0f!important; color:white;} .pass, [class$="-pass"] {color:#078F0E;} -.blocked, [class$="-blocked"] {background:yellow;} +.blocked, [class$="-blocked"] {background:yellow!important;} .fail, [class$="-fail"] {color:red} /* === Views === */ @@ -555,18 +555,17 @@ select.select-3{width: 250px;} .area-4{width: 360px} .area-5{width: 480px} -/*-----------------------NAV----------------------------*/ -/* The nav bar. */ -.navbar ul {margin:0; padding:0;} -.navbar li {margin:0; padding:0; float:left; text-align:center; list-style-type:none;} -.navbar li>a {text-decoration:none;-webkit-transition: all .2s;-o-transition: all .2s;-moz-transition: all .2s;transition: all .2s;} -.navbar li>a:hover {color:#ff3600;} - -/*-----------------------SPECIAL PART SETTING--------------------*/ /* Tree menu. */ -.tree li {list-style-type:none;} -.tree .active {color:blue; font-weight:bold} -.tree a {color:#003366} +.tree {padding: 0; margin: 0;} +.tree li,.tree ul {margin: 0; padding: 0; display: block; position: relative;} +.tree > li {margin-right: 20px; font-weight: 400; padding-bottom: 8px;} +.tree > li > ul li {padding: 10px 15px 0; margin: 0;} +.tree li:before {display: inline-block; margin-right: 6px; content: '\e6ec'; font-family: ZenIcon; color: #ddd;} +.tree > li ul {border-left: 1px dashed #ccc; margin-left: 7px; font-weight: normal;} +.tree > li ul > li:before {content: '\e6e8';} +.tree > li ul > li:hover:before {content: '\e6ec';} +.tree > li ul > li:after {position: absolute; display: block; content: ""; width: 15px; left: -1px; top: 20px; height: 20px; border-top: 1px dashed #ccc;} +.tree > li > ul li:last-child:after {border-left: 1px solid #fff;} /* Select all and select reverse. */ #allchecker, #reversechecker {padding-right: 5px;padding-left: 5px;} diff --git a/www/theme/default/treeview.css b/www/theme/default/treeview.css index 517a6a698c..f6d413e03d 100644 --- a/www/theme/default/treeview.css +++ b/www/theme/default/treeview.css @@ -1,68 +1,8 @@ -.treeview, .treeview ul { - padding: 0; - margin: 0; - list-style: none; -} +/*treeview*/ +.treeview .hitarea {position: absolute; left: 15px; top: 10px; background-color: #fff; cursor: pointer;} +.treeview > li > .hitarea {left: 0px; top: 0px;} +.treeview .hitarea:before {color: #999; content: '\e710'; font-family: ZenIcon; transition:all 0.3s;} +.treeview li:hover .hitarea:before {color: #2973EA;} +.treeview .hitarea.collapsable-hitarea:before {content: '\e712';} -.treeview ul { - background-color: white; - margin-top: 4px; -} - -.treeview .hitarea { - background: url(images/treeview/treeview-default.gif) -64px -25px no-repeat; - height: 16px; - width: 16px; - margin-left: -16px; - float: left; - cursor: pointer; -} -/* fix for IE6 */ -* html .hitarea { - display: inline; - float:none; -} - -.treeview li { - margin: 0; - padding: 3px 0pt 3px 16px; -} - -.treeview a.selected { - background-color: #eee; -} - -#treecontrol { margin: 1em 0; display: none; } - -.treeview .hover { color: red; cursor: pointer; } - -.treeview li { background: url(images/treeview/treeview-default-line.gif) 0 0 no-repeat; } -.treeview li.collapsable, .treeview li.expandable { background-position: 0 -176px; } - -.treeview .expandable-hitarea { background-position: -80px -3px; } - -.treeview li.last { background-position: 0 -1766px } -.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: url(images/treeview/treeview-default.gif); } -.treeview li.lastCollapsable { background-position: 0 -111px } -.treeview li.lastExpandable { background-position: -32px -67px } - -.treeview div.lastCollapsable-hitarea, .treeview div.lastExpandable-hitarea { background-position: 0; } - -.treeview-red li { background-image: url(images/treeview/treeview-red-line.gif); } -.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(images/treeview/treeview-red.gif); } - -.treeview-black li { background-image: url(images/treeview/treeview-black-line.gif); } -.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(images/treeview/treeview-black.gif); } - -.treeview-gray li { background-image: url(images/treeview/treeview-gray-line.gif); } -.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(images/treeview/treeview-gray.gif); } - -.treeview-famfamfam li { background-image: url(images/treeview/treeview-famfamfam-line.gif); } -.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(images/treeview/treeview-famfamfam.gif); } - - -.filetree li { padding: 3px 0 2px 16px; } -.filetree span.folder, .filetree span.file { padding: 1px 0 1px 16px; display: block; } -.filetree span.folder { background: url(images/treeview/folder.gif) 0 0 no-repeat; } -.filetree li.expandable span.folder { background: url(images/treeview/folder-closed.gif) 0 0 no-repeat; } -.filetree span.file { background: url(images/treeview/file.gif) 0 0 no-repeat; } +.treeview .form-control {padding: 1px 2px; height: 22px;}