Skip to content

Commit 08eeb9e

Browse files
committed
$3474
- made headings configurable
1 parent a7e45c6 commit 08eeb9e

8 files changed

+20
-20
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<tr class="header">
1111
<th class="code"></th>
1212
<th class="outcome required">${outcomeStatementHeading ?: 'Outcome statement/s'}</th>
13-
<th class="monitoring-data required">Baseline data <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
14-
<th class="baseline required">Baseline data description <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
13+
<th class="monitoring-data required">${baseLineHeading ?: 'Baseline data'} <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
14+
<th class="baseline required">${baseLineDescHeading ?: 'Baseline data description'} <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
1515
<th class="service required">${servicesHeading ?: 'Project service / Target measure/s'}<g:if test="${baselineHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
16-
<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>
17-
<th class="baseline-evidence required">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
16+
<th class="baseline-method required">${methodBaseLineHeading ?: '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>
17+
<th class="baseline-evidence required">${evidenceHeading ?: 'Evidence to be retained'} <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
1818
<th class="remove"></th>
1919
</tr>
2020

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<tr>
1111
<th class="index"></th>
1212
<th class="related-outcomes required">${outcomeStatementHeading ?: 'Outcome statement/s'}</th>
13-
<th class="threat-code required">Threats / Threatening processes</th>
14-
<th class="threat required">Description <fc:iconHelp>${threatHelpText ?: "Describe the key threats (or key threatening processes) to the primary investment priority"}</fc:iconHelp></th>
13+
<th class="threat-code required">${threatsHeading ?:'Threats / Threatening processes'}</th>
14+
<th class="threat required">${descriptionHeading ?: 'Description'} <fc:iconHelp>${threatHelpText ?: "Describe the key threats (or key threatening processes) to the primary investment priority"}</fc:iconHelp></th>
1515
<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>
16-
<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>
17-
<th class="evidence required">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
16+
<th class="intervention required">${methodologyHeading ?: '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>
17+
<th class="evidence required">${evidenceHeading ?: 'Evidence to be retained'} <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
1818
<th class="remove"></th>
1919
</tr>
2020
</thead>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h4>First Nations people involvement</h4>
1+
<h4>${title ?: 'First Nations people involvement'}</h4>
22

33
<div class="form-group row">
44
<div class="col-sm-8">

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<tbody>
66

77
<tr class="header required">
8-
<th class="required">Project name (${maxSize ?: 150} characters) <fc:iconHelp>The project name will be visible on project overview page in MERIT</fc:iconHelp></th>
8+
<th class="required">${projectNameHeading?:"Project name"} (${maxSize ?: 150} characters) <fc:iconHelp>${projectHelp ?: 'The project name will be visible on project overview page in MERIT'}</fc:iconHelp></th>
99
</tr>
1010
<tr>
1111
<td>
@@ -19,7 +19,7 @@
1919
</div>
2020
</g:if>
2121
<g:else>
22-
<h4 class="header-with-help">Project name</h4><fc:iconHelp>The project name will be visible on project overview page in MERIT</fc:iconHelp>
22+
<h4 class="header-with-help"${projectNameHeading?:"Project name"}</h4><fc:iconHelp>${projectHelp ?: 'The project name will be visible on project overview page in MERIT'}</fc:iconHelp>
2323
<g:if test="${explanation}">
2424
${explanation}
2525
</g:if>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<th class="outcome required">${subtitle ?: ""} <g:if test="${helpText}"><fc:iconHelp html="true" container="body">${helpText}</fc:iconHelp></g:if> </th>
2020
<g:if test="${extendedOutcomes}">
2121
<th class="investment-priority required">${investmentPriorityHeading ?: 'Investment priority'}</th>
22-
<th class="program-outcome required">Related program outcome</th>
22+
<th class="program-outcome required">${programOutcomeHeading ?: 'Related program outcome'}</th>
2323
</g:if>
2424
<th class="remove"></th>
2525
</tr>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<thead>
66
<tr>
77
<th class="index"></th>
8-
<th class="partner-name">Partner name
8+
<th class="partner-name">${partnerNameHeading ?: 'Partner name'}
99
<fc:iconHelp title="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.'}</fc:iconHelp></th>
10-
<th class="partnership-nature">Nature of partnership<fc:iconHelp title="Nature of partnership">${helpTextPartnerNature ?: 'Very briefly indicate how the partner is contributing to the project.'}</fc:iconHelp></th>
11-
<th class="partner-organisation-type">Type of organisation<fc:iconHelp title="Type of organisation">${helpTextPartnerOrg ?: 'Select the most appropriate partner type from the list provided.'}</fc:iconHelp></th>
10+
<th class="partnership-nature">${naturePartnershipHeading ?: 'Nature of partnership'}<fc:iconHelp title="Nature of partnership">${helpTextPartnerNature ?: 'Very briefly indicate how the partner is contributing to the project.'}</fc:iconHelp></th>
11+
<th class="partner-organisation-type">${typeOrganisationHeading ?: 'Type of organisation'}<fc:iconHelp title="Type of organisation">${helpTextPartnerOrg ?: 'Select the most appropriate partner type from the list provided.'}</fc:iconHelp></th>
1212
<th class="remove"></th>
1313
</tr>
1414
</thead>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<tr>
77
<th class="index" rowspan="2"></th>
88
<th class="service required" rowspan="2">${serviceName ?: "Service"}</th>
9-
<th class="score required" rowspan="2" style="min-width: 500px;">Target measure</th>
9+
<th class="score required" rowspan="2" style="min-width: 500px;">${targetMeasureHeading ?: 'Target measure'}</th>
1010
<!-- ko if: forecastPeriods && forecastPeriods.length -->
11-
<th data-bind="attr:{colspan:forecastPeriods.length+1}">Annual target forecast (indicative only) <fc:iconHelp>${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."}</fc:iconHelp></th>
11+
<th data-bind="attr:{colspan:forecastPeriods.length+1}">${annualTargetHeading ?: 'Annual target forecast (indicative only)'} <fc:iconHelp>${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."}</fc:iconHelp></th>
1212
<!-- /ko -->
1313
</tr>
1414
<tr>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<tr>
77
<th class="index"></th>
88
<th class="required service">${serviceName ?: "Project Service"}</th>
9-
<th class="required score">Target measure</th>
9+
<th class="required score">${targetMeasureHeading ?: 'Target measure'}</th>
1010
<th></th>
1111
</tr>
1212
</thead>
@@ -33,8 +33,8 @@
3333

3434
<tr>
3535
<td class="index"></td>
36-
<th>Project Outcome/s</th>
37-
<th>Target</th>
36+
<th>${projectOutcomesHeading ?: 'Project Outcome/s'}</th>
37+
<th>${targetHeading ?: 'Target'}</th>
3838
<th></th>
3939
</tr>
4040
<!-- ko foreach:outcomeTargets -->

0 commit comments

Comments
 (0)