Merge pull request #3048 from AtlasOfLivingAustralia/feature/issue3046

commit label updates #3046

Author: chrisala

grails-app/views/project/meriPlan/_extendedBaselineMonitoring.gsp

@@ -9,10 +9,10 @@
     <tbody data-bind="foreach: rows">
     <tr class="header">
         <th class="code"></th>
-        <th class="outcome required">Outcome statement/s</th>
+        <th class="outcome required">${outcomeStatementHeading ?: 'Outcome statement/s'}</th>
         <th class="monitoring-data required">Baseline data <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
         <th class="baseline required">Baseline data description <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
-        <th class="service required">Project Service / Target Measure/s <g:if test="${baselineHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
+        <th class="service required">${servicesHeading ?: 'Project service / Target measure/s'}<g:if test="${baselineHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
         <th class="baseline-method required">Select the method used to obtain the baseline, or how the baseline will be established if ‘Other’<fc:iconHelp html="true">${baselineMethodHelpText ?: "Describe the project baseline(s) units of measure or data which will be used to report progress towards this project's outcomes (short-term, medium-term and 5 year program outcome), and the monitoring design."}</fc:iconHelp></th>
         <th class="baseline-evidence required">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
         <th class="remove"></th>

grails-app/views/project/meriPlan/_extendedKeyThreats.gsp

@@ -9,10 +9,10 @@
     <thead>
     <tr>
         <th class="index"></th>
-        <th class="related-outcomes required">Outcome Statement/s</th>
+        <th class="related-outcomes required">${outcomeStatementHeading ?: 'Outcome statement/s'}</th>
         <th class="threat-code required">Threats / Threatening processes</th>
         <th class="threat required">Description <fc:iconHelp>${threatHelpText ?: "Describe the key threats (or key threatening processes) to the primary investment priority"}</fc:iconHelp></th>
-        <th class="services required">Project Service / Target Measure/s to address threats<fc:iconHelp>${servicesHelpText ?: "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables"}</fc:iconHelp></th>
+        <th class="services required">${servicesHeading ?: 'Project service / Target measure/s to address threats'}<fc:iconHelp>${servicesHelpText ?: "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables"}</fc:iconHelp></th>
         <th class="intervention required">Methodology <fc:iconHelp>${interventionHelpText ?: "Describe the proposed interventions to address the threat and how this will deliver on the 5 year outcome."}</fc:iconHelp></th>
         <th class="evidence required">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
         <th class="remove"></th>

grails-app/views/project/meriPlan/_monitoringIndicators.gsp

@@ -10,7 +10,7 @@
                 <g:if test="${monitoringValidation}">
                     <th class="baseline required">${indicatorHeading} <g:if test="${indicatorHelpText}"><fc:iconHelp title="${indicatorHeading}">${indicatorHelpText}</fc:iconHelp></g:if></th>
                     <g:if test="${extendedMonitoring}">
-                        <th class="monitoring-service required">Project Service / Target Measure/s <g:if test="${monitoringServiceHelpText}"><fc:iconHelp html="true">${monitoringServiceHelpText}</fc:iconHelp></g:if></th>
+                        <th class="monitoring-service required">${monitoringServicesHeading ?: 'Project service / Target measure/s'} <g:if test="${monitoringServiceHelpText}"><fc:iconHelp html="true">${monitoringServiceHelpText}</fc:iconHelp></g:if></th>
                     </g:if>
                     <th class="baseline-method required">${approachHeading} <g:if test="${approachHelpText}"><fc:iconHelp html="true" title="${approachHeading}">${approachHelpText}</fc:iconHelp></g:if></th>
                     <g:if test="${extendedMonitoring}">

grails-app/views/project/meriPlan/_outcomeStatements.gsp

@@ -18,7 +18,7 @@
         </g:else>
         <th class="outcome required">${subtitle ?: ""} <g:if test="${helpText}"><fc:iconHelp html="true" container="body">${helpText}</fc:iconHelp></g:if> </th>
         <g:if test="${extendedOutcomes}">
-            <th class="investment-priority required">Investment Priority</th>
+            <th class="investment-priority required">${investmentPriorityHeading ?: 'Investment priority'}</th>
             <th class="program-outcome required">Related program outcome</th>
         </g:if>
         <th class="remove"></th>

grails-app/views/project/meriPlan/_programOutcome.gsp

@@ -1,9 +1,9 @@
-<h4>Program Outcome<g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></h4>
+<h4>${sectionHeading ?: 'Program outcome'}<g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></h4>
 <table class="table">
     <thead>
     <tr class="header">
         <th class="outcome-priority required">${primaryOutcomeHeading?: 'Primary outcome'}<g:if test="${helpTextPrimaryOutcome}"> <fc:iconHelp html="true" container="body">${helpTextPrimaryOutcome}</fc:iconHelp></g:if></th>
-        <th class="primary-outcome priority required">${pestsAndWeedsHeading?: 'Primary Investment'} <span data-bind="if:!isAgricultureProject() && !details.outcomes.primaryOutcomeSupportsMultiplePriorities()">Priority</span><span data-bind="if:isAgricultureProject() || details.outcomes.primaryOutcomeSupportsMultiplePriorities()">Priorities</span>
+        <th class="primary-outcome priority required">${pestsAndWeedsHeading?: 'Primary investment'} <span data-bind="if:!isAgricultureProject() && !details.outcomes.primaryOutcomeSupportsMultiplePriorities()">${pestsAndWeedsHeadingExtNonMulti ?: 'priority'}</span><span data-bind="if:isAgricultureProject() || details.outcomes.primaryOutcomeSupportsMultiplePriorities()">${pestsAndWeedsHeadingExtMulti ?: 'priorities'}</span>
                 <fc:iconHelp html="true" container="body">${priorityHelpText?: 'Enter the primary investment priority/ies for the primary outcome. (drop down list in MERIT) <br/>For outcomes 1-4, only one primary investment priority can be selected.<br/>For outcomes 5-6, select one or a maximum of two primary investment priorities'}</fc:iconHelp>
         </th>
         <th class="remove"></th>

grails-app/views/project/meriPlanChanges/_additionalOutcomes.gsp

@@ -2,7 +2,7 @@
 <table class="table secondary-outcome">
     <thead>
     <tr>
-        <th class="outcome-priority">Secondary outcome(s)</th>
+        <th class="outcome-priority">${outcomePriority ?:"Secondary outcome(s)"}</th>
         <th class="priority">${ priority ?:"Secondary Investment Priorities"}</th>
     </tr>
     </thead>

grails-app/views/project/meriPlanChanges/_extendedBaselineMonitoring.gsp

@@ -12,7 +12,7 @@
     <g:set var="monitoringModel" value="${changed.custom.details.monitoring?.rows.find {it.relatedBaseline == code}}"/>
     <tr class="header">
         <th class="code"></th>
-        <th class="outcome required">Outcome statement</th>
+        <th class="outcome required">Outcome statement/s</th>
         <th class="monitoring-data required">Baseline data <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
         <th class="baseline required">Baseline data description <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
         <th class="service required">Project Service / Target Measure/s <g:if test="${baselineHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>

grails-app/views/project/meriPlanChanges/_extendedKeyThreats.gsp

@@ -13,7 +13,7 @@
         <th class="related-outcomes">Outcome Statement/s</th>
         <th class="threat-code">Threats / Threatening processes</th>
         <th class="threat required">Description <fc:iconHelp>${threatHelpText ?: "Describe the key threats (or key threatening processes) to the primary investment priority"}</fc:iconHelp></th>
-        <th class="services">Project service measure/s to address threats</th>
+        <th class="services">Project service / Target measure/s to address threats</th>
         <th class="intervention required">Methodology <fc:iconHelp>${interventionHelpText ?: "Describe the proposed interventions to address the threat and how this will deliver on the 5 year outcome."}</fc:iconHelp></th>
         <th class="evidence">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
     </tr>

grails-app/views/project/meriPlanChanges/_monitoringIndicators.gsp

@@ -5,13 +5,13 @@
     <thead>
     <tr>
         <th class="index"></th>
-        <th class="baseline">Monitoring indicator</th>
+        <th class="baseline">${indicatorHeading}</th>
         <g:if test="${extendedMonitoring}">
-            <th class="monitoring-service">Service / Target Measure</th>
+            <th class="monitoring-service">${monitoringServicesHeading ?: 'Project service / Target measure/s'}</th>
         </g:if>
-        <th class="baseline-method">Monitoring approach</th>
+        <th class="baseline-method">${approachHeading}</th>
         <g:if test="${extendedMonitoring}">
-            <th class="monitoring-evidence">Evidence</th>
+            <th class="monitoring-evidence">Evidence to be retained</th>
         </g:if>
     </tr>
     </thead>

grails-app/views/project/meriPlanChanges/_outcomeStatements.gsp

@@ -6,8 +6,8 @@
     <thead>
     <tr>
         <th class="code"></th>
-        <th class="outcome">Outcome statement/s</th>
-        <th class="investment-priority">Investment Priority</th>
+        <th class="outcome">${subtitle ?: ""} </th>
+        <th class="investment-priority">Investment priority</th>
         <th class="program-outcome">Related program outcome/s</th>
     </tr>
     </thead>

grails-app/views/project/meriPlanChanges/_programOutcome.gsp

@@ -3,7 +3,7 @@
     <thead>
     <tr>
         <th class="outcome-priority">Primary outcome</th>
-        <th class="primary-outcome priority required">${pestsAndWeedsHeading?: 'Primary Investment'} <span data-bind="if:!isAgricultureProject() && !details.outcomes.primaryOutcomeSupportsMultiplePriorities()">Priority</span><span data-bind="if:isAgricultureProject() || details.outcomes.primaryOutcomeSupportsMultiplePriorities()">Priorities</span>
+        <th class="primary-outcome priority required">${pestsAndWeedsHeading?: 'Primary investment'} <span data-bind="if:!isAgricultureProject() && !details.outcomes.primaryOutcomeSupportsMultiplePriorities()">priority</span><span data-bind="if:isAgricultureProject() || details.outcomes.primaryOutcomeSupportsMultiplePriorities()">priorities</span>
     </tr>
     </thead>
     <tbody>

grails-app/views/project/meriPlanChanges/_projectMethodology.gsp

@@ -4,7 +4,7 @@
 <table class="table">
     <thead>
     <tr>
-        <th>Project methodology</th>
+        <th class="required">${tableHeading ?: "Project delivery assumptions"}</th>
     </tr>
     </thead>
     <tbody>

grails-app/views/project/meriPlanChanges/_projectReview.gsp

@@ -1,7 +1,7 @@
 <table class="table">
     <thead>
     <tr>
-        <th>Project Review, Evaluation and Improvement Methodology and Approach</th>
+        <th>${title?: "Project Review, Evaluation and Improvement Methodology and Approach"}</th>
     </tr>
     </thead>
     <tbody>

grails-app/views/project/meriPlanReadOnly/_additionalOutcomes.gsp

@@ -4,7 +4,7 @@
     <thead>
 
     <tr>
-        <th class="outcome-priority">Secondary outcome(s)</th>
+        <th class="outcome-priority">${outcomePriority ?:"Secondary outcome(s)"}</th>
         <th class="priority">${ priority ?:"Secondary Investment Priorities"}</th>
     </tr>
     </thead>

grails-app/views/project/meriPlanReadOnly/_extendedBaselineMonitoring.gsp

@@ -9,7 +9,7 @@
     <tbody data-bind="foreach: rows">
     <tr class="header">
         <th class="code"></th>
-        <th class="outcome required">Outcome statement</th>
+        <th class="outcome required">Outcome statement/s</th>
         <th class="monitoring-data required">Baseline data <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
         <th class="baseline required">Baseline data description <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
         <th class="service required">Project Service / Target Measure/s <g:if test="${baselineHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>

grails-app/views/project/meriPlanReadOnly/_extendedKeyThreats.gsp

@@ -12,7 +12,7 @@
         <th class="related-outcomes">Outcome Statement/s</th>
         <th class="threat-code">Threats / Threatening processes</th>
         <th class="threat required">Description <fc:iconHelp>${threatHelpText ?: "Describe the key threats (or key threatening processes) to the primary investment priority"}</fc:iconHelp></th>
-        <th class="services">Project service measure/s to address threats</th>
+        <th class="services">Project service / Target measure/s to address threats</th>
         <th class="intervention required">Methodology <fc:iconHelp>${interventionHelpText ?: "Describe the proposed interventions to address the threat and how this will deliver on the 5 year outcome."}</fc:iconHelp></th>
         <th class="evidence">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
     </tr>

grails-app/views/project/meriPlanReadOnly/_monitoringIndicators.gsp

@@ -5,13 +5,13 @@
     <thead>
     <tr>
         <th class="index"></th>
-        <th class="baseline">Monitoring indicator</th>
+        <th class="baseline">${indicatorHeading}</th>
         <g:if test="${extendedMonitoring}">
-            <th class="monitoring-service">Service / Target Measure</th>
+            <th class="monitoring-service">${monitoringServicesHeading ?: 'Project service / Target measure/s'}</th>
         </g:if>
-        <th class="baseline-method">Monitoring approach</th>
+        <th class="baseline-method">${approachHeading}</th>
         <g:if test="${extendedMonitoring}">
-            <th class="monitoring-evidence">Evidence</th>
+            <th class="monitoring-evidence">Evidence to be retained</th>
         </g:if>
     </tr>
     </thead>

grails-app/views/project/meriPlanReadOnly/_outcomeStatements.gsp

@@ -11,9 +11,9 @@
         <g:else>
             <th class="code"></th>
         </g:else>
-        <th class="outcome">Outcome statement/s</th>
+        <th class="outcome">${subtitle ?: ""} </th>
         <g:if test="${extendedOutcomes}">
-            <th class="investment-priority">Investment Priority</th>
+            <th class="investment-priority">Investment priority</th>
             <th class="program-outcome">Related program outcome/s</th>
         </g:if>
     </tr>

grails-app/views/project/meriPlanReadOnly/_programOutcome.gsp

@@ -3,7 +3,7 @@
     <thead>
     <tr>
         <th class="outcome-priority">Primary outcome</th>
-        <th class="primary-outcome priority required">${pestsAndWeedsHeading?: 'Primary Investment'} <span data-bind="if:!isAgricultureProject() && !details.outcomes.primaryOutcomeSupportsMultiplePriorities()">Priority</span><span data-bind="if:isAgricultureProject() || details.outcomes.primaryOutcomeSupportsMultiplePriorities()">Priorities</span>
+        <th class="primary-outcome priority required">${pestsAndWeedsHeading?: 'Primary investment'} <span data-bind="if:!isAgricultureProject() && !details.outcomes.primaryOutcomeSupportsMultiplePriorities()">priority</span><span data-bind="if:isAgricultureProject() || details.outcomes.primaryOutcomeSupportsMultiplePriorities()">priorities</span>
     </tr>
     </thead>
     <tbody>

grails-app/views/project/meriPlanReadOnly/_projectMethodology.gsp

@@ -4,7 +4,7 @@
 <table class="table">
     <thead>
     <tr>
-        <th>Project methodology</th>
+        <th class="required">${tableHeading ?: "Project delivery assumptions"}</th>
     </tr>
     </thead>
     <tbody>

grails-app/views/project/meriPlanReadOnly/_projectReview.gsp

@@ -1,7 +1,7 @@
 <table class="table">
     <thead>
     <tr>
-        <th>Project Review, Evaluation and Improvement Methodology and Approach</th>
+        <th>${title?: "Project Review, Evaluation and Improvement Methodology and Approach"}</th>
     </tr>
     </thead>
     <tbody>