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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wyd621
2013-09-28 00:41:37 +00:00
parent dceaf04b0b 609b182ae0
commit 81a2a18ed4
7 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/buildtemplates.html.php
+2 -2
View File
@@ -6,8 +6,8 @@ KindEditor.lang({'savetemplate' : '<?php echo $lang->bug->saveTemplate;?>'});
foreach($templates as $key => $template)
{
echo "<span id='tplBox$template->id'>";
echo $lang->arrow. "<span id='tplTitleBox$template->id' onclick='setTemplate($template->id)' style='text-decoration:underline; color:blue' class='hand'>$template->title</span>";
echo html::commonButton('&nbsp;', "onclick=deleteTemplate($template->id) class='icon-remove icon-large'");
echo '&nbsp; ' . $lang->arrow. " <span id='tplTitleBox$template->id' onclick='setTemplate($template->id)' style='text-decoration:underline; color:blue' class='hand'>$template->title</span>";
echo "&nbsp; <a href='javascript:void();' onclick='deleteTemplate($template->id)' class='link-icon'><i class='icon-remove icon-sm'></i></a>";
echo "<span id='template$template->id' class='hidden'>$template->content</span>";
echo '<br /></span>';
}
module/custom/view/set.html.php
+3 -3
View File
@@ -23,8 +23,8 @@ $itemRow = <<<EOT
<input type='text' class="w-p98" value="" name="values[]">
</td>
<td class='a-left'>
<a href='javascript:onclick=addItem(this)' class='link-icon'><i class='icon-add'></i></a>
<a href='javascript:onclick=delItem(this)' class='link-icon'><i class='icon-delete'></i></a>
<a href='javascript:void()' class='link-icon' onclick='addItem(this)'><i class='icon-add'></i></a>
<a href='javascript:void()' class='link-icon' onclick='delItem(this)'><i class='icon-delete'></i></a>
</td>
</tr>
EOT;
@@ -78,7 +78,7 @@ EOT;
</td>
<?php if($canAdd):?>
<td class='a-left'>
<a href='javascript:onclick=addItem(this)' class='link-icon'><i class='icon-add'></i></a>
<a href='javascript:void()' class='link-icon' onclick='addItem(this)'><i class='icon-add'></i></a>
<?php if(!$system):?><a href='javascript:onclick=delItem(this)' class='link-icon'><i class='icon-delete'></i></a><?php endif;?>
</td>
<?php endif;?>
module/extension/css/common.css
+3 -2
View File
@@ -4,11 +4,12 @@
.success {color:green; font-size:14px}
.exttable td {padding:10px 5px 5px 10px}
.exttable caption{background:#efefef; border-color:#CCC9C9; margin-left:0}
#wrap table.table-1.exttable>caption{background:#efefef; border-color:#CCC9C9; margin:0px;padding: 2px 8px}
.exttable {border-color:#CCC9C9; border-top:none;}
.exttable td{border-color:#CCC9C9}
#license{width:100%; height:190px; border:1px solid #e4e4e4}
small{font-weight:normal}
.exttable .button-c,.exttable .button-s{width: auto;min-width: inherit;}
.exttable .button-c,.exttable .button-s{width: auto;min-width: inherit;}
.side .box-content{margin-bottom: 10px;}
module/file/view/buildform.html.php
+2 -2
View File
@@ -6,8 +6,8 @@
<input type='file' name='files[]' class='fileControl' tabindex='-1' />
<label tabindex='-1' class='fileLabel'>{$lang->file->label}</label>
<input type='text' name='labels[]' class='text-3' tabindex='-1' />
<a href='javascript:onclick=addItem(this)' class='link-icon'><i class='icon-add'></i></a>
<a href='javascript:onclick=delItem(this)' class='link-icon'><i class='icon-delete'></i></a>
<a href='javascript:void();' onclick='addFile(this)' class='link-icon'><i class='icon-add'></i></a>
<a href='javascript:void();' onclick='delFile(this)' class='link-icon'><i class='icon-delete'></i></a>
</div>
EOT;
for($i = 1; $i <= $fileCount; $i ++) echo str_replace('$i', $i, $fileRow);
module/project/view/batchedit.html.php
+2 -2
View File
@@ -31,8 +31,8 @@
<td><?php echo html::input("codes[$projectID]", $projects[$projectID]->code, "class='text-1'");?></td>
<td><?php echo html::select("PMs[$projectID]", $pmUsers, $projects[$projectID]->PM, 'class=text-1');?></td>
<td><?php echo html::select("statuses[$projectID]", $lang->project->statusList, $projects[$projectID]->status, 'class=text-1');?></td>
<td><?php echo html::input("begins[$projectID]", $projects[$projectID]->begin, "class='text-1 date' onchange='computeWorkDays(this.id)'");?></td>
<td><?php echo html::input("ends[$projectID]", $projects[$projectID]->end, "class='text-1 date' onchange='computeWorkDays(this.id)'");?></td>
<td><?php echo html::input("begins[$projectID]", $projects[$projectID]->begin, "class='text-1 w-date date' onchange='computeWorkDays(this.id)'");?></td>
<td><?php echo html::input("ends[$projectID]", $projects[$projectID]->end, "class='text-1 w-date date' onchange='computeWorkDays(this.id)'");?></td>
<td><?php echo html::input("dayses[$projectID]", $projects[$projectID]->days, "class='w-100px'") . $lang->project->day;?></td>
</tr>
<?php endforeach;?>
module/testcase/view/browse.html.php
+1 -1
View File
@@ -31,7 +31,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
</div>
<div class='f-right'>
<?php
common::printIcon('testcase', 'import', "productID=$productID");
common::printIcon('testcase', 'import', "productID=$productID", '', 'button', '', '', 'export cboxElement');
echo '<span class="link-button dropButton">';
echo html::a("#", "<i class='icon-green-common-export'></i>" . $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'");
www/theme/default/style.css
+9 -7
View File
@@ -28,6 +28,7 @@ a {text-decoration:none;}
.link-icon:hover{color:#000;text-shadow:1px 1px 3px rgba(0,0,0,0.25);filter: alpha(opacity=100);-moz-opacity:1;opacity: 1;}
i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[class*=" icon-"]{display: inline-block;min-width: 13px;min-height: 13px;}
.outer td i[class^="icon-"],.outer td i[class*=" icon-"]{font-size: 18px;margin-right: 4px;}
.outer td i[class^="icon-"].icon-sm,.outer td i[class*=" icon-"].icon-sm{font-size: 0.9em;}
.icon-green-testcase-import:before,.icon-gray-testcase-import:before,
.icon-green-common-import:before,.icon-gray-common-import:before{content: "\f019";}
@@ -42,7 +43,7 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c
.icon-green-project-putoff:before,.icon-gray-project-putoff:before{content: "\f073";}
.icon-green-story-activate:before,.icon-gray-story-activate:before,
.icon-green-bug-activate:before,.icon-gray-bug-activate:before,
.icon-green-task-activate:before,.icon-gray-task-activate:before
.icon-green-task-activate:before,.icon-gray-task-activate:before,
.icon-green-project-activate:before,.icon-gray-project-activate:before{content: "\f011";color:#058100;}
.icon-green-bug-icon-wrench:before,.icon-gray-bug-icon-wrench:before{content: "\f085";}
.icon-green-group-managepriv:before,.icon-gray-group-managepriv:before{content: "\f023";}
@@ -64,6 +65,7 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c
.icon-green-story-change:before,.icon-gray-story-change:before{content: "\f074";}
.icon-green-bug-confirmBug:before,.icon-gray-bug-confirmBug:before,
.icon-green-task-confirmStoryChange:before,.icon-gray-task-confirmStoryChange:before,
.icon-green-testcase-confirmStoryChange:before,.icon-gray-testcase-confirmStoryChange:before,
.icon-green-story-review:before,.icon-gray-story-review:before{content: "\f002";}
.icon-green-task-close:before,.icon-gray-task-close:before,
.icon-green-story-close:before,.icon-gray-story-close:before,
@@ -78,7 +80,7 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c
.icon-green-task-assignTo:before,.icon-gray-task-assignTo:before,.icon-green-bug-assignTo:before,.icon-gray-bug-assignTo:before{content: "\f0a4";}
.icon-green-common-delete:before,.icon-gray-common-delete:before,
.icon-green-task-deleteEstimate:before,.icon-gray-task-deleteEstimate:before{content: "\f00d";}
.icon-green-common-edit:before,.icon-gray-common-edit:before
.icon-green-common-edit:before,.icon-gray-common-edit:before,
.icon-green-task-editEstimate:before,.icon-gray-task-editEstimate:before{content: "\f040";}
.icon-green-todo-finish:before,.icon-gray-todo-finish:before,
.icon-green-bug-resolve:before,.icon-gray-bug-resolve:before,
@@ -88,7 +90,7 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c
.icon-green-testcase-batchCreate:before,.icon-gray-testcase-batchCreate:before,
.icon-green-task-batchCreate:before,.icon-gray-task-batchCreate:before,
.icon-green-bug-batchCreate:before,.icon-gray-bug-batchCreate:before,
.icon-green-effort-batchCreate:before,.icon-gray-effort-batchCreate:before
.icon-green-effort-batchCreate:before,.icon-gray-effort-batchCreate:before,
.icon-green-story-batchCreate:before,.icon-gray-story-batchCreate:before{content: "\f055";}
.icon-green-common-report:before,.icon-gray-common-report:before{content: "\f080";}
.icon-green-story-create:before,.icon-gray-story-create:before,
@@ -152,7 +154,7 @@ input[type="datetime"][readonly],input[type="datetime-local"][readonly],input[ty
input[type="month"][readonly],input[type="time"][readonly],input[type="week"][readonly],
input[type="number"][readonly],input[type="email"][readonly],input[type="url"][readonly],
input[type="search"][readonly],input[type="tel"][readonly],input[type="color"][readonly]{cursor: not-allowed;background-color: #e9e9e9;}
select[multiple]{height: auto;}
select[multiple],textarea{height: auto;}
/*-----------------------LAYOUT SETTING ----------------------------*/
#wrap{ padding:0 19px 20px 19px; background:#e5e5e5;}
@@ -229,6 +231,7 @@ select.text-3 {width: 250px}
.text-5 {width: 480px}
.select-1 {width: 90%}
select.select-1 {width: 90%}
.select-2 {width: 125px}
.select-3 {width: 245px}
select.select-3{width: 255px;}
@@ -478,7 +481,7 @@ table.data-table td:last-child{padding-right: 20px;}
#projectID {background:#e5e5e5; border:1px solid #e5e5e5}
/* Feature bar. */
#featurebar,.outer>table.table-1>caption{height:34px; line-height:34px;background-color: #f8fafe; padding:8px 10px; border-bottom: 1px solid #e7edf7;margin: -20px -20px 20px -20px;}
#featurebar,#wrap .outer>table.table-1>caption{height:34px; line-height:34px;background-color: #f8fafe; padding:8px 10px; border-bottom: 1px solid #e7edf7;margin: -20px -20px 20px -20px;}
#featurebar span {font-size:14px;}
#featurebar a,.outer>table.table-1>caption a{text-decoration:none; display: inline-block;padding: 0px 7px; line-height: 34px;height: 34px; font-size:14px;-webkit-transition: all .2s;-o-transition: all .2s;-moz-transition: all .2s;transition: all .2s;}
#featurebar a:hover,.outer>table.table-1>caption a:hover{color:#000;background-color: #e5e5e5;}
@@ -636,9 +639,8 @@ table.data-table td:last-child{padding-right: 20px;}
#featurebar .f-right .icon-green-bug-customFields {padding:2px 8px; background:url(images/main/zt-icons.png) -141px -282px;}
/* Case icons. */
.icon-green-testcase-confirmStoryChange {padding:2px 8px; background:url(images/main/zt-icons.png) -40px -282px;}
/* Link-button. */
.link-button{display: inline-block;}
.link-button a{ color:#036; font-weight:normal; font-size:14px;padding: 3px 4px;}
.link-button a i{font-size: 18px;}