From 08eeb9efdcb8133a1d84858579e9a0f1885f1874 Mon Sep 17 00:00:00 2001 From: temi Date: Mon, 17 Mar 2025 17:07:59 +1100 Subject: [PATCH 1/2] $3474 - made headings configurable --- .../project/meriPlan/_extendedBaselineMonitoring.gsp | 8 ++++---- grails-app/views/project/meriPlan/_extendedKeyThreats.gsp | 8 ++++---- .../views/project/meriPlan/_indigenousInvolvement.gsp | 2 +- grails-app/views/project/meriPlan/_name.gsp | 4 ++-- grails-app/views/project/meriPlan/_outcomeStatements.gsp | 2 +- .../views/project/meriPlan/_projectPartnerships.gsp | 6 +++--- grails-app/views/project/meriPlan/_serviceForecasts.gsp | 4 ++-- .../views/project/meriPlan/_serviceOutcomeTargets.gsp | 6 +++--- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/grails-app/views/project/meriPlan/_extendedBaselineMonitoring.gsp b/grails-app/views/project/meriPlan/_extendedBaselineMonitoring.gsp index 30974eb2a..ae4dc8eb1 100644 --- a/grails-app/views/project/meriPlan/_extendedBaselineMonitoring.gsp +++ b/grails-app/views/project/meriPlan/_extendedBaselineMonitoring.gsp @@ -10,11 +10,11 @@ ${outcomeStatementHeading ?: 'Outcome statement/s'} - Baseline data ${baselineDataHelpText} - Baseline data description ${baselineDataDescriptionHelpText} + ${baseLineHeading ?: 'Baseline data'} ${baselineDataHelpText} + ${baseLineDescHeading ?: 'Baseline data description'} ${baselineDataDescriptionHelpText} ${servicesHeading ?: 'Project service / Target measure/s'}${baselineServiceHelpText} - Select the method used to obtain the baseline, or how the baseline will be established if ‘Other’${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."} - Evidence to be retained ${evidenceHelpText} + ${methodBaseLineHeading ?: 'Select the method used to obtain the baseline, or how the baseline will be established if ‘Other’'}${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."} + ${evidenceHeading ?: 'Evidence to be retained'} ${evidenceHelpText} diff --git a/grails-app/views/project/meriPlan/_extendedKeyThreats.gsp b/grails-app/views/project/meriPlan/_extendedKeyThreats.gsp index 253859435..7aca63f58 100644 --- a/grails-app/views/project/meriPlan/_extendedKeyThreats.gsp +++ b/grails-app/views/project/meriPlan/_extendedKeyThreats.gsp @@ -10,11 +10,11 @@ ${outcomeStatementHeading ?: 'Outcome statement/s'} - Threats / Threatening processes - Description ${threatHelpText ?: "Describe the key threats (or key threatening processes) to the primary investment priority"} + ${threatsHeading ?:'Threats / Threatening processes'} + ${descriptionHeading ?: 'Description'} ${threatHelpText ?: "Describe the key threats (or key threatening processes) to the primary investment priority"} ${servicesHeading ?: 'Project service / Target measure/s to address threats'}${servicesHelpText ?: "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables"} - Methodology ${interventionHelpText ?: "Describe the proposed interventions to address the threat and how this will deliver on the 5 year outcome."} - Evidence to be retained ${evidenceHelpText} + ${methodologyHeading ?: 'Methodology'} ${interventionHelpText ?: "Describe the proposed interventions to address the threat and how this will deliver on the 5 year outcome."} + ${evidenceHeading ?: 'Evidence to be retained'} ${evidenceHelpText} diff --git a/grails-app/views/project/meriPlan/_indigenousInvolvement.gsp b/grails-app/views/project/meriPlan/_indigenousInvolvement.gsp index 145429243..2314494fe 100644 --- a/grails-app/views/project/meriPlan/_indigenousInvolvement.gsp +++ b/grails-app/views/project/meriPlan/_indigenousInvolvement.gsp @@ -1,4 +1,4 @@ -

First Nations people involvement

+

${title ?: 'First Nations people involvement'}

diff --git a/grails-app/views/project/meriPlan/_name.gsp b/grails-app/views/project/meriPlan/_name.gsp index 30349965c..43b972ed2 100644 --- a/grails-app/views/project/meriPlan/_name.gsp +++ b/grails-app/views/project/meriPlan/_name.gsp @@ -5,7 +5,7 @@ - Project name (${maxSize ?: 150} characters) The project name will be visible on project overview page in MERIT + ${projectNameHeading?:"Project name"} (${maxSize ?: 150} characters) ${projectHelp ?: 'The project name will be visible on project overview page in MERIT'} @@ -19,7 +19,7 @@
-

Project name

The project name will be visible on project overview page in MERIT +

${projectHelp ?: 'The project name will be visible on project overview page in MERIT'} ${explanation} diff --git a/grails-app/views/project/meriPlan/_outcomeStatements.gsp b/grails-app/views/project/meriPlan/_outcomeStatements.gsp index aa4bc39c4..68a38f832 100644 --- a/grails-app/views/project/meriPlan/_outcomeStatements.gsp +++ b/grails-app/views/project/meriPlan/_outcomeStatements.gsp @@ -19,7 +19,7 @@ ${subtitle ?: ""} ${helpText} ${investmentPriorityHeading ?: 'Investment priority'} - Related program outcome + ${programOutcomeHeading ?: 'Related program outcome'} diff --git a/grails-app/views/project/meriPlan/_projectPartnerships.gsp b/grails-app/views/project/meriPlan/_projectPartnerships.gsp index 5e5ed71ff..8f2e24e5b 100644 --- a/grails-app/views/project/meriPlan/_projectPartnerships.gsp +++ b/grails-app/views/project/meriPlan/_projectPartnerships.gsp @@ -5,10 +5,10 @@ - Partner name + ${partnerNameHeading ?: 'Partner name'} ${helpTextPartnerName ?:'Name of project partner, to be a project partner they need to be actively involved in the planning or delivery of the project.'} - Nature of partnership${helpTextPartnerNature ?: 'Very briefly indicate how the partner is contributing to the project.'} - Type of organisation${helpTextPartnerOrg ?: 'Select the most appropriate partner type from the list provided.'} + ${naturePartnershipHeading ?: 'Nature of partnership'}${helpTextPartnerNature ?: 'Very briefly indicate how the partner is contributing to the project.'} + ${typeOrganisationHeading ?: 'Type of organisation'}${helpTextPartnerOrg ?: 'Select the most appropriate partner type from the list provided.'} diff --git a/grails-app/views/project/meriPlan/_serviceForecasts.gsp b/grails-app/views/project/meriPlan/_serviceForecasts.gsp index 567592504..567c6fd30 100644 --- a/grails-app/views/project/meriPlan/_serviceForecasts.gsp +++ b/grails-app/views/project/meriPlan/_serviceForecasts.gsp @@ -6,9 +6,9 @@ ${serviceName ?: "Service"} - Target measure + ${targetMeasureHeading ?: 'Target measure'} - Annual target forecast (indicative only) ${minHelptext ?:"Specify the minimum total target for each Project Service to be delivered each financial year. Note: the sum of these targets will not necessarily equal the total services to be delivered."} + ${annualTargetHeading ?: 'Annual target forecast (indicative only)'} ${minHelptext ?:"Specify the minimum total target for each Project Service to be delivered each financial year. Note: the sum of these targets will not necessarily equal the total services to be delivered."} diff --git a/grails-app/views/project/meriPlan/_serviceOutcomeTargets.gsp b/grails-app/views/project/meriPlan/_serviceOutcomeTargets.gsp index 49248948b..e55da45d2 100644 --- a/grails-app/views/project/meriPlan/_serviceOutcomeTargets.gsp +++ b/grails-app/views/project/meriPlan/_serviceOutcomeTargets.gsp @@ -6,7 +6,7 @@ ${serviceName ?: "Project Service"} - Target measure + ${targetMeasureHeading ?: 'Target measure'} @@ -33,8 +33,8 @@ - Project Outcome/s - Target + ${projectOutcomesHeading ?: 'Project Outcome/s'} + ${targetHeading ?: 'Target'} From 58c5e6a554b1b03600d335182820304e869d69a9 Mon Sep 17 00:00:00 2001 From: temi Date: Tue, 18 Mar 2025 16:21:51 +1100 Subject: [PATCH 2/2] $3474 - added more configuration --- .../views/project/meriPlan/_description.gsp | 4 ++-- .../meriPlan/_extendedBaselineMonitoring.gsp | 6 +++--- .../project/meriPlan/_projectPartnerships.gsp | 2 +- .../project/meriPlanChanges/_description.gsp | 4 ++-- .../_extendedBaselineMonitoring.gsp | 16 ++++++++-------- .../meriPlanChanges/_extendedKeyThreats.gsp | 12 ++++++------ .../meriPlanChanges/_indigenousInvolvement.gsp | 2 +- .../views/project/meriPlanChanges/_name.gsp | 4 ++-- .../meriPlanChanges/_outcomeStatements.gsp | 4 ++-- .../meriPlanChanges/_projectPartnerships.gsp | 8 ++++---- .../meriPlanChanges/_serviceForecasts.gsp | 4 ++-- .../meriPlanChanges/_serviceOutcomeTargets.gsp | 6 +++--- .../project/meriPlanReadOnly/_description.gsp | 4 ++-- .../_extendedBaselineMonitoring.gsp | 16 ++++++++-------- .../meriPlanReadOnly/_extendedKeyThreats.gsp | 12 ++++++------ .../meriPlanReadOnly/_indigenousInvolvement.gsp | 2 +- .../views/project/meriPlanReadOnly/_name.gsp | 4 ++-- .../meriPlanReadOnly/_outcomeStatements.gsp | 4 ++-- .../meriPlanReadOnly/_projectPartnerships.gsp | 8 ++++---- .../meriPlanReadOnly/_serviceForecasts.gsp | 4 ++-- .../meriPlanReadOnly/_serviceOutcomeTargets.gsp | 6 +++--- 21 files changed, 66 insertions(+), 66 deletions(-) diff --git a/grails-app/views/project/meriPlan/_description.gsp b/grails-app/views/project/meriPlan/_description.gsp index 6984cea95..4006ace5c 100644 --- a/grails-app/views/project/meriPlan/_description.gsp +++ b/grails-app/views/project/meriPlan/_description.gsp @@ -4,7 +4,7 @@ - +
Project description (${maxSize ?: 1500} character limit) ${helpTextHeading ?:'Project description will be visible on project overview page in MERIT.'}${projectDescHeading ?: 'Project description'} (${maxSize ?: 1500} character limit) ${helpTextHeading ?:'Project description will be visible on project overview page in MERIT.'}