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

* fix bugs: new ui.

Browse Source
This commit is contained in:
azhi
2013-09-28 10:35:10 +08:00
parent 81a2a18ed4
commit 16092cad71
17 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/edit.css
+2 -4
View File
@@ -1,4 +1,2 @@
#product, #module, #project, #story, #task, #resolvedBuild{width:220px}
#steps {width:100%}
.select-3 {width:220px}
.text-3 {width:215px}
select.select-3,#mailto,#module,#story-chzn {width:230px}
.text-1 {width:220px}
module/bug/js/browse.js
+1 -1
View File
@@ -1,6 +1,6 @@
$(document).ready(function()
{
$("a.customFields").colorbox({width:540, height:340, iframe:true, transition:'none'});
$("a.customFields").colorbox({width:680, height:400, iframe:true, transition:'none'});
$('#' + browseType + 'Tab').addClass('active');
$('#module' + moduleID).addClass('active');
if(browseType == 'bysearch') ajaxGetSearchForm();
module/bug/view/edit.html.php
+10 -12
View File
@@ -44,7 +44,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<tr class='bd-none'><td class='bd-none'>
<fieldset>
<legend><?php echo $lang->bug->legendSteps;?></legend>
<div class='w-p90'><?php echo html::textarea('steps', htmlspecialchars($bug->steps), "rows='12'");?></div>
<?php echo html::textarea('steps', htmlspecialchars($bug->steps), "rows='12' class='area-1'");?>
</fieldset>
<fieldset>
<legend><?php echo $lang->bug->legendComment;?></legend>
@@ -72,14 +72,12 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table-1 a-left' cellpadding='0' cellspacing='0'>
<tr>
<td class='rowhead'><?php echo $lang->bug->product;?></td>
<td>
<?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value);");?>
</td>
<td><?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='select-3'");?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->module;?></td>
<td>
<span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()'");?></span>
<span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='select-3'");?></span>
</td>
</tr>
<tr>
@@ -122,11 +120,11 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->keywords;?></td>
<td><?php echo html::input('keywords', $bug->keywords, 'class="text-3"');?></td>
<td><?php echo html::input('keywords', $bug->keywords, 'class="text-1"');?></td>
</tr>
<tr>
<td class='rowhead w-p20'><?php echo $lang->bug->mailto;?></td>
<td><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="text-3" multiple');?></td>
<td><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="text-1" multiple');?></td>
</tr>
</table>
</fieldset>
@@ -167,7 +165,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->resolvedDate;?></td>
<td><?php echo html::input('resolvedDate', $bug->resolvedDate, 'class=text-3');?></td>
<td><?php echo html::input('resolvedDate', $bug->resolvedDate, 'class=text-1');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->resolvedBuild;?></td>
@@ -179,7 +177,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
</tr>
<tr id='duplicateBugBox' <?php if($bug->resolution != 'duplicate') echo "style='display:none'";?>>
<td class='rowhead'><?php echo $lang->bug->duplicateBug;?></td>
<td><?php echo html::input('duplicateBug', $bug->duplicateBug, 'class=text-3');?></td>
<td><?php echo html::input('duplicateBug', $bug->duplicateBug, 'class=text-1');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->closedBy;?></td>
@@ -187,7 +185,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->closedDate;?></td>
<td><?php echo html::input('closedDate', $bug->closedDate, 'class=text-3');?></td>
<td><?php echo html::input('closedDate', $bug->closedDate, 'class=text-1');?></td>
</tr>
</table>
</fieldset>
@@ -196,11 +194,11 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table-1 a-left'>
<tr>
<td class='rowhead'><?php echo $lang->bug->linkBug;?></td>
<td><?php echo html::input('linkBug', $bug->linkBug, 'class="text-3"');?></td>
<td><?php echo html::input('linkBug', $bug->linkBug, 'class="text-1"');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->case;?></td>
<td><?php echo html::input('case', $bug->case, 'class="text-3"');?></td>
<td><?php echo html::input('case', $bug->case, 'class="text-1"');?></td>
</tr>
</table>
</fieldset>
module/common/lang/en.php
+3 -3
View File
@@ -165,8 +165,8 @@ $lang->product->menu->doc = array('link' => 'Doc|product|doc|productID=%s',
$lang->product->menu->view = array('link' => 'Manage|product|view|productID=%s', 'alias' => 'edit');
$lang->product->menu->module = 'Modules|tree|browse|productID=%s&view=story';
$lang->product->menu->project = 'Projects|product|project|status=all&productID=%s';
$lang->product->menu->create = array('link' => '<span class="icon-add1">&nbsp;</span>New|product|create', 'float' => 'right');
$lang->product->menu->all = array('link' => '<span class="icon-all">&nbsp;</span>All|product|index|locate=no&productID=%s', 'float' => 'right');
$lang->product->menu->create = array('link' => '<span class="icon-plus">&nbsp;</span>New|product|create', 'float' => 'right');
$lang->product->menu->all = array('link' => '<span class="icon-th">&nbsp;</span>All|product|index|locate=no&productID=%s', 'float' => 'right');
$lang->story = new stdclass();
$lang->productplan = new stdclass();
@@ -256,7 +256,7 @@ $lang->company->menu->browseGroup = array('link' => 'Group|group|browse', 'subM
$lang->company->menu->view = array('link' => 'Company|company|view', 'alias' => 'edit');
$lang->company->menu->dynamic = 'Dynamic|company|dynamic|';
$lang->company->menu->addGroup = array('link' => '<span class="icon-add">&nbsp;</span>Add Group|group|create', 'float' => 'right');
$lang->company->menu->batchAddUser = array('link' => '<span class="icon-add">&nbsp;</span>Batch Add|user|batchCreate', 'subModule' => 'user', 'float' => 'right');
$lang->company->menu->batchAddUser = array('link' => '<span class="icon-green-user-batchCreate">&nbsp;</span>Batch Add|user|batchCreate', 'subModule' => 'user', 'float' => 'right');
$lang->company->menu->addUser = array('link' => '<span class="icon-add">&nbsp;</span>Add User|user|create|dept=%s&from=company', 'subModule' => 'user', 'float' => 'right');
$lang->dept = new stdclass();
module/common/lang/zh-cn.php
+1 -1
View File
@@ -256,7 +256,7 @@ $lang->company->menu->browseGroup = array('link' => '权限|group|browse', 'sub
$lang->company->menu->view = array('link' => '公司|company|view', 'alias' => 'edit');
$lang->company->menu->dynamic = '动态|company|dynamic|';
$lang->company->menu->addGroup = array('link' => '<i class="icon-plus"></i>&nbsp;添加分组|group|create', 'float' => 'right');
$lang->company->menu->batchAddUser = array('link' => '<i class="icon-plus"></i>&nbsp;批量添加|user|batchCreate|dept=%s', 'subModule' => 'user', 'float' => 'right');
$lang->company->menu->batchAddUser = array('link' => '<i class="icon-green-user-batchCreate"></i>&nbsp;批量添加|user|batchCreate|dept=%s', 'subModule' => 'user', 'float' => 'right');
$lang->company->menu->addUser = array('link' => '<i class="icon-plus"></i>&nbsp;添加用户|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right');
$lang->dept = new stdclass();
module/story/css/create.css
+1
View File
@@ -1,2 +1,3 @@
#plan {width:245px}
#mailto {width:85%}
select {border:1px solid #ccc}
module/story/css/edit.css
+2 -1
View File
@@ -1 +1,2 @@
#module, #plan {width:90%}
select.select-3,#module,#mailto {width:230px}
.text-1 {width:220px}
module/story/view/create.html.php
+1 -1
View File
@@ -79,7 +79,7 @@
<th class='rowhead'><nobr><?php echo $lang->story->mailto;?></nobr></th>
<td>
<?php
echo html::select('mailto[]', $users, str_replace(' ' , '', $mailto), "class='text-1' multiple");
echo html::select('mailto[]', $users, str_replace(' ' , '', $mailto), "multiple");
if($contactLists) echo html::select('', $contactLists, '', "class='f-right' onchange=\"setMailto('mailto', this.value)\"");
?>
</td>
module/story/view/edit.html.php
+10 -10
View File
@@ -47,14 +47,14 @@
<table class='table-1'>
<tr>
<td class='rowhead w-p20'><?php echo $lang->story->product;?></td>
<td><?php echo html::select('product', $products, $story->product, 'class="select-1" onchange="loadProduct(this.value)";');?></td>
<td><?php echo html::select('product', $products, $story->product, 'class="select-3" onchange="loadProduct(this.value)";');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->story->module;?></td>
<td>
<span id='moduleIdBox'>
<?php
echo html::select('module', $moduleOptionMenu, $story->module, 'class="select-1"');
echo html::select('module', $moduleOptionMenu, $story->module, 'class="select-3"');
if(count($moduleOptionMenu) == 1)
{
echo html::a($this->createLink('tree', 'browse', "rootID=$story->product&view=story"), $lang->tree->manage, '_blank');
@@ -68,7 +68,7 @@
<td class='rowhead'><?php echo $lang->story->plan;?></td>
<td>
<span id='planIdBox'>
<?php echo html::select('plan', $plans, $story->plan, 'class=select-1');
<?php echo html::select('plan', $plans, $story->plan, 'class=select-3');
if(count($plans) == 1)
{
echo html::a($this->createLink('productplan', 'create', "productID=$story->product"), $lang->productplan->create, '_blank');
@@ -80,7 +80,7 @@
</tr>
<tr>
<th class='rowhead'><?php echo $lang->story->source;?></th>
<td><?php echo html::select('source', $lang->story->sourceList, $story->source, 'class=select-1');?></td>
<td><?php echo html::select('source', $lang->story->sourceList, $story->source, 'class=select-3');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->story->status;?></td>
@@ -89,12 +89,12 @@
<?php if($story->status != 'draft'):?>
<tr>
<td class='rowhead'><?php echo $lang->story->stage;?></td>
<td><?php echo html::select('stage', $lang->story->stageList, $story->stage, 'class=select-1');?></td>
<td><?php echo html::select('stage', $lang->story->stageList, $story->stage, 'class=select-3');?></td>
</tr>
<?php endif;?>
<tr>
<td class='rowhead'><?php echo $lang->story->pri;?></td>
<td><?php echo html::select('pri', $lang->story->priList, $story->pri, 'class=select-1');?></td>
<td><?php echo html::select('pri', $lang->story->priList, $story->pri, 'class=select-3');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->story->estimate;?></td>
@@ -106,7 +106,7 @@
</tr>
<tr>
<td class='rowhead'><?php echo $lang->story->mailto;?></td>
<td><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $story->mailto), "class='select-1' multiple");?></td>
<td><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $story->mailto), "class='select-3' multiple");?></td>
</tr>
</table>
</fieldset>
@@ -119,7 +119,7 @@
</tr>
<tr>
<td class='rowhead'><?php echo $lang->story->assignedTo;?></td>
<td><?php echo html::select('assignedTo', $users, $story->assignedTo, 'class="select-1"');?></td>
<td><?php echo html::select('assignedTo', $users, $story->assignedTo, 'class="select-3"');?></td>
</tr>
<?php if($story->reviewedBy):?>
<tr>
@@ -130,11 +130,11 @@
<?php if($story->status == 'closed'):?>
<tr>
<td class='rowhead'><?php echo $lang->story->closedBy;?></td>
<td><?php echo html::select('closedBy', $users, $story->closedBy, 'class="select-1"');?></td>
<td><?php echo html::select('closedBy', $users, $story->closedBy, 'class="select-3"');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->story->closedReason;?></td>
<td><?php echo html::select('closedReason', $lang->story->reasonList, $story->closedReason, 'class="select-1"');?></td>
<td><?php echo html::select('closedReason', $lang->story->reasonList, $story->closedReason, 'class="select-3"');?></td>
</tr>
<?php endif;?>
</table>
module/task/css/create.css
+1
View File
@@ -1,3 +1,4 @@
.button-c {padding:2px}
#mailto {width:85%}
caption .f-right a{color:red}
module/task/css/edit.css
+3 -5
View File
@@ -1,5 +1,3 @@
#story {width:220px}
.select-1 {width:220px}
.text-1 {width:215px}
#module {width:220px}
#assignedTo {width:220px}
select.select-1,#module,#mailto {width:230px}
.text-1 {width:220px}
#estStarted,#realStarted,#deadline {width:200px}
module/task/view/create.html.php
+1 -1
View File
@@ -73,7 +73,7 @@
<th class='rowhead'><?php echo $lang->task->mailto;?></th>
<td>
<?php
echo html::select('mailto[]', $users, str_replace(' ', '', $task->mailto), 'class="text-1" multiple');
echo html::select('mailto[]', $users, str_replace(' ', '', $task->mailto), 'multiple');
if($contactLists) echo html::select('', $contactLists, '', "class='f-right' onchange=\"setMailto('mailto', this.value)\"");
?>
</td>
module/task/view/recordestimate.html.php
+1 -1
View File
@@ -48,7 +48,7 @@
<caption><?php echo $lang->task->logEfforts;?></caption>
<tr>
<th class="w-id"><?php echo $lang->idAB;?></th>
<th class="w-100px"><?php echo $lang->task->date;?></th>
<th class="w-120px"><?php echo $lang->task->date;?></th>
<th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
<th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
<th><?php echo $lang->comment;?></th>
module/testcase/css/edit.css
+2 -1
View File
@@ -1 +1,2 @@
#module{width:90%}
select.select-1,#module,#story {width:230px}
.text-1 {width:220px}
module/testtask/view/cases.html.php
+1 -1
View File
@@ -36,7 +36,7 @@ var moduleID = '<?php echo $moduleID;?>';
?>
</div>
</div>
<div id='querybox'></div>
<div id='querybox' class='<?php if($browseType !='bysearch') echo 'hidden';?>'></div>
<form method='post' name='casesform'>
<table class='cont-lt1'>
www/js/my.full.js
+1 -1
View File
@@ -544,7 +544,7 @@ function setRepoLink()
/* Set the colorbox of export. */
function setExport()
{
if($('.export').size()) $(".export").colorbox({width:600, height:200, iframe:true, transition:'none', scrolling:true});
if($('.export').size()) $(".export").colorbox({width:650, height:250, iframe:true, transition:'none', scrolling:true});
}
/**
www/theme/default/style.css
+2 -1
View File
@@ -91,6 +91,7 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c
.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-user-batchCreate:before,.icon-gray-user-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,
@@ -647,4 +648,4 @@ table.data-table td:last-child{padding-right: 20px;}
.link-button a:hover {color:#000;}
/* Effort icons. */
.icon-green-effort-createForObject {padding:2px 8px; background:url(images/main/zt-icons.png) -80px -2px;}
.icon-green-effort-createForObject {padding:2px 8px; background:url(images/main/zt-icons.png) -80px -2px;}