diff --git a/module/admin/css/safe.css b/module/admin/css/safe.css new file mode 100644 index 0000000000..940f4e5493 --- /dev/null +++ b/module/admin/css/safe.css @@ -0,0 +1,2 @@ +.thWidth{width:300px !important;} +html[lang^='zh-'] .thWidth{width:130px !important;} diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php index bf41720402..7f5cd24217 100644 --- a/module/admin/view/safe.html.php +++ b/module/admin/view/safe.html.php @@ -22,8 +22,7 @@
- - + diff --git a/module/backup/css/index.css b/module/backup/css/index.css new file mode 100644 index 0000000000..e399fae36d --- /dev/null +++ b/module/backup/css/index.css @@ -0,0 +1,2 @@ +.actionWidth{width:140px !important;} +html[lang^='zh-'] .actionWidth{width:110px !important;} diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php index 4e040d5cd9..c6bec7271d 100644 --- a/module/backup/view/index.html.php +++ b/module/backup/view/index.html.php @@ -36,8 +36,7 @@ - - + diff --git a/module/branch/lang/de.php b/module/branch/lang/de.php index 4633646c46..aef4261af1 100644 --- a/module/branch/lang/de.php +++ b/module/branch/lang/de.php @@ -6,7 +6,7 @@ $lang->branch->delete = 'Branch löschen'; $lang->branch->add = 'Hinzufügen'; $lang->branch->manageTitle = '%s Management'; -$lang->branch->all = 'Alle'; +$lang->branch->all = 'Alle '; $lang->branch->id = 'ID'; $lang->branch->product = 'Produkt'; diff --git a/module/branch/lang/en.php b/module/branch/lang/en.php index 28c10e3862..bf4dae07bc 100644 --- a/module/branch/lang/en.php +++ b/module/branch/lang/en.php @@ -6,7 +6,7 @@ $lang->branch->delete = 'Delete Branch'; $lang->branch->add = 'Add'; $lang->branch->manageTitle = '%s Management'; -$lang->branch->all = 'All'; +$lang->branch->all = 'All '; $lang->branch->id = 'ID'; $lang->branch->product = 'Product'; diff --git a/module/branch/model.php b/module/branch/model.php index 238ab82aa5..c4528fb9b8 100644 --- a/module/branch/model.php +++ b/module/branch/model.php @@ -46,8 +46,7 @@ class branchModel extends model $product = $this->loadModel('product')->getById($productID); if(!$product or $product->type == 'normal') return array(); - $space = common::checkNotCN() ? ' ' : ''; - $branches = array('0' => $this->lang->branch->all . $space . $this->lang->product->branchName[$product->type]) + $branches; + $branches = array('0' => $this->lang->branch->all . $this->lang->product->branchName[$product->type]) + $branches; } return $branches; } @@ -107,13 +106,12 @@ class branchModel extends model } } - $space = common::checkNotCN() ? ' ' : ''; foreach($products as $product) { if($product->type == 'normal') continue; if(!isset($branchGroups[$product->id])) $branchGroups[$product->id] = array(); - if(strpos($params, 'noempty') === false) $branchGroups[$product->id] = array('0' => $this->lang->branch->all . $space . $this->lang->product->branchName[$product->type]) + $branchGroups[$product->id]; + if(strpos($params, 'noempty') === false) $branchGroups[$product->id] = array('0' => $this->lang->branch->all . $this->lang->product->branchName[$product->type]) + $branchGroups[$product->id]; } return $branchGroups; diff --git a/module/bug/css/edit.css b/module/bug/css/edit.css index 581c88c64e..ddb55edfd8 100644 --- a/module/bug/css/edit.css +++ b/module/bug/css/edit.css @@ -4,3 +4,6 @@ .col-side .chosen-container[id^="resolvedBuild"] {width: 172px!important} .chosen-choices li.search-choice{word-break: break-all;} #linkBugBox > li {margin-left:-56px} + +.thWidth{width:100px !important;} +html[lang^='zh-'] .thWidth{width:80px !important;} diff --git a/module/bug/css/m.browse.css b/module/bug/css/m.browse.css new file mode 100644 index 0000000000..55fe95f277 --- /dev/null +++ b/module/bug/css/m.browse.css @@ -0,0 +1,2 @@ +.confirm0 {color:gray; font-size:9px} +.confirm1 {color:green; font-size:9px} diff --git a/module/bug/css/resolve.css b/module/bug/css/resolve.css index 097655b0a0..eafaa6152e 100644 --- a/module/bug/css/resolve.css +++ b/module/bug/css/resolve.css @@ -1 +1,4 @@ .chosen-container[id^="buildProject"] {max-width: 160px; border-radius: 0} + +.thWidth{width:130px !important;} +html[lang^='zh-'] .thWidth{width:100px !important;} diff --git a/module/bug/css/view.css b/module/bug/css/view.css index f426ccc058..065bf82cc4 100644 --- a/module/bug/css/view.css +++ b/module/bug/css/view.css @@ -3,3 +3,8 @@ .table-data tr > td{word-break: break-all; word-wrap: break-word;} .side-col .cell{padding:0px;} .tab-pane table {border: 1px solid #ddd; border-top: none;} + +#legendBasicInfo .thWidth{width:110px !important;} +#legendLife .thWidth{width:100px !important;} +html[lang^='zh-'] #legendBasicInfo .thWidth{width:70px !important;} +html[lang^='zh-'] #legendLife .thWidth{width:90px !important;} diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index f4e9e45967..0bbaf8cf4e 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -212,8 +212,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
admin->safe->password?>admin->safe->password?> admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?> admin->safe->noticeMode?>
backup->time?> backup->files?> backup->size?>actions?>actions?>
- - + @@ -266,8 +265,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
bug->openedBy;?>bug->openedBy;?> openedBy];?>
- - + diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php index 8060c52013..d7ea3129ff 100644 --- a/module/bug/view/resolve.html.php +++ b/module/bug/view/resolve.html.php @@ -32,8 +32,7 @@ js::set('productID' , $bug->product);
bug->linkBug;?>bug->linkBug;?> createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");?>
- - + diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 19947e2522..a4326a40e8 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -102,11 +102,10 @@
-
bug->resolution;?>bug->resolution;?> bug->resolutionList, '', "class='form-control chosen' onchange=setDuplicate(this.value)");?>
- + session->currentProductType != 'normal'):?> @@ -271,11 +270,10 @@
-
bug->product;?>bug->product;?> product", $productName)) echo $productName;?>
- + diff --git a/module/company/css/edit.css b/module/company/css/edit.css new file mode 100644 index 0000000000..be70b5a9c2 --- /dev/null +++ b/module/company/css/edit.css @@ -0,0 +1,2 @@ +.thWidth{width:120px !important;} +html[lang^='zh-'] .thWidth{width:80px !important;} diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php index 2fb95bba20..2acb543854 100644 --- a/module/company/view/edit.html.php +++ b/module/company/view/edit.html.php @@ -23,8 +23,7 @@
bug->openedBy;?>bug->openedBy;?> openedBy) . $lang->at . $bug->openedDate;?>
- - + diff --git a/module/custom/css/required.css b/module/custom/css/required.css new file mode 100644 index 0000000000..9c5f944bf1 --- /dev/null +++ b/module/custom/css/required.css @@ -0,0 +1,2 @@ +.thWidth{width:250px !important;} +html[lang^='zh-'] .thWidth{width:120px !important;} diff --git a/module/custom/css/set.css b/module/custom/css/set.css new file mode 100644 index 0000000000..b7f3c09196 --- /dev/null +++ b/module/custom/css/set.css @@ -0,0 +1,2 @@ +.thWidth{width:140px !important;} +html[lang^='zh-'] .thWidth{width:80px !important;} diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php index 8c4ecb30c1..afb2d00e8e 100644 --- a/module/custom/view/required.html.php +++ b/module/custom/view/required.html.php @@ -33,11 +33,10 @@
company->name;?>company->name;?> name, "class='form-control'");?>
- $requiredField):?> -
+ custom->getFormFields($moduleName, $method); diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 686963ac20..55fc05dd45 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -54,8 +54,7 @@ EOT; - - + diff --git a/module/dept/css/edit.css b/module/dept/css/edit.css new file mode 100644 index 0000000000..ebe41c894d --- /dev/null +++ b/module/dept/css/edit.css @@ -0,0 +1,2 @@ +.thWidth{width:130px !important;} +html[lang^='zh-'] .thWidth{width:80px !important;} diff --git a/module/dept/view/edit.html.php b/module/dept/view/edit.html.php index 47336fe9fa..e4cced4e84 100644 --- a/module/dept/view/edit.html.php +++ b/module/dept/view/edit.html.php @@ -23,8 +23,7 @@ $jsRoot = $webRoot . "js/";
custom->storyReview;?>custom->storyReview;?> custom->reviewList, $needReview);?>
- - + diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index a7d7b2b229..c82b07f179 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -6,3 +6,6 @@ #mainMenu #groupName{line-height:33px; float: left} .checkbox-right{padding-left:0px !important;} + +.thWidth{width:180px !important;} +html[lang^='zh-'] .thWidth{width:150px !important;} diff --git a/module/group/css/manageview.css b/module/group/css/manageview.css index acb6d7c648..6f91b77ee0 100644 --- a/module/group/css/manageview.css +++ b/module/group/css/manageview.css @@ -4,3 +4,6 @@ .checkbox-primary>label{padding-left:20px;} .pl-0px {padding-left:0px !important;} .pt-0px {padding-top:0px !important;} + +.thWidth{width:130px !important;} +html[lang^='zh-'] .thWidth{width:100px !important;} diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index 99bf7c52bf..0e91de35dc 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -21,8 +21,7 @@
dept->parent;?>dept->parent;?> parent, "class='form-control chosen'");?>
- - + '> - - +
group->viewList;?>group->viewList;?> menu as $menuKey => $menu):?> diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 237a6bca79..e4a505a011 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -26,8 +26,7 @@
my->common;?>my->common;?>
/> @@ -73,8 +72,7 @@ - - + @@ -98,8 +96,7 @@ } ?> '> - -
group->module;?>group->module;?> group->method;?>
+
diff --git a/module/my/css/changepassword.css b/module/my/css/changepassword.css new file mode 100644 index 0000000000..142e74674d --- /dev/null +++ b/module/my/css/changepassword.css @@ -0,0 +1,2 @@ +.thWidth{width:130px !important;} +html[lang^='zh-'] .thWidth{width:100px !important;} diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php index 77c77b9399..610357e045 100755 --- a/module/my/view/changepassword.html.php +++ b/module/my/view/changepassword.html.php @@ -22,9 +22,8 @@
- - + diff --git a/module/project/css/all.css b/module/project/css/all.css index f0b971a934..827c53d254 100644 --- a/module/project/css/all.css +++ b/module/project/css/all.css @@ -1 +1,4 @@ #product_chosen .chosen-single{width:180px;} + +.thWidth{width:130px !important;} +html[lang^='zh-'] .thWidth{width:100px !important;} diff --git a/module/project/css/burn.css b/module/project/css/burn.css index d8058b0c4c..b3f814d982 100644 --- a/module/project/css/burn.css +++ b/module/project/css/burn.css @@ -6,3 +6,5 @@ #burnLegend > div > .barline {position: absolute; width: 20px; left: 0; top: 13px; height: 3px; background: #EEEEEE;} #burnLegend .line-real .bg-primary{background: #1183fb} +.thWidth{width:150px !important;} +html[lang^='zh-'] .thWidth{width:120px !important;} diff --git a/module/project/css/treestory.css b/module/project/css/treestory.css new file mode 100644 index 0000000000..168c123dd1 --- /dev/null +++ b/module/project/css/treestory.css @@ -0,0 +1,2 @@ +.thWidth{width:120px !important;} +html[lang^='zh-'] .thWidth{width:100px !important;} diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php index 90cc700c77..ff9fb8d19c 100644 --- a/module/project/view/all.html.php +++ b/module/project/view/all.html.php @@ -40,8 +40,7 @@ - - + diff --git a/module/project/view/burn.html.php b/module/project/view/burn.html.php index e4fc832057..85f03192bb 100644 --- a/module/project/view/burn.html.php +++ b/module/project/view/burn.html.php @@ -27,7 +27,7 @@ echo $lang->project->howToUpdateBurn; ?> -
+
diff --git a/module/project/view/treestory.html.php b/module/project/view/treestory.html.php index 0503422a71..6e6f6075c6 100644 --- a/module/project/view/treestory.html.php +++ b/module/project/view/treestory.html.php @@ -196,11 +196,10 @@
user->account;?>user->account;?> account . html::hidden('account',$user->account);?>
project->name);?> project->code);?>project->PM);?>project->PM);?> project->end);?> project->status);?> project->totalEstimate;?>
- global->flow != 'onlyStory'):?> - + - + '; /* Print field. */ - echo "'; + echo "'; /* Print operator. */ - echo "'; + echo "'; /* Print value. */ echo "'; /* Print field. */ - echo "'; + echo "'; /* Print operator. */ - echo "'; + echo "'; /* Print value. */ echo "
>story->legendFromBug;?>story->legendFromBug;?>
    id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id"), "#$fromBug->id $fromBug->title") . '';?> @@ -209,7 +208,7 @@
>story->legendBugs;?>story->legendBugs;?> noData;?> diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index 9b09f5e407..c75c71fa43 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -15,8 +15,6 @@ $jsRoot = $this->app->getWebRoot() . "js/"; include '../../common/view/datepicker.html.php'; include '../../common/view/chosen.html.php'; $formId = 'searchForm-' . uniqid(''); -$fieldWidth = common::checkNotCN() ? 'w-130px' : 'w-110px'; -$operatorWidth = common::checkNotCN() ? 'w-110px' : 'w-90px'; ?>
@@ -113,10 +116,10 @@ foreach($fieldParams as $fieldName => $param) echo '
" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '"; @@ -173,10 +176,10 @@ foreach($fieldParams as $fieldName => $param) echo '" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '"; diff --git a/module/story/css/close.css b/module/story/css/close.css new file mode 100644 index 0000000000..feca0918c6 --- /dev/null +++ b/module/story/css/close.css @@ -0,0 +1,2 @@ +.thWidth{width:150px !important;} +html[lang^='zh-'] .thWidth{width:80px !important;} diff --git a/module/story/css/edit.css b/module/story/css/edit.css index 325971cb2f..448a1e0e70 100644 --- a/module/story/css/edit.css +++ b/module/story/css/edit.css @@ -1 +1,6 @@ #product_chosen .chosen-single{border-right-width:1px} + +.thWidth{width:100px !important;} +.linkThWidth{width:110px !important;} +html[lang^='zh-'] .thWidth{width:80px !important;} +html[lang^='zh-'] .linkThWidth{width:70px !important;} diff --git a/module/story/css/review.css b/module/story/css/review.css new file mode 100644 index 0000000000..ccda3106fd --- /dev/null +++ b/module/story/css/review.css @@ -0,0 +1,2 @@ +.thWidth{width:110px !important;} +html[lang^='zh-'] .thWidth{width:80px !important;} diff --git a/module/story/css/view.css b/module/story/css/view.css index 09f389c1f7..4ec3f19163 100644 --- a/module/story/css/view.css +++ b/module/story/css/view.css @@ -1,3 +1,8 @@ .side-col .cell{padding:0px;} .side-col #legendProjectAndTask .list-unstyled{padding:10px; border-top:0px; margin:0px;} .col-4 .cell .tab-content .text-top{padding-top: 1px} + +#legendLifeTime .thWidth{width:100px !important;} +#legendRelated .thWidth{width:110px !important;} +html[lang^='zh-'] #legendLifeTime .thWidth{width:70px !important;} +html[lang^='zh-'] #legendRelated .thWidth{width:70px !important;} diff --git a/module/story/css/zerocase.css b/module/story/css/zerocase.css new file mode 100644 index 0000000000..75f34ad64a --- /dev/null +++ b/module/story/css/zerocase.css @@ -0,0 +1,2 @@ +.thWidth{width:120px !important;} +html[lang^='zh-'] .thWidth{width:90px !important;} diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php index 47ebf5aa59..3208de9fc9 100644 --- a/module/story/view/close.html.php +++ b/module/story/view/close.html.php @@ -25,8 +25,7 @@ - - + diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 019515db8b..96473dcb3a 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -67,8 +67,7 @@
story->legendBasicInfo;?>
story->closedReason;?>story->closedReason;?> story->reasonList, '', 'class="form-control" onchange="setStory(this.value)"');?>
- - + - - + diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php index c86198a4bd..7e548c22f8 100644 --- a/module/story/view/review.html.php +++ b/module/story/view/review.html.php @@ -27,8 +27,7 @@ var assignedTo = 'lastEditedBy ? print($story->lastEditedBy) : pri
story->product;?>story->product;?>
product, "onchange='loadProduct(this.value);' class='form-control chosen control-product'");?> @@ -210,8 +209,7 @@
>story->linkStories;?>story->linkStories;?> createLink('story', 'linkStory', "storyID=$story->id&type=linkStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?>
- - + diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index b2e5f9fbb6..06ca7f37a0 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -232,11 +232,10 @@
story->reviewedDate;?>story->reviewedDate;?>
- - + @@ -314,13 +313,12 @@
-
story->openedBy;?>story->openedBy;?> openedBy] . $lang->at . $story->openedDate;?>
global->flow != 'onlyStory'):?> - + - + - + - - + diff --git a/module/task/css/activate.css b/module/task/css/activate.css new file mode 100644 index 0000000000..40079b4d82 --- /dev/null +++ b/module/task/css/activate.css @@ -0,0 +1,2 @@ +.thWidth{width:90px !important;} +html[lang^='zh-'] .thWidth{width:70px !important;} diff --git a/module/task/css/edit.css b/module/task/css/edit.css index e69de29bb2..ad2424880d 100644 --- a/module/task/css/edit.css +++ b/module/task/css/edit.css @@ -0,0 +1,4 @@ +.thWidth{width:85px !important;} +.lifeThWidth{width:120px !important;} +html[lang^='zh-'] .thWidth{width:70px !important;} +html[lang^='zh-'] .lifeThWidth{width:70px !important;} diff --git a/module/task/css/finish.css b/module/task/css/finish.css new file mode 100644 index 0000000000..168c123dd1 --- /dev/null +++ b/module/task/css/finish.css @@ -0,0 +1,2 @@ +.thWidth{width:120px !important;} +html[lang^='zh-'] .thWidth{width:100px !important;} diff --git a/module/task/css/recordestimate.css b/module/task/css/recordestimate.css index e9786a1ccf..29f1fdaf3b 100644 --- a/module/task/css/recordestimate.css +++ b/module/task/css/recordestimate.css @@ -1 +1,4 @@ .form-condensed .table-form {margin-bottom: 20px;} + +.thWidth{width:90px !important;} +html[lang^='zh-'] .thWidth{width:70px !important;} diff --git a/module/task/css/view.css b/module/task/css/view.css index 477b3695b5..1c67a36b94 100644 --- a/module/task/css/view.css +++ b/module/task/css/view.css @@ -1,3 +1,8 @@ .side-col .cell{padding:0px;} .side-col #legendProjectAndTask .list-unstyled{padding:10px; border:1px solid #ddd; border-top:0px; margin:0px;} .tab-pane table {border: 1px solid #ddd; border-top: none;} + +#legendLife .thWidth{width:100px !important;} +.effortThWidth{width:90px !important;} +html[lang^='zh-'] #legendLife .thWidth{width:70px !important;} +html[lang^='zh-'] .effortThWidth{width:70px !important;} diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php index 53c5018c63..2732fada2f 100644 --- a/module/task/view/activate.html.php +++ b/module/task/view/activate.html.php @@ -27,8 +27,7 @@
story->legendFromBug;?>story->legendFromBug;?>
    id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id", '', true), "#$fromBug->id $fromBug->title", '', "class='iframe' data-width='80%'") . '';?> @@ -329,7 +327,7 @@
story->legendBugs;?>story->legendBugs;?>
story->legendLinkStories;?>story->legendLinkStories;?>
    priAB);?>
story->title);?> story->planAB);?>story->source);?>story->source);?> openedByAB);?> assignedToAB);?> story->estimateAB);?>
- - + diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index ef15ce34d9..9e4ab2682d 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -20,7 +20,6 @@ task->confirmChangeProject);?> team) < 6 ? 6 - count($task->team) : 1);?> -
@@ -91,12 +90,12 @@
task->assignedTo;?>task->assignedTo;?> finishedBy, "class='form-control chosen'");?>
parent <= 0):?> - + - + global->flow != 'onlyTask' and $project->type != 'ops'):?> @@ -148,7 +147,7 @@
task->legendEffort;?>
>task->project;?>task->project;?> project, 'class="form-control chosen" onchange="loadAll(this.value)"');?>
>task->module;?>task->module;?> module, 'class="form-control chosen" onchange="loadModuleRelated()"');?>
- + @@ -177,10 +176,9 @@
task->legendLife;?>
-
>task->estStarted;?>task->estStarted;?> estStarted, "class='form-control form-date'");?>
- + diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php index fb3fa41dd9..1489dc40f0 100644 --- a/module/task/view/finish.html.php +++ b/module/task/view/finish.html.php @@ -35,14 +35,13 @@
>task->openedBy;?>task->openedBy;?> openedBy];?>
- - + team)):?> - + diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php index 6b15993338..dbd7c39879 100644 --- a/module/task/view/recordestimate.html.php +++ b/module/task/view/recordestimate.html.php @@ -24,7 +24,6 @@ team);?> assignedTo != end($team)) ? $lang->task->confirmTransfer : $lang->task->confirmRecord);?> task->noticeSaveRecord);?> -
@@ -42,8 +41,8 @@
- - + + diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 2752ed13d9..d30c456c50 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -288,10 +288,9 @@
team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?>team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?> consumed;?> workingHour;?>
task->hasConsumed;?>task->hasConsumed;?> myConsumed;?> workingHour;?>
idAB;?> task->date;?>task->consumed;?>task->left;?>task->consumed;?>task->left;?> comment;?> team) or $task->assignedTo == $this->app->user->account) echo $lang->actions;?>
- - + @@ -344,9 +343,8 @@ task->legendEffort;?>
task->openedBy;?>task->openedBy;?> openedBy ? zget($users, $task->openedBy, $task->openedBy) . $lang->at . $task->openedDate : $lang->noData;?>
- - + diff --git a/module/testcase/css/view.css b/module/testcase/css/view.css index 8c667e34d5..097ea7a91e 100644 --- a/module/testcase/css/view.css +++ b/module/testcase/css/view.css @@ -4,3 +4,8 @@ .outer .col-side .side-handle{right:0px;top:10px;} .outer.hide-side .main-side{display:none;} .table-fixed td{white-space: unset;} + +.thWidth{width:90px !important;} +.lifeThWidth{width:100px !important;} +html[lang^='zh-'] .thWidth{width:60px !important;} +html[lang^='zh-'] .lifeThWidth{width:60px !important;} diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index ba8e3eb8f7..9f08d6d554 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -132,16 +132,15 @@
testcase->legendBasicInfo;?>
-
task->estimate;?>task->estimate;?> estimate . $lang->workingHour;?>
- + - + session->currentProductType != 'normal'):?> @@ -276,17 +275,16 @@
testcase->legendLinkBugs;?>
-
testcase->lib;?>testcase->lib;?> lib", $libName)) echo $libName;?>
testcase->product;?>testcase->product;?> product", $productName)) echo $productName;?>
fromBug):?> - + toBugs):?> - +
testcase->fromBug;?>testcase->fromBug;?> createLink('bug', 'view', "bugID=$case->fromBug", '', true), $case->fromBugTitle, '', "class='iframe' data-width='80%'");?>
testcase->toBug;?>testcase->toBug;?> toBugs as $bugID => $bugTitle) @@ -306,10 +304,9 @@
testcase->legendOpenAndEdit;?>
- - + testcase->needReview or !empty($config->testcase->forceReview)):?> diff --git a/module/todo/css/create.css b/module/todo/css/create.css index 2a9a6facd0..79bfeb460a 100644 --- a/module/todo/css/create.css +++ b/module/todo/css/create.css @@ -3,3 +3,8 @@ #end_chosen .chosen-single{border-left: none;} .cycleConfig .checkbox-primary{float:left; width:100px;} .cycleConfig .tab-pane{padding:8px 0px;} + +.thWidth{width:110px !important;} +.inputGroupWidth{width:270px !important;} +html[lang^='zh-'] .thWidth{width:80px !important;} +html[lang^='zh-'] .inputGroupWidth{width:200px !important;} diff --git a/module/todo/css/view.css b/module/todo/css/view.css index b978984d1f..3b85559125 100644 --- a/module/todo/css/view.css +++ b/module/todo/css/view.css @@ -1,2 +1,5 @@ #projectModal .modal-dialog, #productModal .modal-dialog {top: auto!important; bottom: 90px;} .body-modal #projectModal .modal-dialog, .body-modal #productModal .modal-dialog {top: auto!important; bottom: 55px;} + +.thWidth{width:100px !important;} +html[lang^='zh-'] .thWidth{width:80px !important;} diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php index 7e4de03a36..55ec0e8008 100644 --- a/module/todo/view/create.html.php +++ b/module/todo/view/create.html.php @@ -22,8 +22,7 @@
testcase->openedBy;?>testcase->openedBy;?> openedBy] . $lang->at . $case->openedDate;?>
- - + diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index d9eb3bbcb6..4685a6e576 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -93,8 +93,7 @@
todo->date;?>todo->date;?>
@@ -76,7 +75,7 @@
-
; padding-top:5px;'> +
todo->beforeDays, html::input('config[beforeDays]', 0, "class='form-control'"));?>
- - + @@ -137,12 +136,11 @@
todo->pri;?>todo->pri;?> pri;?>' title='todo->priList, $todo->pri, $todo->pri);?>'>todo->priList, $todo->pri)?>
- - + - + - + diff --git a/module/translate/view/index.html.php b/module/translate/view/index.html.php index 7aaf8ec116..7d7be61387 100644 --- a/module/translate/view/index.html.php +++ b/module/translate/view/index.html.php @@ -48,7 +48,7 @@ -
todo->beginAndEnd?>todo->beginAndEnd?> config->begin . " ~ " . $todo->config->end;?>
todo->cycleConfig?>todo->cycleConfig?> config->type == 'day') diff --git a/module/translate/css/choosemodule.css b/module/translate/css/choosemodule.css new file mode 100644 index 0000000000..fec930329c --- /dev/null +++ b/module/translate/css/choosemodule.css @@ -0,0 +1,2 @@ +.thWidth{width:150px !important;} +html[lang^='zh-'] .thWidth{width:110px !important;} diff --git a/module/translate/css/index.css b/module/translate/css/index.css index 36d02bab5f..4724f3d925 100644 --- a/module/translate/css/index.css +++ b/module/translate/css/index.css @@ -14,3 +14,6 @@ #finishedLangs .item{height:30px;} #finishedLangs .item h4{margin:0; height:100%; line-height:30px;} #finishedLangs .item .pull-right{color:#999; line-height:30px;} + +.thWidth{width:130px !important;} +html[lang^='zh-'] .thWidth{width:95px !important;} diff --git a/module/translate/view/choosemodule.html.php b/module/translate/view/choosemodule.html.php index 1001866d7a..234f21c9eb 100644 --- a/module/translate/view/choosemodule.html.php +++ b/module/translate/view/choosemodule.html.php @@ -33,7 +33,7 @@ translate->needReview):?> translate->reviewedProgress;?> '>actions;?>actions;?>
name;?> translate->progress, ($data->progress * 100) . '%');?>'> + translate->common, '', "class='btn btn-sm $disabled'"); echo html::a(inlink('export', "language=$langKey"), $lang->export, '', "class='btn btn-sm iframe $disabled'"); diff --git a/module/tree/css/edit.css b/module/tree/css/edit.css index 0037a851da..5fffac811f 100644 --- a/module/tree/css/edit.css +++ b/module/tree/css/edit.css @@ -1 +1,4 @@ body{background:white; overflow:none} + +.thWidth{width:120px !important;} +html[lang^='zh-'] .thWidth{width:80px !important;} diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index 5b489ad577..20c8db2bc7 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -23,33 +23,32 @@ js::set('type', $type);