Skip to content

Commit 58c5e6a

Browse files
temitemi
committed
$3474
- added more configuration
1 parent 08eeb9e commit 58c5e6a

21 files changed

+66
-66
lines changed

‎grails-app/views/project/meriPlan/_description.gsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<table class="table">
55
<tbody>
66
<tr class="header required">
7-
<th class="required">Project description (${maxSize ?: 1500} character limit) <fc:iconHelp>${helpTextHeading ?:'Project description will be visible on project overview page in MERIT.'}</fc:iconHelp></th>
7+
<th class="required">${projectDescHeading ?: 'Project description'} (${maxSize ?: 1500} character limit) <fc:iconHelp>${helpTextHeading ?:'Project description will be visible on project overview page in MERIT.'}</fc:iconHelp></th>
88
</tr>
99
<tr>
1010
<td><textarea class="form-control form-control-sm" rows="5" data-validation-engine="validate[required,maxSize[${maxSize ?: 1500}]]"
@@ -17,7 +17,7 @@
1717
</div>
1818
</g:if>
1919
<g:else>
20-
<h4>Project description<g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></h4>
20+
<h4>${projectDescHeading ?: 'Project description'}<g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></h4>
2121
<g:if test="${explanation}">
2222
${explanation}
2323
</g:if>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- ko with:details.baseline -->
2-
<h4 class="header-with-help">Monitoring methodology</h4><fc:iconHelp html="true">${titleHelpText ?: "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. Refer to the Regional Land Partnerships Evaluation Plan, which provides guidance on baselines and the monitoring indicators for each RLP outcome. Note, other monitoring indicators can also be used."}</fc:iconHelp>
2+
<h4 class="header-with-help">${title ?: 'Monitoring methodology'}</h4><fc:iconHelp html="true">${titleHelpText ?: "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. Refer to the Regional Land Partnerships Evaluation Plan, which provides guidance on baselines and the monitoring indicators for each RLP outcome. Note, other monitoring indicators can also be used."}</fc:iconHelp>
33
<br/>
4-
<strong>Project baseline</strong>
4+
<strong>${subtitle?:'Project baseline'}</strong>
55
<g:set var="baselineHeader">
66

77
</g:set>
@@ -12,7 +12,7 @@
1212
<th class="outcome required">${outcomeStatementHeading ?: 'Outcome statement/s'}</th>
1313
<th class="monitoring-data required">${baseLineHeading ?: 'Baseline data'} <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
1414
<th class="baseline required">${baseLineDescHeading ?: 'Baseline data description'} <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
15-
<th class="service required">${servicesHeading ?: 'Project service / Target measure/s'}<g:if test="${baselineHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
15+
<th class="service required">${servicesHeading ?: 'Project service / Target measure/s'}<g:if test="${baselineServiceHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
1616
<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>
1717
<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>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div id="project-partnership" class="well well-small">
2-
<label><b>Project partnerships</b><g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></label>
2+
<label><b>${title?:'Project partnerships'}</b><g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></label>
33
<p>${explanation?: "Provide details on all project partners and the nature and scope of their participation in the project."}</p>
44
<table class="table">
55
<thead>

‎grails-app/views/project/meriPlanChanges/_description.gsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<table class="table">
33
<thead>
44
<tr>
5-
<th>Project description</th>
5+
<th>${projectDescHeading ?: 'Project description'}</th>
66
</tr>
77
</thead>
88
<tbody>
@@ -15,7 +15,7 @@
1515
</table>
1616
</g:if>
1717
<g:else>
18-
<h4>Project description</h4>
18+
<h4>${projectDescHeading ?: 'Project description'}</h4>
1919
<td style="display:none" class="original" data-bind="text:details.descriptionComparison"></td>
2020
<td style="display:none" class="changed" data-bind="text:detailsChanged.descriptionComparison"></td>
2121
<td wrap class="diff1"></td>

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<h4 class="header-with-help">Monitoring methodology</h4><fc:iconHelp>${titleHelpText ?: "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. Refer to the Regional Land Partnerships Evaluation Plan, which provides guidance on baselines and the monitoring indicators for each RLP outcome. Note, other monitoring indicators can also be used."}</fc:iconHelp>
1+
<h4 class="header-with-help">${title?:"Monitoring methodology"}</h4><fc:iconHelp>${titleHelpText ?: "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. Refer to the Regional Land Partnerships Evaluation Plan, which provides guidance on baselines and the monitoring indicators for each RLP outcome. Note, other monitoring indicators can also be used."}</fc:iconHelp>
22
<br/>
3-
<strong>Project baseline</strong>
3+
<strong>${subtitle ?: "Project baseline"}</strong>
44
<g:set var="baselineHeader">
55

66
</g:set>
@@ -12,12 +12,12 @@
1212
<g:set var="monitoringModel" value="${changed.custom.details.monitoring?.rows.find {it.relatedBaseline == code}}"/>
1313
<tr class="header">
1414
<th class="code"></th>
15-
<th class="outcome required">Outcome statement/s</th>
16-
<th class="monitoring-data required">Baseline data <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
17-
<th class="baseline required">Baseline data description <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
18-
<th class="service required">Project Service / Target Measure/s <g:if test="${baselineHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
19-
<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>
20-
<th class="baseline-evidence required">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
15+
<th class="outcome required">${outcomeStatementHeading ?: 'Outcome statement/s'}</th>
16+
<th class="monitoring-data required">${baseLineHeading ?: 'Baseline data'} <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
17+
<th class="baseline required">${baseLineDescHeading ?: 'Baseline data description'} <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
18+
<th class="service required">${servicesHeading ?: 'Project service / Target measure/s'}<g:if test="${baselineServiceHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
19+
<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>
20+
<th class="baseline-evidence required">${evidenceHeading ?: 'Evidence to be retained'} <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
2121
</tr>
2222

2323
<tr class="baseline-row">

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<thead>
1111
<tr>
1212
<th class="index"></th>
13-
<th class="related-outcomes">Outcome Statement/s</th>
14-
<th class="threat-code">Threats / Threatening processes</th>
15-
<th class="threat required">Description <fc:iconHelp>${threatHelpText ?: "Describe the key threats (or key threatening processes) to the primary investment priority"}</fc:iconHelp></th>
16-
<th class="services">Project service / Target measure/s to address threats</th>
17-
<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>
18-
<th class="evidence">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
13+
<th class="related-outcomes">${outcomeStatementHeading ?: 'Outcome Statement/s'}</th>
14+
<th class="threat-code">${threatsHeading ?:'Threats / Threatening processes'}</th>
15+
<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>
16+
<th class="services">${servicesHeading ?: 'Project service / Target measure/s to address threats'}</th>
17+
<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>
18+
<th class="evidence">${evidenceHeading ?: 'Evidence to be retained'} <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
1919
</tr>
2020
</thead>
2121
<tbody>

‎grails-app/views/project/meriPlanChanges/_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="row">
44
<div class="col-md-8">

‎grails-app/views/project/meriPlanChanges/_name.gsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<table class="table">
33
<thead>
44
<tr>
5-
<th>Project</th>
5+
<th>${projectNameHeading?:"Project"}</th>
66
</tr>
77
</thead>
88
<tbody>
@@ -15,7 +15,7 @@
1515
</table>
1616
</g:if>
1717
<g:else>
18-
<h4>Project name</h4>
18+
<h4>${projectNameHeading?:"Project name"}</h4>
1919
<span style="display:none" class="original" data-bind="text:details.nameComparison"></span>
2020
<span style="display:none" class="changed" data-bind="text:detailsChanged.nameComparison"></span>
2121
<span wrap class="diff1"></span>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<tr>
88
<th class="code"></th>
99
<th class="outcome">${subtitle ?: ""} </th>
10-
<th class="investment-priority">Investment priority</th>
11-
<th class="program-outcome">Related program outcome/s</th>
10+
<th class="investment-priority">${investmentPriorityHeading ?: 'Investment priority'}</th>
11+
<th class="program-outcome">${programOutcomeHeading ?: 'Related program outcome/s'}</th>
1212
</tr>
1313
</thead>
1414
<g:if test="${outcomeType == 'mid'}">

‎grails-app/views/project/meriPlanChanges/_projectPartnerships.gsp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<div id="project-partnership-view" class="well well-small">
2-
<h4>Project partnerships</h4>
2+
<h4>${title ?: 'Project partnerships'}</h4>
33
<table class="table" id="project-partnerships">
44
<thead>
55
<tr>
66
<th class="index"></th>
7-
<th class="partner-name">Partner name</th>
8-
<th class="partnership-nature">Nature of partnership</th>
9-
<th class="partner-organisation-type">Type of organisation</th>
7+
<th class="partner-name">${partnerNameHeading ?: 'Partner name'}</th>
8+
<th class="partnership-nature">${naturePartnershipHeading ?: 'Nature of partnership'}</th>
9+
<th class="partner-organisation-type">${typeOrganisationHeading ?: 'Type of organisation'}</th>
1010
</tr>
1111
</thead>
1212
<tbody>

‎grails-app/views/project/meriPlanChanges/_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="required" rowspan="2">${serviceName ?: "Service"}</th>
9-
<th class="required" rowspan="2" style="min-width: 500px;">Target measure</th>
9+
<th class="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/meriPlanChanges/_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="service required">${serviceName ?: "Project Service"}</th>
9-
<th class="score required">Target measure</th>
9+
<th class="score required">${targetMeasureHeading ?: 'Target measure'}</th>
1010
</tr>
1111
</thead>
1212
<tbody>
@@ -24,8 +24,8 @@
2424
</tr>
2525
<tr>
2626
<td class="index"></td>
27-
<th>Project Outcome/s</th>
28-
<th>Target</th>
27+
<th>${projectOutcomesHeading ?: 'Project Outcome/s'}</th>
28+
<th>${targetHeading ?: 'Target'}</th>
2929
</tr>
3030
<tr class="outcome-target">
3131
<td class="index"></td>

‎grails-app/views/project/meriPlanReadOnly/_description.gsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<table class="table">
33
<thead>
44
<tr>
5-
<th>Project description</th>
5+
<th>${projectDescHeading ?: 'Project description'}</th>
66
</tr>
77
</thead>
88
<tbody>
@@ -13,7 +13,7 @@
1313
</table>
1414
</g:if>
1515
<g:else>
16-
<h4>Project description</h4>
16+
<h4>${projectDescHeading ?: 'Project description'}</h4>
1717
<span class="description" data-bind="text:details.description"></span>
1818
</g:else>
1919

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<!-- ko with:details.baseline -->
2-
<h4 class="header-with-help">Monitoring methodology</h4><fc:iconHelp>${titleHelpText ?: "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. Refer to the Regional Land Partnerships Evaluation Plan, which provides guidance on baselines and the monitoring indicators for each RLP outcome. Note, other monitoring indicators can also be used."}</fc:iconHelp>
2+
<h4 class="header-with-help">${title?:'Monitoring methodology'}</h4><fc:iconHelp>${titleHelpText ?: "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. Refer to the Regional Land Partnerships Evaluation Plan, which provides guidance on baselines and the monitoring indicators for each RLP outcome. Note, other monitoring indicators can also be used."}</fc:iconHelp>
33
<br/>
4-
<strong>Project baseline</strong>
4+
<strong>${subtitle?:'Project baseline'}</strong>
55
<g:set var="baselineHeader">
66

77
</g:set>
88
<table class="table monitoring-baseline extended">
99
<tbody data-bind="foreach: rows">
1010
<tr class="header">
1111
<th class="code"></th>
12-
<th class="outcome required">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>
15-
<th class="service required">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>
12+
<th class="outcome required">${outcomeStatementHeading ?: 'Outcome statement/s<'}/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>
15+
<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">${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
</tr>
1919

2020
<tr class="baseline-row">

0 commit comments

Comments
 (0)