diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteCandidateList.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteCandidateList.ftl index f9006dab40e1469016de0ecb1de8f8b465775210..de62e7c0af748894e44e6eb013511c33ae392a7c 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteCandidateList.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteCandidateList.ftl @@ -17,7 +17,7 @@ --><#include "../../master.ftl"> <#macro page_head> - <title>Barkbilleregistrering: Fellelokalitet-kandidater for sesongen ${season}</title> + <title>Barkbilleovervåking: Fellelokalitet-kandidater for sesongen ${season}</title> </#macro> <#macro page_contents> <#if messageKey?has_content && messageKey=="activateOK"> @@ -29,7 +29,8 @@ <p> <a href="/barkbeetle?season=${season}" class="btn btn-default back" role="button">${i18nBundle.back}</a> </p> -<h1>Fellelokalitet-kandidater for sesongen ${season}</h1> +<h1>Barkbilleovervåking</h1> +<h2>Fellelokalitet-kandidater for sesongen ${season}</h2> <div class="form-inline"> <div class="form-group"> Velg sesong <select class="form-control" onchange="window.location.href='/barkbeetle?action=listSeasonTrapsiteCandidates&season=' + this.options[this.selectedIndex].value;"> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteDeleteForm.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteDeleteForm.ftl index 1769fd87e623c50d850d0175e339e4e53af6e452..84b62f57bf41c49a0b1984385c01b3e1affb73ae 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteDeleteForm.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteDeleteForm.ftl @@ -17,7 +17,7 @@ --><#include "../../master.ftl"> <#macro page_head> - <title>Barkbilleregistrering: Slett fellelokalitet for ${seasonTrapsite.season}</title> + <title>Barkbilleovervåking: Slett fellelokalitet for ${seasonTrapsite.season}</title> </#macro> <#macro custom_js> @@ -26,8 +26,8 @@ </#macro> <#macro page_contents> - - <h1>Slett fellelokalitet for sesongen ${seasonTrapsite.season}</h1> + <h1>Barkbilleovervåking</h1> + <h2>Slett fellelokalitet for sesongen ${seasonTrapsite.season}</h2> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl index b44c07862c9dda628333b8f20e6e19ee6cc4e46f..a8ceec5d1769e7c919593ce4cfc46479dfc85d5f 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl @@ -17,7 +17,7 @@ --><#include "../../master.ftl"> <#macro page_head> - <title>Barkbilleregistrering: Rediger fellelokalitet for ${season}</title> + <title>Barkbilleovervåking: Rediger fellelokalitet for ${season}</title> </#macro> <#macro custom_js> <script type="text/javascript" src="/js/constants.js"></script> @@ -171,7 +171,8 @@ <p> <a href="/barkbeetle?season=${season}<#if seasonTrapsite.seasonTrapsiteId?has_content && !seasonTrapsite.activated>&action=listSeasonTrapsiteCandidates</#if>" class="btn btn-default back" role="button">${i18nBundle.back}</a> </p> - <h1><#if seasonTrapsite.seasonTrapsiteId?has_content>Rediger<#else>Ny</#if> fellelokalitet</h1> + <h1>Barkbilleovervåking</h1> + <h2><#if seasonTrapsite.seasonTrapsiteId?has_content>Rediger<#else>Ny</#if> fellelokalitet</h2> <div class="row"> <div class="col-md-11"> <p>Alle feller må være av typen BEKA (=Nove, se bildet) og feromon av typen diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl index 10374c9d03e2335d8315ff1dc115390538f1e466..89b01a1fd161c49fadc0ba9a519a0837e06bab21 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl @@ -17,13 +17,14 @@ --><#include "../../master.ftl"> <#macro page_head> - <title>Barkbilleregistrering: Fellelokaliteter for sesongen ${season}</title> + <title>Barkbilleovervåking: Fellelokaliteter for sesongen ${season}</title> </#macro> <#macro page_contents> <#if messageKey?has_content && messageKey=="deleteOK"> <div class="alert alert-success">Fellelokaliteten ble slettet</div> </#if> -<h1>Fellelokaliteter for sesongen ${season}</h1> + <h1>Barkbilleovervåking</h1> +<h2>Fellelokaliteter for sesongen ${season}</h2> <div class="form-inline"> <div class="form-group"> Velg sesong <select class="form-control" onchange="window.location.href='/barkbeetle?season=' + this.options[this.selectedIndex].value;"> @@ -31,6 +32,7 @@ <option value="${availableSeason}" <#if availableSeason==season>selected</#if>>${availableSeason}</option> </#list> </select> + <div class="alert alert-warning"><i class="fa fa-arrow-up"></i> <span style="font-weight: bold; font-style: italic;">Pass på at du har valgt rett sesong!</span></div> </div> </div> <div class="row"> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl index 63a161c4721ba080746f7e1d4ccfb8abd7f6637d..00ca695868ee69f7bface315f7a8cf94951131c1 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl @@ -18,7 +18,7 @@ --><#include "../../master.ftl"> <#assign siteName= seasonTrapsite.countyName + "/" + seasonTrapsite.municipalityName + "/" + seasonTrapsite.ownerName> <#macro page_head> - <title>Barkbilleregistrering: Registrer data for lokalitet ${siteName}, sesong ${seasonTrapsite.season}</title> + <title>Barkbilleovervåking: Registrer data for lokalitet ${siteName}, sesong ${seasonTrapsite.season}</title> </#macro> <#macro page_contents> <#if messageKey?has_content> @@ -27,7 +27,8 @@ <p> <a href="/barkbeetle?action=editSeasonTrapsite&season=${seasonTrapsite.season}&seasonTrapsiteId=${seasonTrapsite.seasonTrapsiteId}" class="btn btn-default back" role="button">${i18nBundle.back}</a> </p> - <h1>Registrer data for lokalitet ${siteName}, sesong ${seasonTrapsite.season}</h1> + <h1>Barkbilleovervåking</h1> + <h2>Registrer data for lokalitet ${siteName}, sesong ${seasonTrapsite.season}</h2> <div class="row"> <div class="col-md-11"> <p>