diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 374a14a7ea..55502316b9 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -742,7 +742,7 @@ $lang->colorPicker = new stdclass(); $lang->colorPicker->errorTip = 'Not a valid color value'; global $config; -$lang->proVersion = "Upgrade"; +$lang->proVersion = "Upgrade"; $lang->globalLogo = ""; $lang->downNotify = "Download Desktop Notification"; $lang->downloadClient = "Download ZenTao Desktop"; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 3999f5faa0..b3dd05615e 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -742,7 +742,7 @@ $lang->colorPicker = new stdclass(); $lang->colorPicker->errorTip = 'Not a valid color value'; global $config; -$lang->proVersion = "Upgrade"; +$lang->proVersion = "Upgrade"; $lang->globalLogo = ""; $lang->downNotify = "Download Desktop Notification"; $lang->downloadClient = "Download ZenTao Desktop"; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 0b407c760b..84bee86f27 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -742,7 +742,7 @@ $lang->colorPicker = new stdclass(); $lang->colorPicker->errorTip = "Ce n'est pas une valeur de couleur valide"; global $config; -$lang->proVersion = "Upgrade"; +$lang->proVersion = "Upgrade"; $lang->globalLogo = ""; $lang->downNotify = "Télécharger la notification sur le bureau"; $lang->downloadClient = "Télécharger ZenTao Desktop"; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 588f9c86b4..ac66406122 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -742,7 +742,7 @@ $lang->colorPicker = new stdclass(); $lang->colorPicker->errorTip = 'Not a valid color value'; global $config; -$lang->proVersion = "Upgrade"; +$lang->proVersion = "Upgrade"; $lang->globalLogo = ""; $lang->downNotify = "Download Desktop Notification"; $lang->downloadClient = "Download ZenTao Desktop"; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 34c540b15f..5dd9e2da04 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -744,7 +744,7 @@ $lang->colorPicker = new stdclass(); $lang->colorPicker->errorTip = '不是有效的颜色值'; global $config; -$lang->proVersion = "升级"; +$lang->proVersion = "升级"; $lang->globalLogo = ""; $lang->downNotify = "下载桌面提醒"; $lang->downloadClient = "下载客户端"; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 783f5b5008..4fa9d0a7d5 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -1,12 +1,12 @@ * @package ZenTaoPMS - * @version $Id: zh-tw.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $ + * @version $Id: zh-cn.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ $lang->arrow = '  '; @@ -110,10 +110,12 @@ $lang->future = '未來'; $lang->year = '年'; $lang->workingHour = '工時'; -$lang->generalUR = '用需/史詩'; -$lang->generalSR = '軟需/故事'; -$lang->executionCommon = '執行'; -$lang->sprintCommon = '迭代/階段'; +$lang->generalUR = '用需/史詩'; +$lang->generalSR = '軟需/故事'; +$lang->sprintCommon = '迭代/階段'; + +$lang->execution = new stdclass(); +$lang->execution->common = '執行'; $lang->idAB = 'ID'; $lang->priAB = 'P'; @@ -128,14 +130,16 @@ $lang->common->common = '公有模組'; /* 主導航菜單。*/ $lang->mainNav = new stdclass(); $lang->mainNav->my = ' 地盤|my|index|'; -$lang->mainNav->program = ' 項目集|program|pgmbrowse|'; -$lang->mainNav->product = ' 產品|product|index|'; -$lang->mainNav->project = ' 項目|program|prjbrowse|'; -$lang->mainNav->system = ' 組織|subject|browse|'; -$lang->mainNav->admin = ' 後台|admin|index|'; +$lang->mainNav->program = ' 項目集|program|pgmproduct|'; +$lang->mainNav->product = ' 產品|product|browse|'; +$lang->mainNav->project = ' 項目|program|index|'; +$lang->mainNav->repo = ' 代碼|repo|browse|'; +$lang->mainNav->doc = ' 文檔|doc|index|'; +$lang->mainNav->system = ' 組織|subject|browse|'; +$lang->mainNav->admin = ' 後台|admin|index|'; $lang->reporting = new stdclass(); -$lang->dividerMenu = ',admin,'; +$lang->dividerMenu = ',project,doc,'; /* Program set menu. */ $lang->program = new stdclass(); @@ -172,7 +176,7 @@ $lang->product->viewMenu->roadmap = '路線圖|product|roadmap|productID=%s' $lang->product->viewMenu->dynamic = '動態|product|dynamic|productID=%s'; $lang->product->viewMenu->project = "項目|product|project|status=all&productID=%s"; $lang->product->viewMenu->doc = array('link' => '文檔|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); -$lang->product->viewMenu->set = array('link' => '設置|tree|browse|productID=%s&view=story', 'alias' => 'addwhitelist'); +$lang->product->viewMenu->set = array('link' => '設置|tree|browse|productID=%s&view=story'); $lang->product->setMenu = new stdclass(); $lang->product->setMenu->module = array('link' => '模組|tree|browse|product={PRODUCT}&view=story', 'subModule' => 'tree'); @@ -268,17 +272,31 @@ $lang->my->menu = new stdclass(); $lang->my->menu->index = '首頁|my|index'; $lang->my->menu->calendar = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); +$lang->my->menu->myWork = array('link' => '待處理|my|work|mode=task'); $lang->my->menu->myProject = array('link' => '項目|my|project|'); -$lang->my->menu->task = array('link' => '任務|my|task|', 'subModule' => 'task'); -$lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug'); -$lang->my->menu->testtask = array('link' => '測試|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase'); -$lang->my->menu->story = array('link' => "需求|my|story|", 'subModule' => 'story'); -$lang->my->menu->myExecution = "{$lang->executionCommon}|my|execution|"; +$lang->my->menu->myExecution = '執行|my|execution|type=undone'; +$lang->my->menu->contribute = array('link' => '貢獻|my|contribute|mode=task'); $lang->my->menu->dynamic = '動態|my|dynamic|'; -$lang->my->menu->profile = array('link' => '檔案|my|profile|', 'alias' => 'editprofile'); +$lang->my->menu->score = '積分|my|score|'; $lang->my->menu->contacts = '聯繫人|my|managecontacts|'; -$lang->my->dividerMenu = ',program,requirement,dynamic,'; +$lang->my->workMenu = new stdclass(); +$lang->my->workMenu->task = '任務|my|work|mode=task'; +$lang->my->workMenu->story = '需求|my|work|mode=story'; +$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; +$lang->my->workMenu->testtask = '測試|my|work|mode=testtask&type=wait'; +$lang->my->workMenu->issue = '問題|my|work|mode=issue'; +$lang->my->workMenu->risk = '風險|my|work|mode=risk'; + +$lang->my->contributeMenu = new stdclass(); +$lang->my->contributeMenu->task = '任務|my|contribute|mode=task'; +$lang->my->contributeMenu->story = '需求|my|contribute|mode=story'; +$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; +$lang->my->contributeMenu->testtask = '用例|my|contribute|mode=testtask&type=done'; +$lang->my->contributeMenu->issue = '問題|my|contribute|mode=issue'; +$lang->my->contributeMenu->risk = '風險|my|contribute|mode=risk'; + +$lang->my->dividerMenu = ',myProject,'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; @@ -297,11 +315,10 @@ $lang->scrumproduct->menu->doc = array('link' => '文檔|doc|objectLibs|type $lang->scrumproduct->menu->branch = '@branch@|branch|manage|productID=%s'; $lang->scrumproduct->menu->module = '模組|tree|browse|productID=%s&view=story'; $lang->scrumproduct->menu->view = array('link' => '概況|product|view|productID=%s', 'alias' => 'edit'); - $lang->scrumproduct->menu->requirement = array('link' => "{$lang->projectURCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->scrumproduct->menu->story = array('link' => "{$lang->projectSRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); -$lang->product->dividerMenu = ',project,doc,'; +$lang->product->dividerMenu = ',requirement,plan,project,'; $lang->story = new stdclass(); @@ -334,7 +351,7 @@ $lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s'; $lang->project->subMenu->qa->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build'); $lang->project->subMenu->qa->testtask = array('link' => '測試單|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask'); -$lang->project->dividerMenu = ',projectstory,issue,story,team,product,'; +$lang->project->dividerMenu = ',project,doc,programplan,projectbuild,story,team,product,other,'; $lang->task = new stdclass(); $lang->build = new stdclass(); @@ -614,18 +631,18 @@ $lang->navGroup->weekly = 'project'; $lang->navGroup->milestone = 'project'; $lang->navGroup->pssp = 'project'; $lang->navGroup->design = 'project'; -$lang->navGroup->repo = 'project'; $lang->navGroup->issue = 'project'; $lang->navGroup->risk = 'project'; $lang->navGroup->auditplan = 'project'; $lang->navGroup->cm = 'project'; $lang->navGroup->nc = 'project'; -$lang->navGroup->job = 'project'; -$lang->navGroup->jenkins = 'project'; -$lang->navGroup->compile = 'project'; $lang->navGroup->build = 'project'; $lang->navGroup->projectrelease = 'project'; $lang->navGroup->projectbuild = 'project'; +$lang->navGroup->repo = 'project'; +$lang->navGroup->job = 'project'; +$lang->navGroup->jenkins = 'project'; +$lang->navGroup->compile = 'project'; $lang->navGroup->durationestimation = 'project'; @@ -724,7 +741,9 @@ $lang->pager->pageOfTotal = '第 {page}/{totalPage}colorPicker = new stdclass(); $lang->colorPicker->errorTip = '不是有效的顏色值'; -$lang->proVersion = "專業版   "; +global $config; +$lang->proVersion = "升級"; +$lang->globalLogo = ""; $lang->downNotify = "下載桌面提醒"; $lang->downloadClient = "下載客戶端"; $lang->clientHelp = "客戶端使用說明"; @@ -784,7 +803,7 @@ $lang->datepicker->monthNames = array('一月', '二月', '三月', '四月', /* Common action icons 通用動作表徵圖 */ $lang->icons['todo'] = 'check'; -$lang->icons['product'] = 'cube'; +$lang->icons['product'] = 'product'; $lang->icons['bug'] = 'bug'; $lang->icons['task'] = 'check-sign'; $lang->icons['tasks'] = 'tasks'; @@ -859,43 +878,53 @@ $lang->icons['score'] = 'tint'; /* Scrum menu. */ $lang->menu = new stdclass(); $lang->menu->scrum = new stdclass(); -$lang->menu->scrum->program = '儀表盤|program|index|'; +$lang->menu->scrum->programindex = '儀表盤|program|index|project={PROJECT}'; $lang->menu->scrum->project = "$lang->executionCommon|project|index|locate=no"; $lang->menu->scrum->projectstory = array('link' => '需求|projectstory|requirement', 'alias' => 'requirement,story,track'); $lang->menu->scrum->doc = '文檔|doc|index|'; $lang->menu->scrum->qa = '測試|qa|index'; +$lang->menu->scrum->ci = '代碼|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}'); $lang->menu->scrum->projectrelease = array('link' => '發佈|projectrelease|browse'); -$lang->menu->scrum->stakeholder = '干係人|stakeholder|browse'; -$lang->menu->scrum->morelink = array('link' => '更多|project|morelink', 'class' => 'dropdown dropdown-hover waterfall-list'); +$lang->menu->scrum->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); +$lang->menu->scrum->projectsetting = array('link' => '設置|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list'); $lang->scrum = new stdclass(); $lang->scrum->subMenu = new stdclass(); -$lang->scrum->subMenu->morelink = new stdclass(); -$lang->scrum->subMenu->morelink->program = '項目|program|PRJEdit|'; +$lang->scrum->subMenu->other = new stdclass(); +$lang->scrum->subMenu->other->issue = array('link' => '問題|issue|browse|', 'subModule' => 'issue'); +$lang->scrum->subMenu->other->risk = array('link' => '風險|risk|browse|', 'subModule' => 'risk'); +$lang->scrum->subMenu->other->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder'); + +$lang->scrum->subMenu->projectsetting = new stdclass(); +$lang->scrum->subMenu->projectsetting->program = '項目|program|PRJEdit|'; /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); $lang->menu->waterfall->programindex = array('link' => '儀表盤|program|index|project={PROJECT}'); $lang->menu->waterfall->programplan = array('link' => '計劃|programplan|browse|project={PROJECT}', 'subModule' => 'programplan'); $lang->menu->waterfall->project = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,'); -$lang->menu->waterfall->weekly = array('link' => '報告|weekly|index|project={PROJECT}', 'subModule' => ',milestone,'); $lang->menu->waterfall->doc = array('link' => '文檔|doc|index|project={PROJECT}'); +$lang->menu->waterfall->weekly = array('link' => '報告|weekly|index|project={PROJECT}', 'subModule' => ',milestone,'); $lang->menu->waterfall->projectstory = array('link' => '需求|projectstory|requirement', 'alias' => 'requirement,story,track'); $lang->menu->waterfall->design = '設計|design|browse|product={PRODUCT}'; $lang->menu->waterfall->ci = '代碼|repo|browse|'; $lang->menu->waterfall->qa = array('link' => '測試|bug|browse|product={PRODUCT}', 'subModule' => ',testcase,testtask,testsuite,caselib,'); $lang->menu->waterfall->projectrelease = array('link' => '發佈|projectrelease|browse'); -$lang->menu->waterfall->issue = '問題|issue|browse|'; -$lang->menu->waterfall->risk = '風險|risk|browse|'; -$lang->menu->waterfall->morelink = array('link' => '更多|project|morelink', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder'); +$lang->menu->waterfall->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}'); +$lang->menu->waterfall->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc'); +$lang->menu->waterfall->projectsetting = array('link' => '設置|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'workestimation,durationestimation,budget,pssp'); $lang->waterfall = new stdclass(); $lang->waterfall->subMenu = new stdclass(); -$lang->waterfall->subMenu->morelink = new stdclass(); -$lang->waterfall->subMenu->morelink->workestimation = array('link' => '估算|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget'); -$lang->waterfall->subMenu->morelink->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder'); -$lang->waterfall->subMenu->morelink->program = '項目|program|PRJEdit|'; +$lang->waterfall->subMenu->other = new stdclass(); +$lang->waterfall->subMenu->other->issue = array('link' => '問題|issue|browse|', 'subModule' => 'issue'); +$lang->waterfall->subMenu->other->risk = array('link' => '風險|risk|browse|', 'subModule' => 'risk'); +$lang->waterfall->subMenu->other->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder'); + +$lang->waterfall->subMenu->projectsetting = new stdclass(); +$lang->waterfall->subMenu->projectsetting->workestimation = array('link' => '估算|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget'); +$lang->waterfall->subMenu->projectsetting->program = '項目|program|PRJEdit|'; $lang->waterfallproduct = new stdclass(); $lang->workestimation = new stdclass(); diff --git a/module/index/css/index.css b/module/index/css/index.css index ab74c99daf..75f24e5103 100644 --- a/module/index/css/index.css +++ b/module/index/css/index.css @@ -25,7 +25,7 @@ #userNav .dropdown-menu>li>a>.icon { position: initial; display: inline;} #userNav li.open>a{background:#0c64eb} #userNav li.divider{opacity: .24;} -#poweredBy{width: 55%; position: absolute; top: 4px; right: 0; padding: 0px 40px 0px 0px;} +#poweredBy{width: 55%; position: absolute; top: 4px; right: 0; padding: 0;} #globalSearchDiv{width:50%; float: right;} #globalSearchDiv .input-group{width: 70%; float: right; margin-top: 2px;} diff --git a/module/my/lang/de.php b/module/my/lang/de.php index 20d7494eb7..370b8ea3d1 100644 --- a/module/my/lang/de.php +++ b/module/my/lang/de.php @@ -33,6 +33,7 @@ $lang->my->storyConcept = 'Story Concept'; $lang->my->noTodo = 'Keine toDos. '; $lang->my->noData = 'No %s yet. '; $lang->my->storyChanged = "Story Changed"; +$lang->my->hours = 'Stunde/Tag'; $lang->my->myExecutions = 'My Stage/Sprint/Iteration'; $lang->my->name = 'Name'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 2285aeecb5..d0e01de893 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -33,6 +33,7 @@ $lang->my->storyConcept = 'Story Concept'; $lang->my->noTodo = 'No todos yet. '; $lang->my->noData = 'No %s yet. '; $lang->my->storyChanged = "Story Changed"; +$lang->my->hours = "Hours/day"; $lang->my->myExecutions = "My Stage/Sprint/Iteration"; $lang->my->name = 'Name'; diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php index 85423cbcd0..0aa2134719 100644 --- a/module/my/lang/fr.php +++ b/module/my/lang/fr.php @@ -33,6 +33,7 @@ $lang->my->storyConcept = 'Story Concept'; $lang->my->noTodo = "Je n'ai rien à faire pour l'instant."; $lang->my->noData = 'No %s yet. '; $lang->my->storyChanged = "Story Changed"; +$lang->my->hours = 'Heure/jour'; $lang->my->myExecutions = 'My Stage/Sprint/Iteration'; $lang->my->name = 'Name'; diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php index f830cb9b03..a17b89b01a 100644 --- a/module/my/lang/vi.php +++ b/module/my/lang/vi.php @@ -33,6 +33,7 @@ $lang->my->storyConcept = 'Story Concept'; $lang->my->noTodo = 'Chưa có việc nào.'; $lang->my->noData = 'No %s yet. '; $lang->my->storyChanged = "Story Changed"; +$lang->my->hours = "Giờ/ngày"; $lang->my->myExecutions = "My Stage/Sprint/Iteration"; $lang->my->name = 'Name'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index cce3a56f78..049d01887c 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -33,6 +33,7 @@ $lang->my->scoreRule = '积分规则'; $lang->my->noTodo = '暂时没有待办。'; $lang->my->noData = "暂时没有%s。"; $lang->my->storyChanged = "需求变更"; +$lang->my->hours = '工时/天'; $lang->my->myExecutions = "我参与的阶段/冲刺/迭代"; $lang->my->name = '名称'; diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php index 3c162b19f0..ace0e64e43 100644 --- a/module/my/lang/zh-tw.php +++ b/module/my/lang/zh-tw.php @@ -33,6 +33,7 @@ $lang->my->scoreRule = '積分規則'; $lang->my->noTodo = '暫時沒有待辦。'; $lang->my->noData = "暫時沒有%s。"; $lang->my->storyChanged = "需求變更"; +$lang->my->hours = '工時/天'; $lang->my->myExecutions = "我參與的階段/衝刺/迭代"; $lang->my->name = '名稱'; diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php index a31109f7e4..6393bd88eb 100644 --- a/module/my/view/execution.html.php +++ b/module/my/view/execution.html.php @@ -40,8 +40,8 @@ statusAB;?> team->role;?> team->join;?> - team->hours;?> - project->waitTasks;?> + my->hours;?> + project->assignedToMe;?> project->progress;?> @@ -70,7 +70,7 @@ role;?> join;?> hours;?> - waitTasks;?> + assignedToMeTasks;?> progress}' data-border-color='#ddd' data-back-color='#f1f1f1'> {$execution->progress}%";?> diff --git a/module/my/view/issue.html.php b/module/my/view/issue.html.php index 81f3be991f..58944e7770 100644 --- a/module/my/view/issue.html.php +++ b/module/my/view/issue.html.php @@ -36,21 +36,21 @@ recTotal&recPerPage=$pager->recPerPage&pageID=$pager->pageID"; ?> - idAB);?> + idAB);?> issue->type;?> issue->title;?> - issue->severity;?> + issue->severity;?> issue->pri;?> - issue->assignedTo;?> + issue->assignedTo;?> issue->owner;?> - issue->status;?> - issue->createdDate;?> + issue->status;?> + issue->createdDate;?> actions;?> - + id);?> issue->typeList, $issue->type);?> createLink('issue', 'view', "id=$issue->id", '', '', $issue->PRJ), $issue->title, '', "data-group='project'");?> @@ -59,6 +59,7 @@ assignedTo);?> owner);?> issue->statusList, $issue->status);?> + createdDate = substr($issue->createdDate, 0, 10)?> createdDate;?> idAB;?> program->PRJName;?> - program->PRJCode;?> program->PRJStatus;?> program->begin;?> program->end;?> @@ -54,7 +53,6 @@ createLink('program', 'index', "projectID=$project->id", '', '', $project->id), $project->name, '', "data-group='project'");?> - code;?> project->statusList, $project->status, '');?> begin;?> end == '0000-00-00' ? '' : $project->end;?> @@ -65,8 +63,8 @@ status == 'doing') common::printIcon('program', 'PRJClose', "projectID=$project->id", $project, 'list', 'off', '', 'iframe', true);?> status == 'closed') common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'list', 'magic', '', 'iframe', true);?>
- -
@@ -34,7 +34,7 @@ idAB;?> program->PRJName;?> program->PRJPGM;?> - program->PM;?> + program->PM;?> program->begin;?> program->end;?> program->PRJStatus;?> @@ -75,4 +75,5 @@
+ diff --git a/module/program/config.php b/module/program/config.php index 886fccd00f..12dba189cd 100644 --- a/module/program/config.php +++ b/module/program/config.php @@ -105,5 +105,5 @@ $config->program->datatable->fieldList['PRJProgress']['sort'] = 'no'; $config->program->datatable->fieldList['actions']['title'] = 'actions'; $config->program->datatable->fieldList['actions']['fixed'] = 'right'; -$config->program->datatable->fieldList['actions']['width'] = '170'; +$config->program->datatable->fieldList['actions']['width'] = '180'; $config->program->datatable->fieldList['actions']['required'] = 'yes'; diff --git a/module/program/model.php b/module/program/model.php index e449da8e4d..b9a7441f3d 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1686,7 +1686,7 @@ class programModel extends model echo "
"; echo ""; - echo "