diff --git a/module/execution/config.php b/module/execution/config.php index c2514fd6d8..2e46428e5b 100644 --- a/module/execution/config.php +++ b/module/execution/config.php @@ -153,7 +153,7 @@ $config->execution->datatable->fieldList['name']['required'] = 'yes'; $config->execution->datatable->fieldList['code']['title'] = 'code'; $config->execution->datatable->fieldList['code']['fixed'] = 'no'; -$config->execution->datatable->fieldList['code']['width'] = '90'; +$config->execution->datatable->fieldList['code']['width'] = '95'; $config->execution->datatable->fieldList['code']['required'] = 'no'; $config->execution->datatable->fieldList['project']['title'] = 'project'; @@ -168,18 +168,18 @@ $config->execution->datatable->fieldList['PM']['required'] = 'no'; $config->execution->datatable->fieldList['status']['title'] = 'status'; $config->execution->datatable->fieldList['status']['fixed'] = 'no'; -$config->execution->datatable->fieldList['status']['width'] = '80'; +$config->execution->datatable->fieldList['status']['width'] = '100'; $config->execution->datatable->fieldList['status']['required'] = 'no'; $config->execution->datatable->fieldList['progress']['title'] = 'progress'; $config->execution->datatable->fieldList['progress']['fixed'] = 'no'; -$config->execution->datatable->fieldList['progress']['width'] = '40'; +$config->execution->datatable->fieldList['progress']['width'] = '70'; $config->execution->datatable->fieldList['progress']['required'] = 'no'; $config->execution->datatable->fieldList['progress']['sort'] = 'no'; $config->execution->datatable->fieldList['percent']['title'] = 'percent'; $config->execution->datatable->fieldList['percent']['fixed'] = 'no'; -$config->execution->datatable->fieldList['percent']['width'] = '80'; +$config->execution->datatable->fieldList['percent']['width'] = '85'; $config->execution->datatable->fieldList['percent']['required'] = 'no'; $config->execution->datatable->fieldList['percent']['sort'] = 'no'; @@ -196,12 +196,12 @@ $config->execution->datatable->fieldList['openedDate']['required'] = 'no'; $config->execution->datatable->fieldList['begin']['title'] = 'begin'; $config->execution->datatable->fieldList['begin']['fixed'] = 'no'; -$config->execution->datatable->fieldList['begin']['width'] = '85'; +$config->execution->datatable->fieldList['begin']['width'] = '100'; $config->execution->datatable->fieldList['begin']['required'] = 'no'; $config->execution->datatable->fieldList['end']['title'] = 'end'; $config->execution->datatable->fieldList['end']['fixed'] = 'no'; -$config->execution->datatable->fieldList['end']['width'] = '85'; +$config->execution->datatable->fieldList['end']['width'] = '90'; $config->execution->datatable->fieldList['end']['required'] = 'no'; $config->execution->datatable->fieldList['realBegan']['title'] = 'realBegan'; @@ -224,7 +224,7 @@ $config->execution->datatable->fieldList['estimate']['sort'] = 'no'; $config->execution->datatable->fieldList['consumed']['title'] = 'consumed'; $config->execution->datatable->fieldList['consumed']['fixed'] = 'no'; -$config->execution->datatable->fieldList['consumed']['width'] = '70'; +$config->execution->datatable->fieldList['consumed']['width'] = '75'; $config->execution->datatable->fieldList['consumed']['required'] = 'no'; $config->execution->datatable->fieldList['consumed']['sort'] = 'no'; diff --git a/module/execution/js/all.js b/module/execution/js/all.js index 25ba2f991c..419eafd3fb 100644 --- a/module/execution/js/all.js +++ b/module/execution/js/all.js @@ -8,7 +8,8 @@ $(function() }); var nameWidth = $('#executionsForm thead th.c-name').width(); - if(nameWidth < 150 && !useDatatable) $('#executionsForm thead th.c-name').css('width', '150px'); + if(isCNLang && nameWidth < 150 && !useDatatable) $('#executionsForm thead th.c-name').css('width', '150px'); + if(!isCNLang && nameWidth < 200 && !useDatatable) $('#executionsForm thead th.c-name').css('width', '200px'); toggleFold('#executionsForm', unfoldExecutions, projectID, 'execution'); diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 8478906dc4..5c42391338 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -26,6 +26,7 @@ $unfoldExecutions = zget($unfoldExecutions, $projectID, array()); js::set('unfoldExecutions', $unfoldExecutions); js::set('unfoldAll', $lang->execution->treeLevel['all']); js::set('foldAll', $lang->execution->treeLevel['root']); +js::set('isCNLang', !$this->loadModel('common')->checkNotCN()) ?>