diff --git a/module/project/css/create.css b/module/project/css/create.css index b92dc698b0..8e58ca4a64 100644 --- a/module/project/css/create.css +++ b/module/project/css/create.css @@ -22,5 +22,5 @@ #plansBox .row {display: inline-table; width: 102%;} #plansBox .col-sm-4 {float: none; display: inline-block; padding-right: 5px;} #dataform th {vertical-align: top; padding-top: 13px;} -.undetermined {vertical-align: top !important; padding-top: 13px !important;} +.futureBox {vertical-align: top !important; padding-top: 13px !important;} #linkPlan {padding-top: 25px !important;} diff --git a/module/project/css/edit.css b/module/project/css/edit.css index aed960e5f9..50ad401e0b 100644 --- a/module/project/css/edit.css +++ b/module/project/css/edit.css @@ -2,7 +2,7 @@ #budgetUnit {border-left: 0px;} #plansBox .row {display: inline-table; width: 102%;} #plansBox .col-sm-4 {float: none; display: inline-block;} -#dateRange, .undetermined {vertical-align: top !important; padding-top: 13px !important;} +#dateRange, .futureBox {vertical-align: top !important; padding-top: 13px !important;} #endList {vertical-align: top; padding-top: 13px;} #dataform th {vertical-align: top; padding-top: 13px;} #linkPlan {padding-top: 25px !important;} diff --git a/module/project/js/common.js b/module/project/js/common.js index 64fa6b9e62..383fc38f5f 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -287,6 +287,7 @@ $(function() if($(this).prop('checked')) { $('#budget').val('').attr('disabled', 'disabled'); + budgetOverrunTips(budgetBalance); } else { @@ -334,7 +335,7 @@ function setBudgetTipsAndAclList(programID) function budgetOverrunTips(budgetLeft) { var budget = $('#budget').val(); - budget > budgetLeft ? $('#programBudget').removeClass('hidden') : $('#programBudget').addClass('hidden'); + budget != 0 && budget !== null && budget > budgetLeft ? $('#programBudget').removeClass('hidden') : $('#programBudget').addClass('hidden'); } $(document).on('change', "#plansBox select[name^='plans']", function() diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index bcfef8c556..3853aae737 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -26,6 +26,7 @@ product->name);?> project->manageProducts);?> + project->create->requiredFields;?>
@@ -80,7 +81,7 @@
- +
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index fa51624d1a..d2fef5d07f 100755 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -30,6 +30,7 @@ project->edit->requiredFields;?> budget);?> +
@@ -86,7 +87,7 @@
- +
budget == 0) echo 'checked';?> />