From 16092cad71b7008f07bec2142d072f34e5f5fd05 Mon Sep 17 00:00:00 2001 From: azhi Date: Sat, 28 Sep 2013 10:35:10 +0800 Subject: [PATCH] * fix bugs: new ui. --- module/bug/css/edit.css | 6 ++---- module/bug/js/browse.js | 2 +- module/bug/view/edit.html.php | 22 ++++++++++------------ module/common/lang/en.php | 6 +++--- module/common/lang/zh-cn.php | 2 +- module/story/css/create.css | 1 + module/story/css/edit.css | 3 ++- module/story/view/create.html.php | 2 +- module/story/view/edit.html.php | 20 ++++++++++---------- module/task/css/create.css | 1 + module/task/css/edit.css | 8 +++----- module/task/view/create.html.php | 2 +- module/task/view/recordestimate.html.php | 2 +- module/testcase/css/edit.css | 3 ++- module/testtask/view/cases.html.php | 2 +- www/js/my.full.js | 2 +- www/theme/default/style.css | 3 ++- 17 files changed, 43 insertions(+), 44 deletions(-) diff --git a/module/bug/css/edit.css b/module/bug/css/edit.css index 31c8f18b9e..b627c8cbcd 100644 --- a/module/bug/css/edit.css +++ b/module/bug/css/edit.css @@ -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} diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js index f2938ef993..982b495d3e 100644 --- a/module/bug/js/browse.js +++ b/module/bug/js/browse.js @@ -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(); diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index d8b4b39563..99f1c83625 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -44,7 +44,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
bug->legendSteps;?> -
steps), "rows='12'");?>
+ steps), "rows='12' class='area-1'");?>
bug->legendComment;?> @@ -72,14 +72,12 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); - + @@ -122,11 +120,11 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); - + - +
bug->product;?> - -
bug->module;?> - +
bug->keywords;?>keywords, 'class="text-3"');?>keywords, 'class="text-1"');?>
bug->mailto;?>mailto), 'class="text-3" multiple');?>mailto), 'class="text-1" multiple');?>
@@ -167,7 +165,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); bug->resolvedDate;?> - resolvedDate, 'class=text-3');?> + resolvedDate, 'class=text-1');?> bug->resolvedBuild;?> @@ -179,7 +177,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); resolution != 'duplicate') echo "style='display:none'";?>> bug->duplicateBug;?> - duplicateBug, 'class=text-3');?> + duplicateBug, 'class=text-1');?> bug->closedBy;?> @@ -187,7 +185,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); bug->closedDate;?> - closedDate, 'class=text-3');?> + closedDate, 'class=text-1');?> @@ -196,11 +194,11 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); - + - +
bug->linkBug;?>linkBug, 'class="text-3"');?>linkBug, 'class="text-1"');?>
bug->case;?>case, 'class="text-3"');?>case, 'class="text-1"');?>
diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 6e73f7756e..14afed070c 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -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' => ' New|product|create', 'float' => 'right'); -$lang->product->menu->all = array('link' => ' All|product|index|locate=no&productID=%s', 'float' => 'right'); +$lang->product->menu->create = array('link' => ' New|product|create', 'float' => 'right'); +$lang->product->menu->all = array('link' => ' 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' => ' Add Group|group|create', 'float' => 'right'); -$lang->company->menu->batchAddUser = array('link' => ' Batch Add|user|batchCreate', 'subModule' => 'user', 'float' => 'right'); +$lang->company->menu->batchAddUser = array('link' => ' Batch Add|user|batchCreate', 'subModule' => 'user', 'float' => 'right'); $lang->company->menu->addUser = array('link' => ' Add User|user|create|dept=%s&from=company', 'subModule' => 'user', 'float' => 'right'); $lang->dept = new stdclass(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 1f9bc77aec..a82e9233dc 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -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' => ' 添加分组|group|create', 'float' => 'right'); -$lang->company->menu->batchAddUser = array('link' => ' 批量添加|user|batchCreate|dept=%s', 'subModule' => 'user', 'float' => 'right'); +$lang->company->menu->batchAddUser = array('link' => ' 批量添加|user|batchCreate|dept=%s', 'subModule' => 'user', 'float' => 'right'); $lang->company->menu->addUser = array('link' => ' 添加用户|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right'); $lang->dept = new stdclass(); diff --git a/module/story/css/create.css b/module/story/css/create.css index 6a73fbb034..6ebadab92e 100644 --- a/module/story/css/create.css +++ b/module/story/css/create.css @@ -1,2 +1,3 @@ #plan {width:245px} +#mailto {width:85%} select {border:1px solid #ccc} diff --git a/module/story/css/edit.css b/module/story/css/edit.css index 35f5f4cea0..b74bd91c06 100644 --- a/module/story/css/edit.css +++ b/module/story/css/edit.css @@ -1 +1,2 @@ -#module, #plan {width:90%} +select.select-3,#module,#mailto {width:230px} +.text-1 {width:220px} diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index ab96c6ab1d..a265a38fe4 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -79,7 +79,7 @@ story->mailto;?> diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 58f738a620..c17bc21161 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -47,14 +47,14 @@ - + - + @@ -89,12 +89,12 @@ status != 'draft'):?> - + - + @@ -106,7 +106,7 @@ - +
story->product;?>product, 'class="select-1" onchange="loadProduct(this.value)";');?>product, 'class="select-3" onchange="loadProduct(this.value)";');?>
story->module;?> 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 @@ story->plan;?> - plan, 'class=select-1'); + 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 @@
story->source;?>story->sourceList, $story->source, 'class=select-1');?>story->sourceList, $story->source, 'class=select-3');?>
story->status;?>
story->stage;?>story->stageList, $story->stage, 'class=select-1');?>story->stageList, $story->stage, 'class=select-3');?>
story->pri;?>story->priList, $story->pri, 'class=select-1');?>story->priList, $story->pri, 'class=select-3');?>
story->estimate;?>
story->mailto;?>mailto), "class='select-1' multiple");?>mailto), "class='select-3' multiple");?>
@@ -119,7 +119,7 @@ story->assignedTo;?> - assignedTo, 'class="select-1"');?> + assignedTo, 'class="select-3"');?> reviewedBy):?> @@ -130,11 +130,11 @@ status == 'closed'):?> story->closedBy;?> - closedBy, 'class="select-1"');?> + closedBy, 'class="select-3"');?> story->closedReason;?> - story->reasonList, $story->closedReason, 'class="select-1"');?> + story->reasonList, $story->closedReason, 'class="select-3"');?> diff --git a/module/task/css/create.css b/module/task/css/create.css index 997d99b45e..1fe9bdda77 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -1,3 +1,4 @@ .button-c {padding:2px} +#mailto {width:85%} caption .f-right a{color:red} diff --git a/module/task/css/edit.css b/module/task/css/edit.css index 69d4a6c350..7e2f8f2ffe 100644 --- a/module/task/css/edit.css +++ b/module/task/css/edit.css @@ -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} diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index e2025f9e86..ef1fc6912f 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -73,7 +73,7 @@ task->mailto;?> 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)\""); ?> diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php index e7e7692859..06f93889a3 100644 --- a/module/task/view/recordestimate.html.php +++ b/module/task/view/recordestimate.html.php @@ -48,7 +48,7 @@ task->logEfforts;?> idAB;?> - task->date;?> + task->date;?> task->consumedThisTime;?> task->leftThisTime;?> comment;?> diff --git a/module/testcase/css/edit.css b/module/testcase/css/edit.css index 0901de97b6..598c766d47 100644 --- a/module/testcase/css/edit.css +++ b/module/testcase/css/edit.css @@ -1 +1,2 @@ -#module{width:90%} +select.select-1,#module,#story {width:230px} +.text-1 {width:220px} diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index a301e0583d..3e41b0b1a7 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -36,7 +36,7 @@ var moduleID = ''; ?> -
+
'>
diff --git a/www/js/my.full.js b/www/js/my.full.js index 23a81aab4b..ad51479e41 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -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}); } /** diff --git a/www/theme/default/style.css b/www/theme/default/style.css index d588a209ee..094ef11544 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -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;} \ No newline at end of file +.icon-green-effort-createForObject {padding:2px 8px; background:url(images/main/zt-icons.png) -80px -2px;}