Skip to content
Snippets Groups Projects
Commit 6d21556d authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Text updates

parent 3867df5e
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
--><#include "../../master.ftl"> --><#include "../../master.ftl">
<#macro page_head> <#macro page_head>
<title>Barkbilleregistrering: Fellelokalitet-kandidater for sesongen ${season}</title> <title>Barkbilleovervåking: Fellelokalitet-kandidater for sesongen ${season}</title>
</#macro> </#macro>
<#macro page_contents> <#macro page_contents>
<#if messageKey?has_content && messageKey=="activateOK"> <#if messageKey?has_content && messageKey=="activateOK">
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
<p> <p>
<a href="/barkbeetle?season=${season}" class="btn btn-default back" role="button">${i18nBundle.back}</a> <a href="/barkbeetle?season=${season}" class="btn btn-default back" role="button">${i18nBundle.back}</a>
</p> </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-inline">
<div class="form-group"> <div class="form-group">
Velg sesong <select class="form-control" onchange="window.location.href='/barkbeetle?action=listSeasonTrapsiteCandidates&season=' + this.options[this.selectedIndex].value;"> Velg sesong <select class="form-control" onchange="window.location.href='/barkbeetle?action=listSeasonTrapsiteCandidates&season=' + this.options[this.selectedIndex].value;">
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
--><#include "../../master.ftl"> --><#include "../../master.ftl">
<#macro page_head> <#macro page_head>
<title>Barkbilleregistrering: Slett fellelokalitet for ${seasonTrapsite.season}</title> <title>Barkbilleovervåking: Slett fellelokalitet for ${seasonTrapsite.season}</title>
</#macro> </#macro>
<#macro custom_js> <#macro custom_js>
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
</#macro> </#macro>
<#macro page_contents> <#macro page_contents>
<h1>Barkbilleovervåking</h1>
<h1>Slett fellelokalitet for sesongen ${seasonTrapsite.season}</h1> <h2>Slett fellelokalitet for sesongen ${seasonTrapsite.season}</h2>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
--><#include "../../master.ftl"> --><#include "../../master.ftl">
<#macro page_head> <#macro page_head>
<title>Barkbilleregistrering: Rediger fellelokalitet for ${season}</title> <title>Barkbilleovervåking: Rediger fellelokalitet for ${season}</title>
</#macro> </#macro>
<#macro custom_js> <#macro custom_js>
<script type="text/javascript" src="/js/constants.js"></script> <script type="text/javascript" src="/js/constants.js"></script>
...@@ -171,7 +171,8 @@ ...@@ -171,7 +171,8 @@
<p> <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> <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> </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="row">
<div class="col-md-11"> <div class="col-md-11">
<p>Alle feller må være av typen BEKA (=Nove, se bildet) og feromon av typen <p>Alle feller må være av typen BEKA (=Nove, se bildet) og feromon av typen
......
...@@ -17,13 +17,14 @@ ...@@ -17,13 +17,14 @@
--><#include "../../master.ftl"> --><#include "../../master.ftl">
<#macro page_head> <#macro page_head>
<title>Barkbilleregistrering: Fellelokaliteter for sesongen ${season}</title> <title>Barkbilleovervåking: Fellelokaliteter for sesongen ${season}</title>
</#macro> </#macro>
<#macro page_contents> <#macro page_contents>
<#if messageKey?has_content && messageKey=="deleteOK"> <#if messageKey?has_content && messageKey=="deleteOK">
<div class="alert alert-success">Fellelokaliteten ble slettet</div> <div class="alert alert-success">Fellelokaliteten ble slettet</div>
</#if> </#if>
<h1>Fellelokaliteter for sesongen ${season}</h1> <h1>Barkbilleovervåking</h1>
<h2>Fellelokaliteter for sesongen ${season}</h2>
<div class="form-inline"> <div class="form-inline">
<div class="form-group"> <div class="form-group">
Velg sesong <select class="form-control" onchange="window.location.href='/barkbeetle?season=' + this.options[this.selectedIndex].value;"> Velg sesong <select class="form-control" onchange="window.location.href='/barkbeetle?season=' + this.options[this.selectedIndex].value;">
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
<option value="${availableSeason}" <#if availableSeason==season>selected</#if>>${availableSeason}</option> <option value="${availableSeason}" <#if availableSeason==season>selected</#if>>${availableSeason}</option>
</#list> </#list>
</select> </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> </div>
<div class="row"> <div class="row">
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
--><#include "../../master.ftl"> --><#include "../../master.ftl">
<#assign siteName= seasonTrapsite.countyName + "/" + seasonTrapsite.municipalityName + "/" + seasonTrapsite.ownerName> <#assign siteName= seasonTrapsite.countyName + "/" + seasonTrapsite.municipalityName + "/" + seasonTrapsite.ownerName>
<#macro page_head> <#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>
<#macro page_contents> <#macro page_contents>
<#if messageKey?has_content> <#if messageKey?has_content>
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
<p> <p>
<a href="/barkbeetle?action=editSeasonTrapsite&season=${seasonTrapsite.season}&seasonTrapsiteId=${seasonTrapsite.seasonTrapsiteId}" class="btn btn-default back" role="button">${i18nBundle.back}</a> <a href="/barkbeetle?action=editSeasonTrapsite&season=${seasonTrapsite.season}&seasonTrapsiteId=${seasonTrapsite.seasonTrapsiteId}" class="btn btn-default back" role="button">${i18nBundle.back}</a>
</p> </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="row">
<div class="col-md-11"> <div class="col-md-11">
<p> <p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment