diff --git a/module/program/css/common.css b/module/program/css/common.css index c026c35fbd..c7dfdc44b7 100644 --- a/module/program/css/common.css +++ b/module/program/css/common.css @@ -1,2 +1,3 @@ .future {display: inline-block;} .c-number {overflow: hidden; text-align: right !important; text-overflow: ellipsis; white-space: nowrap;} +.text-remind {color: #ffa34d;} diff --git a/module/program/css/create.css b/module/program/css/create.css index 12a38dc6f4..6ad3033166 100644 --- a/module/program/css/create.css +++ b/module/program/css/create.css @@ -1,4 +1,6 @@ #budget {border-right: 0px;} #budgetUnit {border-left: 0px;} -#dateRange {vertical-align: top; padding-top: 13px;} +#dateRange, .undetermined {vertical-align: top !important; padding-top: 13px !important;} #endList {vertical-align: top; padding-top: 13px;} +[lang^=en] #endList {vertical-align: top; padding-top: 20px;} +#dataform th {vertical-align: top; padding-top: 13px;} diff --git a/module/program/js/common.js b/module/program/js/common.js index 67a2acfcb0..9130a39824 100644 --- a/module/program/js/common.js +++ b/module/program/js/common.js @@ -312,3 +312,16 @@ function setBudgetTipsAndAclList(programID) $('.aclBox').html($('#PGMAcl').html()); } } + +/** + * Append prompt when the budget exceeds the parent project set. + * + * @param int $budgetLeft + * @access public + * @return void + */ +function budgetOverrunTips(budgetLeft) +{ + var budget = $('#budget').val(); + budget > budgetLeft ? $('#programBudget').removeClass('hidden') : $('#programBudget').addClass('hidden'); +} diff --git a/module/program/lang/de.php b/module/program/lang/de.php index 6505b7fb48..9fbf1bf1a4 100644 --- a/module/program/lang/de.php +++ b/module/program/lang/de.php @@ -113,6 +113,7 @@ $lang->program->readjustTime = 'Change the program begin&end date.'; $lang->program->accessDenied = 'You have no access to the program.'; $lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.'; $lang->program->checkedProjects = 'Seleted %s items'; +$lang->program->budgetOverrun = 'The budget of the project set has exceeded the remaining budget of the parent project set.'; $lang->program->endList[31] = 'One month'; $lang->program->endList[93] = 'Trimester'; diff --git a/module/program/lang/en.php b/module/program/lang/en.php index 3e390eff22..4d896f99de 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -113,6 +113,7 @@ $lang->program->readjustTime = 'Change the program begin&end date.'; $lang->program->accessDenied = 'You have no access to the program.'; $lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.'; $lang->program->checkedProjects = 'Seleted %s items'; +$lang->program->budgetOverrun = 'The budget of the project set has exceeded the remaining budget of the parent project set.'; $lang->program->endList[31] = 'One month'; $lang->program->endList[93] = 'Trimester'; diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php index ed25ecbfb4..7b2e874c71 100644 --- a/module/program/lang/fr.php +++ b/module/program/lang/fr.php @@ -113,6 +113,7 @@ $lang->program->readjustTime = 'Change the program begin&end date.'; $lang->program->accessDenied = 'You have no access to the program.'; $lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.'; $lang->program->checkedProjects = "Pour s électionner l'élément% s"; +$lang->program->budgetOverrun = 'Le budget de l\'ensemble de projets a dépassé le budget restant de l\'ensemble de projets parent.'; $lang->program->endList[31] = 'One month'; $lang->program->endList[93] = 'Trimester'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index 8189008a46..cb9dc6e7b6 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -113,6 +113,7 @@ $lang->program->readjustTime = '重新调整项目集起止时间'; $lang->program->accessDenied = '你无权访问该项目集'; $lang->program->beyondParentBudget = '已超出所属项目集的剩余预算'; $lang->program->checkedProjects = '已选择%s项'; +$lang->program->budgetOverrun = '项目集的预算已超出父项目集的剩余预算。'; $lang->program->endList[31] = '一个月'; $lang->program->endList[93] = '三个月'; diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php index c26d07fb7d..77a850871b 100644 --- a/module/program/view/create.html.php +++ b/module/program/view/create.html.php @@ -70,8 +70,8 @@