diff --git a/module/block/view/printassigntomeblock.html.php b/module/block/view/printassigntomeblock.html.php index fa81e17117..b9340e1ce1 100644 --- a/module/block/view/printassigntomeblock.html.php +++ b/module/block/view/printassigntomeblock.html.php @@ -99,6 +99,8 @@ function changeMoreBtn(type, label) var $moreBtn = $('#assigntomeBlock .moreBtn'); var text = $(label).html(); + + text += ''; $moreBtn.html(text); setTimeout(function() diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php index 38b6f48b2e..570bf72994 100644 --- a/module/execution/view/build.html.php +++ b/module/execution/view/build.html.php @@ -69,7 +69,7 @@ branchName;?> - createLink('build', 'view', "build=$build->id"), $build->name);?> + createLink('build', 'view', "build=$build->id"), $build->name);?> scmPath) diff --git a/module/project/config.php b/module/project/config.php index 08db7cf498..001a56d294 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -125,14 +125,14 @@ $config->project->datatable->fieldList['consume']['pri'] = '7'; $config->project->datatable->fieldList['progress']['title'] = 'progress'; $config->project->datatable->fieldList['progress']['fixed'] = 'no'; -$config->project->datatable->fieldList['progress']['width'] = '60'; +$config->project->datatable->fieldList['progress']['width'] = '65'; $config->project->datatable->fieldList['progress']['required'] = 'no'; $config->project->datatable->fieldList['progress']['sort'] = 'no'; $config->project->datatable->fieldList['progress']['pri'] = '6'; $config->project->datatable->fieldList['actions']['title'] = 'actions'; $config->project->datatable->fieldList['actions']['fixed'] = 'right'; -$config->project->datatable->fieldList['actions']['width'] = '180'; +$config->project->datatable->fieldList['actions']['width'] = '165'; $config->project->datatable->fieldList['actions']['required'] = 'yes'; $config->project->datatable->fieldList['actions']['pri'] = '1'; diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php index f16668565b..cc5b0eb611 100644 --- a/module/project/view/manageproducts.html.php +++ b/module/project/view/manageproducts.html.php @@ -11,6 +11,9 @@ */ ?> + + + diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index aabf2af686..76a05f2302 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -12,6 +12,9 @@ ?> + + +
@@ -195,7 +198,7 @@
- +
model == 'waterfall' ? $this->project->getWaterfallProgress($project->id) : (($workhour->totalConsumed + $workhour->totalLeft) ? floor($workhour->totalConsumed / ($workhour->totalConsumed + $workhour->totalLeft) * 1000) / 1000 * 100 : 0);?>