diff --git a/applefruitmoth/static/applefruitmoth/applefruitmoth.png b/applefruitmoth/static/applefruitmoth/applefruitmoth.png new file mode 100644 index 0000000000000000000000000000000000000000..6abac7ad726c0c12440fb553c692cdb3dea8b03e Binary files /dev/null and b/applefruitmoth/static/applefruitmoth/applefruitmoth.png differ diff --git a/applefruitmoth/static/applefruitmoth/applefruitmothblooming.png b/applefruitmoth/static/applefruitmoth/applefruitmothblooming.png new file mode 100644 index 0000000000000000000000000000000000000000..2ee0a8706e186bc1d8f7a688351d0e0d66df70a7 Binary files /dev/null and b/applefruitmoth/static/applefruitmoth/applefruitmothblooming.png differ diff --git a/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js b/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js index 3384a0016511db4158e70a9ff8295ec23ee98bae..dfa5a49c8eccc730ea2b658f3aeca579ef204bf1 100644 --- a/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js +++ b/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js @@ -162,8 +162,8 @@ function displayResults(data, basisTemp, name, start, end) { let infotext = document.createElement("p"); var text1 = "<p>Varmesum, med basistemperatur " + basisTemp + " °C beregnet ut fra middeltemperatur i 2m høyde for " + name + " værstasjon for perioden fra og med " + start + " til og med " + end + " er: </p>"; - var text2 = "<p><b>" + lastValue + "</b> døgngrader\n\n</p>"; - + var text2 = "<p><b>" + lastValue + "</b> døgngrader\n\n</p>"; + infotext = text1 + text2; document.getElementById("textInfo").innerHTML=infotext; @@ -338,8 +338,6 @@ function displayResults(data, basisTemp, name, start, end) { } }); - - } diff --git a/applefruitmoth/templates/applefruitmoth/index.html b/applefruitmoth/templates/applefruitmoth/index.html index 1749e12e2bc321cb516ce6543da4b936f22ee58b..a5cf427f1fd91e2464763a3d03ef2aa5b3d99d8b 100755 --- a/applefruitmoth/templates/applefruitmoth/index.html +++ b/applefruitmoth/templates/applefruitmoth/index.html @@ -105,10 +105,12 @@ </div> - <div class="col-md-8"> - <div class="col-md-1"></div> - <div class="col-md-10"> + <div class="col-md-9"> + <div class="col-md-2"></div> + <div class="col-md-9"> + <br> <div class="form-group" id="textInfo" ></div> + <img id="image" src = "{% static 'applefruitmoth/applefruitmoth.png' %}" style="width:100%; height:auto;""> </div> <div class="col-md-1"></div> </div> @@ -142,7 +144,7 @@ <script type="text/javascript" src="{% url "views.settings_js" %}"></script> <script type="text/javascript" src="{% static "js/util.js" %}"></script> <script type="text/javascript" src="{% static "applefruitmoth/js/map.js" %}"></script> -<script type="text/javascript" src="{% static "applefruitmoth/js/test.js" %}"></script> +<script type="text/javascript" src="{% static "applefruitmoth/js/applefruitmoth.js" %}"></script> <script src="{% static "js/3rdparty/moment-with-locales.min.js" %}"></script> <script type="text/javascript">