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

A few small fixes

parent 626efde7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VIPSWeb/templatetags/template_helper.py
+ 1
− 1
View file @ 65584b34
...@@ -98,7 +98,7 @@ def generate_frontpage_menu(context): ...@@ -98,7 +98,7 @@ def generate_frontpage_menu(context):
menu_html += '<div class="col-md-%s"><h3>%s</h3>' % (col_md,_(col["label"])) menu_html += '<div class="col-md-%s"><h3>%s</h3>' % (col_md,_(col["label"]))
menu_html += "<ul class='linkList'>" menu_html += "<ul class='linkList'>"
for item in col["items"]: for item in col["items"]:
menu_html += '<li><a href="%s">%s</a></li>' % (item["label"], item["label"]) menu_html += '<li><a href="%s">%s</a></li>' % (item["url"], item["label"])
menu_html += "</ul>" menu_html += "</ul>"
menu_html += "</div>" menu_html += "</div>"
return menu_html return menu_html
......
cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
+ 89
− 96
View file @ 65584b34
...@@ -30,114 +30,107 @@ ...@@ -30,114 +30,107 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Barley net blotch" %}</h1> <div class="singleBlockContainer">
<p> <h1>{% trans "Barley net blotch" %}</h1>
Dette er en testversjon av nye VIPS, som skal erstatte den nåværende websiden fra og med sesongen 2016. <div class="alert alert-danger" role="alert" id="oldIEWarning" style="display:none;">
Byggbrunflekkmodellen er nå klar til bruk i nye VIPS, og derfor er du kanskje noe overraskende sendt hit. Du bruker en gammel versjon av Internet Explorer. Den nye byggbrunflekkmodellen fungerer med
For å gå tilbake til resten av nåværende VIPS, <a href="http://www.vips-landbruk.no">klikk her</a>. de fleste moderne nettlesere, som Chrome, Firefox og Internet Explorer versjon 10 og nyere.
</p>
<div class="alert alert-danger" role="alert" id="oldIEWarning" style="display:none;">
Du bruker en gammel versjon av Internet Explorer. Den nye byggbrunflekkmodellen fungerer med
de fleste moderne nettlesere, som Chrome, Firefox og Internet Explorer versjon 10 og nyere. For
å beregne byggbrunflekk med gammel versjon av Internet Explorer, gå til
<a href="http://www.vips-landbruk.no/warning/wa261s.jsp?modellId=15&lovligVarselId=105">Den
gamle versjonen av byggbrunflekkmodellen</a>
</div>
<form role="form" id="{{ form_id }}">
<div class="row">
<div class="col-md-12">
<h2>{% trans "Background data for the barley net blotch model" %}</h2>
</div>
</div> </div>
<div class="row"> <form role="form" id="{{ form_id }}">
<div class="col-md-6"> <div class="row">
<input type="hidden" name="timeZone" value="Europe/Oslo"/> <div class="col-md-12">
<div class="form-group"> <h2>{% trans "Background data for the barley net blotch model" %}</h2>
<label for="weatherStationId">{% trans "Weather station" %}</label>
<select name="weatherStationId" id="weatherStationId" class="form-control" onblur="validateField(this);">
</select>
<span class="help-block" id="{{ form_id }}_weatherStationId_validation"></span>
</div>
<div class="form-group">
<label for="sowingDate">{% trans "Sowing date" %}</label>
<input type="date" name="sowingDate" class="form-control" max="{{max_sowing_date|date:'Y-m-d'}}" onblur="validateField(this);"/>
<span class="help-block" id="{{ form_id }}_sowingDate_validation"></span>
</div> </div>
<div class="form-group"> </div>
<label for="cropOrganismId">{% trans "Crop" %}</label> <div class="row">
<select name="cropOrganismId" id="cropOrganismId" class="form-control" onblur="validateField(this);"> <div class="col-md-6">
</select> <input type="hidden" name="timeZone" value="Europe/Oslo"/>
<span class="help-block" id="{{ form_id }}_cropOrganismId_validation"></span> <div class="form-group">
</div> <label for="weatherStationId">{% trans "Weather station" %}</label>
<div class="form-group"> <select name="weatherStationId" id="weatherStationId" class="form-control" onblur="validateField(this);">
<input type="checkbox" name="sameCropAsLastSeason"/> </select>
<label for="sameCropAsLastSeason">{% trans "Same crop as last season" %}</label><br/> <span class="help-block" id="{{ form_id }}_weatherStationId_validation"></span>
<span class="help-block" id="{{ form_id }}_sameCropAsLastSeason_validation"></span> </div>
<div class="form-group">
<label for="sowingDate">{% trans "Sowing date" %}</label>
<input type="date" name="sowingDate" class="form-control" max="{{max_sowing_date|date:'Y-m-d'}}" onblur="validateField(this);"/>
<span class="help-block" id="{{ form_id }}_sowingDate_validation"></span>
</div>
<div class="form-group">
<label for="cropOrganismId">{% trans "Crop" %}</label>
<select name="cropOrganismId" id="cropOrganismId" class="form-control" onblur="validateField(this);">
</select>
<span class="help-block" id="{{ form_id }}_cropOrganismId_validation"></span>
</div>
<div class="form-group">
<input type="checkbox" name="sameCropAsLastSeason"/>
<label for="sameCropAsLastSeason">{% trans "Same crop as last season" %}</label><br/>
<span class="help-block" id="{{ form_id }}_sameCropAsLastSeason_validation"></span>
</div>
<div class="form-group">
<input type="checkbox" name="plowed"/>
<label for="plowed"><span>{% trans "Plowed" %}</span></label><br/>
<span class="help-block" id="{{ form_id }}_plowed_validation"></span>
</div>
</div> </div>
<div class="form-group"> <div class="col-md-6 form-group">
<input type="checkbox" name="plowed"/> <div class="form-group">
<label for="plowed"><span>{% trans "Plowed" %}</span></label><br/> <label for="observationDate">{% trans "Observation date" %}</label>
<span class="help-block" id="{{ form_id }}_plowed_validation"></span> <input type="date" name="observationDate" class="form-control"/>
<span class="help-block" id="{{ form_id }}_observationDate_validation"></span>
</div>
<div class="form-group">
<label for ="observationValue">{% trans "&#37; Infected leaves" %}</label>
<input type="number" name="observationValue" class="form-control" min="0" max="100"/>
<span class="help-block" id="{{ form_id }}_observationValue_validation"></span>
</div>
<div class="form-group">
<label for="sprayingDate">{% trans "Spraying date" %}</label>
<input type="date" name="sprayingDate" class="form-control"/>
<span class="help-block" id="{{ form_id }}_sprayingDate_validation"></span>
</div>
<div class="form-group">
<label for="preparationId">{% trans "Preparation" %}</label>
<select name="preparationId" id="preparationId" class="form-control">
</select>
<span class="help-block" id="{{ form_id }}_preparationId_validation"></span>
</div>
<div class="form-group">
<label for="preparationDose">{% trans "Preparation dose" %} (ml/daa)</label>
<input type="number" name="preparationDose" class="form-control"/>
<span class="help-block" id="{{ form_id }}_preparationDose_validation"></span>
</div>
</div> </div>
</div> </div>
<div class="col-md-6 form-group"> <div class="row">
<div class="form-group"> <div class="col-md-6 form-group">
<label for="observationDate">{% trans "Observation date" %}</label> <button type="button" class="btn btn-primary" onclick="if(validateForm(document.getElementById('{{ form_id }}')) & validateFormExtra()){runModel();}">{% trans "Run model" %}</button>
<input type="date" name="observationDate" class="form-control"/>
<span class="help-block" id="{{ form_id }}_observationDate_validation"></span>
</div> </div>
<div class="form-group"> </div>
<label for ="observationValue">{% trans "&#37; Infected leaves" %}</label>
<input type="number" name="observationValue" class="form-control" min="0" max="100"/> </form>
<span class="help-block" id="{{ form_id }}_observationValue_validation"></span> <div class="row" id="runningModelMessage" style="display:none">
<div class="col-md-12">
<div class="alert alert-info" role="alert">{% trans "Model is running, please wait" %}</div>
</div> </div>
<div class="form-group"> </div>
<label for="sprayingDate">{% trans "Spraying date" %}</label> <div class="row" id="errorMessageContainer" style="display:none">
<input type="date" name="sprayingDate" class="form-control"/> <div class="col-md-12">
<span class="help-block" id="{{ form_id }}_sprayingDate_validation"></span> <div class="alert alert-danger" role="alert" id="errorMessage"></div>
</div> </div>
<div class="form-group"> </div>
<label for="preparationId">{% trans "Preparation" %}</label>
<select name="preparationId" id="preparationId" class="form-control"> <div id="results" style="display:none;">
</select> <div class="alert alert-info" role="info" id="scrollHelp" style="display:none;">
<span class="help-block" id="{{ form_id }}_preparationId_validation"></span> {% trans "Scroll past chart by swiping the dotted line on the right" %}
</div> </div>
<div class="form-group"> <div id="chartContainer" style="width: 100%; height:400px;"></div>
<label for="preparationDose">{% trans "Preparation dose" %} (ml/daa)</label> <div class="table-responsive">
<input type="number" name="preparationDose" class="form-control"/> <table id="resultsTable" class="table table-striped"></table>
<span class="help-block" id="{{ form_id }}_preparationDose_validation"></span>
</div> </div>
</div>
</div> </div>
<div class="row">
<div class="col-md-6 form-group">
<button type="button" class="btn btn-default" onclick="if(validateForm(document.getElementById('{{ form_id }}')) & validateFormExtra()){runModel();}">{% trans "Run model" %}</button>
</div>
</div>
</form>
<div class="row" id="runningModelMessage" style="display:none">
<div class="col-md-12">
<div class="alert alert-info" role="alert">{% trans "Model is running, please wait" %}</div>
</div>
</div>
<div class="row" id="errorMessageContainer" style="display:none">
<div class="col-md-12">
<div class="alert alert-danger" role="alert" id="errorMessage"></div>
</div>
</div> </div>
<div id="results" style="display:none;">
<div class="alert alert-info" role="info" id="scrollHelp" style="display:none;">
{% trans "Scroll past chart by swiping the dotted line on the right" %}
</div>
<div id="chartContainer" style="width: 100%; height:400px;"></div>
<div class="table-responsive">
<table id="resultsTable" class="table table-striped"></table>
</div>
</div>
{% endblock %} {% endblock %}
{% block customJS %} {% block customJS %}
<script type="text/javascript" src="{% url "django.views.i18n.javascript_catalog" %}"></script> <script type="text/javascript" src="{% url "django.views.i18n.javascript_catalog" %}"></script>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment