diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100755 index cc4f3e6ee5316c05b2ee7fcaccb0e5eed7c18ac5..0000000000000000000000000000000000000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//common/util.py=utf-8 -encoding//forecasts/models.py=utf-8 -encoding//information/migrations/0001_initial.py=utf-8 -encoding//vips_messages/migrations/0004_auto_20160712_1001.py=utf-8 diff --git a/VIPSWeb/static/css/vipsweb.css b/VIPSWeb/static/css/vipsweb.css index 835289b28289f270b84d9182fb4b7672030b2cb4..a2a4db4f40542c321faa3353e987b4ff09c6d609 100755 --- a/VIPSWeb/static/css/vipsweb.css +++ b/VIPSWeb/static/css/vipsweb.css @@ -282,6 +282,11 @@ div.alert-nowarning{ background-color: #dddddd; } +div.alert-success{ + background-color: #79bd8b; + color: black; +} + /* .ol-attribution { top: 5px; diff --git a/cydiapomonella/templates/cydiapomonella/index.html b/cydiapomonella/templates/cydiapomonella/index.html index ac2f9fb6fe597a6e643533aa8c89334105ac4abb..14494e78d207161f879a31abbda212caec9c2962 100644 --- a/cydiapomonella/templates/cydiapomonella/index.html +++ b/cydiapomonella/templates/cydiapomonella/index.html @@ -719,7 +719,7 @@ <h1>{% trans "Calculate the risk of attack by the coddling moth" %}</h1> </div> <div class="col-md-12"> - <h4>{% trans ' Under kan du sjekke kveldstemperatur og nedbør for klimastasjoner i regioner med eplevikler. <a href="https://www.vips-landbruk.no/information/12/#eplevikler">Les mer her</a>. <br> Dersom alle kriteriene for egglegging er oppfylt, beregn påløpt varmesum nedenfor. ' %}</h4> + <h4>{% trans 'Her kan du sjekke kveldstemperatur og nedbør for værstasjoner i regioner med eplevikler. <a href="https://www.vips-landbruk.no/information/12/#eplevikler">Les mer her</a>. <br> Dersom alle kriteriene for egglegging er oppfylt, beregn påløpt varmesum nedenfor. ' %}</h4> </div> <div class="clearfix"></div> <div class="container-fluid"> @@ -812,7 +812,7 @@ </form> </div> <div><br></div> - <div class="row alert alert-warning"> + <div class="row alert alert-success"> {% trans "Heat sum, with a base temperature of 10 degrees Celcius, calculated for " %} <b><span id='idSpanWeatherStationName'>-</span></b> {% trans "weather station for the period starting with" %} <b><span id="idSpanStartDate">-</span></b> {% trans "and ending with" %} <b><span id="idSpanEndDate">--</span></b> (<b><span id="idSpanDateDifference">-</span></b> {% trans "days" %}) {% trans "is" %} : <b><span id="idDivResultNonNegative"></span></b> {% trans "day degrees" %} </div> </div>