Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

$3474 - made headings configurable #3481

Merged
merged 2 commits into from
Mar 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions grails-app/views/project/meriPlan/_description.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<table class="table">
<tbody>
<tr class="header required">
<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>
<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>
</tr>
<tr>
<td><textarea class="form-control form-control-sm" rows="5" data-validation-engine="validate[required,maxSize[${maxSize ?: 1500}]]"
Expand All @@ -17,7 +17,7 @@
</div>
</g:if>
<g:else>
<h4>Project description<g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></h4>
<h4>${projectDescHeading ?: 'Project description'}<g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></h4>
<g:if test="${explanation}">
${explanation}
</g:if>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- ko with:details.baseline -->
<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>
<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>
<br/>
<strong>Project baseline</strong>
<strong>${subtitle?:'Project baseline'}</strong>
<g:set var="baselineHeader">

</g:set>
Expand All @@ -10,11 +10,11 @@
<tr class="header">
<th class="code"></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">${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="monitoring-data required">${baseLineHeading ?: 'Baseline data'} <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
<th class="baseline required">${baseLineDescHeading ?: 'Baseline data description'} <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
<th class="service required">${servicesHeading ?: 'Project service / Target measure/s'}<g:if test="${baselineServiceHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
<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>
<th class="baseline-evidence required">${evidenceHeading ?: 'Evidence to be retained'} <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
<th class="remove"></th>
</tr>

Expand Down
8 changes: 4 additions & 4 deletions grails-app/views/project/meriPlan/_extendedKeyThreats.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<tr>
<th class="index"></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="threat-code required">${threatsHeading ?:'Threats / Threatening processes'}</th>
<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>
<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="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>
<th class="evidence required">${evidenceHeading ?: 'Evidence to be retained'} <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
<th class="remove"></th>
</tr>
</thead>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h4>First Nations people involvement</h4>
<h4>${title ?: 'First Nations people involvement'}</h4>

<div class="form-group row">
<div class="col-sm-8">
Expand Down
4 changes: 2 additions & 2 deletions grails-app/views/project/meriPlan/_name.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<tbody>

<tr class="header required">
<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>
<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>
</tr>
<tr>
<td>
Expand All @@ -19,7 +19,7 @@
</div>
</g:if>
<g:else>
<h4 class="header-with-help">Project name</h4><fc:iconHelp>The project name will be visible on project overview page in MERIT</fc:iconHelp>
<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>
<g:if test="${explanation}">
${explanation}
</g:if>
Expand Down
2 changes: 1 addition & 1 deletion grails-app/views/project/meriPlan/_outcomeStatements.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<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">${investmentPriorityHeading ?: 'Investment priority'}</th>
<th class="program-outcome required">Related program outcome</th>
<th class="program-outcome required">${programOutcomeHeading ?: 'Related program outcome'}</th>
</g:if>
<th class="remove"></th>
</tr>
Expand Down
8 changes: 4 additions & 4 deletions grails-app/views/project/meriPlan/_projectPartnerships.gsp
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div id="project-partnership" class="well well-small">
<label><b>Project partnerships</b><g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></label>
<label><b>${title?:'Project partnerships'}</b><g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></label>
<p>${explanation?: "Provide details on all project partners and the nature and scope of their participation in the project."}</p>
<table class="table">
<thead>
<tr>
<th class="index"></th>
<th class="partner-name">Partner name
<th class="partner-name">${partnerNameHeading ?: 'Partner name'}
<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>
<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>
<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>
<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>
<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>
<th class="remove"></th>
</tr>
</thead>
Expand Down
4 changes: 2 additions & 2 deletions grails-app/views/project/meriPlan/_serviceForecasts.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<tr>
<th class="index" rowspan="2"></th>
<th class="service required" rowspan="2">${serviceName ?: "Service"}</th>
<th class="score required" rowspan="2" style="min-width: 500px;">Target measure</th>
<th class="score required" rowspan="2" style="min-width: 500px;">${targetMeasureHeading ?: 'Target measure'}</th>
<!-- ko if: forecastPeriods && forecastPeriods.length -->
<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>
<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>
<!-- /ko -->
</tr>
<tr>
Expand Down
6 changes: 3 additions & 3 deletions grails-app/views/project/meriPlan/_serviceOutcomeTargets.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<tr>
<th class="index"></th>
<th class="required service">${serviceName ?: "Project Service"}</th>
<th class="required score">Target measure</th>
<th class="required score">${targetMeasureHeading ?: 'Target measure'}</th>
<th></th>
</tr>
</thead>
Expand All @@ -33,8 +33,8 @@

<tr>
<td class="index"></td>
<th>Project Outcome/s</th>
<th>Target</th>
<th>${projectOutcomesHeading ?: 'Project Outcome/s'}</th>
<th>${targetHeading ?: 'Target'}</th>
<th></th>
</tr>
<!-- ko foreach:outcomeTargets -->
Expand Down
4 changes: 2 additions & 2 deletions grails-app/views/project/meriPlanChanges/_description.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<table class="table">
<thead>
<tr>
<th>Project description</th>
<th>${projectDescHeading ?: 'Project description'}</th>
</tr>
</thead>
<tbody>
Expand All @@ -15,7 +15,7 @@
</table>
</g:if>
<g:else>
<h4>Project description</h4>
<h4>${projectDescHeading ?: 'Project description'}</h4>
<td style="display:none" class="original" data-bind="text:details.descriptionComparison"></td>
<td style="display:none" class="changed" data-bind="text:detailsChanged.descriptionComparison"></td>
<td wrap class="diff1"></td>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<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>
<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>
<br/>
<strong>Project baseline</strong>
<strong>${subtitle ?: "Project baseline"}</strong>
<g:set var="baselineHeader">

</g:set>
Expand All @@ -12,12 +12,12 @@
<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/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="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="outcome required">${outcomeStatementHeading ?: 'Outcome statement/s'}</th>
<th class="monitoring-data required">${baseLineHeading ?: 'Baseline data'} <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
<th class="baseline required">${baseLineDescHeading ?: 'Baseline data description'} <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
<th class="service required">${servicesHeading ?: 'Project service / Target measure/s'}<g:if test="${baselineServiceHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
<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>
<th class="baseline-evidence required">${evidenceHeading ?: 'Evidence to be retained'} <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
</tr>

<tr class="baseline-row">
Expand Down
12 changes: 6 additions & 6 deletions grails-app/views/project/meriPlanChanges/_extendedKeyThreats.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<thead>
<tr>
<th class="index"></th>
<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 / 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>
<th class="related-outcomes">${outcomeStatementHeading ?: 'Outcome Statement/s'}</th>
<th class="threat-code">${threatsHeading ?:'Threats / Threatening processes'}</th>
<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>
<th class="services">${servicesHeading ?: 'Project service / Target measure/s to address threats'}</th>
<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>
<th class="evidence">${evidenceHeading ?: 'Evidence to be retained'} <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
</tr>
</thead>
<tbody>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h4>First Nations people involvement</h4>
<h4>${title ?: 'First Nations people involvement'}</h4>

<div class="row">
<div class="col-md-8">
Expand Down
4 changes: 2 additions & 2 deletions grails-app/views/project/meriPlanChanges/_name.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<table class="table">
<thead>
<tr>
<th>Project</th>
<th>${projectNameHeading?:"Project"}</th>
</tr>
</thead>
<tbody>
Expand All @@ -15,7 +15,7 @@
</table>
</g:if>
<g:else>
<h4>Project name</h4>
<h4>${projectNameHeading?:"Project name"}</h4>
<span style="display:none" class="original" data-bind="text:details.nameComparison"></span>
<span style="display:none" class="changed" data-bind="text:detailsChanged.nameComparison"></span>
<span wrap class="diff1"></span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<tr>
<th class="code"></th>
<th class="outcome">${subtitle ?: ""} </th>
<th class="investment-priority">Investment priority</th>
<th class="program-outcome">Related program outcome/s</th>
<th class="investment-priority">${investmentPriorityHeading ?: 'Investment priority'}</th>
<th class="program-outcome">${programOutcomeHeading ?: 'Related program outcome/s'}</th>
</tr>
</thead>
<g:if test="${outcomeType == 'mid'}">
Expand Down
Loading
Loading