Updated text differences #3041

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">Additional 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">Monitoring methodology</th>
         <g:if test="${extendedMonitoring}">
-            <th class="monitoring-service">Service / Target Measure</th>
+            <th class="monitoring-service">Project service / Target measure/s</th>
         </g:if>
-        <th class="baseline-method">Monitoring approach</th>
+        <th class="baseline-method">Monitoring method</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,13 @@
     <thead>
     <tr>
         <th class="code"></th>
-        <th class="outcome">Outcome statement/s</th>
-        <th class="investment-priority">Investment Priority</th>
+        <g:if test="${outcomeType == 'mid'}">
+            <th class="outcome">Medium-term outcome statement/s</th>
+        </g:if>
+        <g:else>
+            <th class="outcome">Short-term outcome statement/s</th>
+        </g:else>
+        <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>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>Project review, improvement and evaluation 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">Additional 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">Monitoring methodology</th>
         <g:if test="${extendedMonitoring}">
-            <th class="monitoring-service">Service / Target Measure</th>
+            <th class="monitoring-service">Project service / Target measure/s</th>
         </g:if>
-        <th class="baseline-method">Monitoring approach</th>
+        <th class="baseline-method">Monitoring method</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,14 @@
         <g:else>
             <th class="code"></th>
         </g:else>
-        <th class="outcome">Outcome statement/s</th>
+        <g:if test="${outcomeType == 'mid'}">
+            <th class="outcome">Medium-term outcome statement/s</th>
+        </g:if>
+        <g:else>
+            <th class="outcome">Short-term outcome statement/s</th>
+        </g:else>
         <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>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>Project review, improvement and evaluation methodology and approach</th>
     </tr>
     </thead>
     <tbody>