diff --git a/VIPSWeb/templatetags/template_helper.py b/VIPSWeb/templatetags/template_helper.py index 5e8eb69ae6cd7b9216aafc06040aee6afc27c8f7..4a6e30994111d1a6d7e7cf1e3b87c06ea2c9b19d 100644 --- a/VIPSWeb/templatetags/template_helper.py +++ b/VIPSWeb/templatetags/template_helper.py @@ -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 += "<ul class='linkList'>" 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 += "</div>" return menu_html diff --git a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html index 4c4c38124b7222a72484c5cdb1bfa758aef60d08..e6e4820c437f7fb61b9a77c7ba772f19cca258d6 100644 --- a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html +++ b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html @@ -30,114 +30,107 @@ {% endblock %} {% block content %} -<h1>{% trans "Barley net blotch" %}</h1> -<p> - Dette er en testversjon av nye VIPS, som skal erstatte den nåværende websiden fra og med sesongen 2016. - Byggbrunflekkmodellen er nå klar til bruk i nye VIPS, og derfor er du kanskje noe overraskende sendt hit. - For å gå tilbake til resten av nåværende VIPS, <a href="http://www.vips-landbruk.no">klikk her</a>. -</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 class="singleBlockContainer"> + <h1>{% trans "Barley net blotch" %}</h1> + <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. </div> - <div class="row"> - <div class="col-md-6"> - <input type="hidden" name="timeZone" value="Europe/Oslo"/> - <div class="form-group"> - <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> + <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 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="row"> + <div class="col-md-6"> + <input type="hidden" name="timeZone" value="Europe/Oslo"/> + <div class="form-group"> + <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 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 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 class="col-md-6 form-group"> + <div class="form-group"> + <label for="observationDate">{% trans "Observation date" %}</label> + <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 "% 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 class="col-md-6 form-group"> - <div class="form-group"> - <label for="observationDate">{% trans "Observation date" %}</label> - <input type="date" name="observationDate" class="form-control"/> - <span class="help-block" id="{{ form_id }}_observationDate_validation"></span> + <div class="row"> + <div class="col-md-6 form-group"> + <button type="button" class="btn btn-primary" onclick="if(validateForm(document.getElementById('{{ form_id }}')) & validateFormExtra()){runModel();}">{% trans "Run model" %}</button> </div> - <div class="form-group"> - <label for ="observationValue">{% trans "% 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> + + </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 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="row" id="errorMessageContainer" style="display:none"> + <div class="col-md-12"> + <div class="alert alert-danger" role="alert" id="errorMessage"></div> </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 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 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 id="chartContainer" style="width: 100%; height:400px;"></div> + <div class="table-responsive"> + <table id="resultsTable" class="table table-striped"></table> </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 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 %} {% block customJS %} <script type="text/javascript" src="{% url "django.views.i18n.javascript_catalog" %}"></script>