Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* ajusted style of tree.

Browse Source
This commit is contained in:
Catouse
2014-04-16 11:16:17 +08:00
parent 214393e15d
commit b8b96ddbaf
6 changed files with 28 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/view/batchcreate.html.php
+1 -1
View File
@@ -19,7 +19,7 @@
<span class='prefix'><?php echo html::icon($lang->icons['testcase']);?></span>
<strong><small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small> <?php echo $lang->testcase->batchCreate;?></strong>
<?php if($story):?>
<small><?php echo html::icon($lang->icons['story']) . '#' . $story->id . ' ' . $story->title ?></small>
<small class='text-muted'><?php echo html::icon($lang->icons['story']) . ' ' . $story->title ?></small>
<?php endif;?>
</div>
</div>
module/tree/css/common.css
+3
View File
@@ -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}
module/tree/model.php
+1 -1
View File
@@ -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;
}
module/tree/view/browse.html.php
+4 -4
View File
@@ -61,22 +61,22 @@
{
if($allProject)
{
echo "<span class='copy'>";
echo "<div class='copy'>";
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 '</span>';
echo '</div>';
}
}
else if($viewType == 'story')
{
if($allProduct)
{
echo "<span class='copy'>";
echo "<div class='copy'>";
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 '</span>';
echo '</div>';
}
}
$maxOrder = 0;
www/theme/default/style.css
+12 -13
View File
@@ -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;}
www/theme/default/treeview.css
+7 -67
View File
@@ -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;}