diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index 8b6345bc3e..6e73149f0a 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -73,12 +73,12 @@ id", $project, 'list', 'edit');?> - id", $project, 'list', 'persons');?> + id", $project, 'list', 'group');?> id", $project, 'list', 'lock');?>
- + diff --git a/module/program/config.php b/module/program/config.php index 9618b4f534..886fccd00f 100644 --- a/module/program/config.php +++ b/module/program/config.php @@ -39,7 +39,7 @@ $config->program->sortFields->PRJBudget = 'budget'; global $lang; $config->program->datatable = new stdclass(); -$config->program->datatable->defaultField = array('idAB', 'PRJName', 'PRJPGM', 'PM', 'begin', 'end', 'PRJStatus', 'PRJBudget', 'teamCount','PRJEstimate','PRJConsume', 'PRJProgress', 'actions'); +$config->program->datatable->defaultField = array('idAB', 'PRJName', 'PRJPGM', 'PM', 'begin', 'end', 'PRJBudget', 'teamCount','PRJEstimate','PRJConsume', 'PRJProgress', 'actions'); $config->program->datatable->fieldList['idAB']['title'] = 'idAB'; $config->program->datatable->fieldList['idAB']['fixed'] = 'left'; @@ -54,67 +54,56 @@ $config->program->datatable->fieldList['PRJName']['sort'] = 'no'; $config->program->datatable->fieldList['PRJPGM']['title'] = 'PRJPGM'; $config->program->datatable->fieldList['PRJPGM']['fixed'] = 'left'; -$config->program->datatable->fieldList['PRJPGM']['width'] = '200'; +$config->program->datatable->fieldList['PRJPGM']['width'] = '140'; $config->program->datatable->fieldList['PRJPGM']['required'] = 'no'; $config->program->datatable->fieldList['PRJPGM']['sort'] = 'no'; $config->program->datatable->fieldList['PM']['title'] = 'PM'; $config->program->datatable->fieldList['PM']['fixed'] = 'no'; -$config->program->datatable->fieldList['PM']['width'] = '100'; +$config->program->datatable->fieldList['PM']['width'] = '80'; $config->program->datatable->fieldList['PM']['required'] = 'yes'; $config->program->datatable->fieldList['PM']['sort'] = 'no'; $config->program->datatable->fieldList['begin']['title'] = 'begin'; $config->program->datatable->fieldList['begin']['fixed'] = 'no'; -$config->program->datatable->fieldList['begin']['width'] = '120'; +$config->program->datatable->fieldList['begin']['width'] = '100'; $config->program->datatable->fieldList['begin']['required'] = 'no'; $config->program->datatable->fieldList['end']['title'] = 'end'; $config->program->datatable->fieldList['end']['fixed'] = 'no'; -$config->program->datatable->fieldList['end']['width'] = '120'; +$config->program->datatable->fieldList['end']['width'] = '100'; $config->program->datatable->fieldList['end']['required'] = 'no'; -$config->program->datatable->fieldList['PRJStatus']['title'] = 'PRJStatus'; -$config->program->datatable->fieldList['PRJStatus']['fixed'] = 'no'; -$config->program->datatable->fieldList['PRJStatus']['width'] = '80'; -$config->program->datatable->fieldList['PRJStatus']['required'] = 'yes'; - $config->program->datatable->fieldList['PRJBudget']['title'] = 'PRJBudget'; $config->program->datatable->fieldList['PRJBudget']['fixed'] = 'no'; -$config->program->datatable->fieldList['PRJBudget']['width'] = '100'; +$config->program->datatable->fieldList['PRJBudget']['width'] = '80'; $config->program->datatable->fieldList['PRJBudget']['required'] = 'yes'; $config->program->datatable->fieldList['teamCount']['title'] = 'teamCount'; $config->program->datatable->fieldList['teamCount']['fixed'] = 'no'; -$config->program->datatable->fieldList['teamCount']['width'] = '80'; +$config->program->datatable->fieldList['teamCount']['width'] = '60'; $config->program->datatable->fieldList['teamCount']['required'] = 'no'; $config->program->datatable->fieldList['teamCount']['sort'] = 'no'; $config->program->datatable->fieldList['PRJEstimate']['title'] = 'PRJEstimate'; $config->program->datatable->fieldList['PRJEstimate']['fixed'] = 'no'; -$config->program->datatable->fieldList['PRJEstimate']['width'] = '60'; +$config->program->datatable->fieldList['PRJEstimate']['width'] = '50'; $config->program->datatable->fieldList['PRJEstimate']['required'] = 'no'; $config->program->datatable->fieldList['PRJEstimate']['sort'] = 'no'; $config->program->datatable->fieldList['PRJConsume']['title'] = 'PRJConsume'; $config->program->datatable->fieldList['PRJConsume']['fixed'] = 'no'; -$config->program->datatable->fieldList['PRJConsume']['width'] = '60'; +$config->program->datatable->fieldList['PRJConsume']['width'] = '50'; $config->program->datatable->fieldList['PRJConsume']['required'] = 'no'; $config->program->datatable->fieldList['PRJConsume']['sort'] = 'no'; $config->program->datatable->fieldList['PRJProgress']['title'] = 'PRJProgress'; $config->program->datatable->fieldList['PRJProgress']['fixed'] = 'right'; -$config->program->datatable->fieldList['PRJProgress']['width'] = '80'; +$config->program->datatable->fieldList['PRJProgress']['width'] = '60'; $config->program->datatable->fieldList['PRJProgress']['required'] = 'no'; $config->program->datatable->fieldList['PRJProgress']['sort'] = 'no'; -$config->program->datatable->fieldList['PRJSurplus']['title'] = 'PRJSurplus'; -$config->program->datatable->fieldList['PRJSurplus']['fixed'] = 'no'; -$config->program->datatable->fieldList['PRJSurplus']['width'] = '80'; -$config->program->datatable->fieldList['PRJSurplus']['required'] = 'no'; -$config->program->datatable->fieldList['PRJSurplus']['sort'] = 'no'; - $config->program->datatable->fieldList['actions']['title'] = 'actions'; $config->program->datatable->fieldList['actions']['fixed'] = 'right'; -$config->program->datatable->fieldList['actions']['width'] = '180'; +$config->program->datatable->fieldList['actions']['width'] = '170'; $config->program->datatable->fieldList['actions']['required'] = 'yes'; diff --git a/module/program/model.php b/module/program/model.php index e9e0f629bc..a1295eff85 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1609,7 +1609,7 @@ class programModel extends model $title = "title='{$PRJPGM}'"; } - echo ""; + echo ""; switch($id) { case 'idAB': @@ -1660,7 +1660,7 @@ class programModel extends model if($project->status == 'closed') common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'list', 'magic', '', 'iframe', true); echo "
"; - echo ""; + echo ""; echo "
"; common::printIcon('program', 'PRJEdit', "projectID=$project->id", $project, 'list', 'edit'); - common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'list', 'persons'); + common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'list', 'group'); common::printIcon('program', 'PRJGroup', "projectID=$project->id&programID=$programID", $project, 'list', 'lock'); echo "
"; - echo ""; + echo ""; echo ""; diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php index cb8307143c..3e94bab8f4 100644 --- a/module/program/view/pgmbrowsebylist.html.php +++ b/module/program/view/pgmbrowsebylist.html.php @@ -62,7 +62,7 @@ status == 'doing') common::printIcon('program', 'PGMClose', "programID=$program->id", $program, 'list', 'off', '', 'iframe', true);?> status == 'closed') common::printIcon('program', 'PGMActivate', "programID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
- +
recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; + $vars = "programID=$programID&browseType=$browseType¶m=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; $setting = $this->datatable->getSetting('program'); - $widths = $this->datatable->setFixedFieldWidth($setting); ?> - ' data-fixed-right-width=''> +
- -
- - -