pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/geographic_location' into 'master'

Browse source 
Changed location label, value and placeholder

Closes #218

See merge request cara/cara!293
This commit is contained in:
Andre Henriques 2021-11-19 15:08:15 +01:00
commit d5a373bd90
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cara/apps/calculator/static/js/form.js
View file

@ -611,7 +611,7 @@ $(document).ready(function () {
},
cache: true
},
placeholder: 'Search for a location',
placeholder: 'Geneva, CHE',
minimumInputLength: 1,
templateResult: formatlocation,
templateSelection: formatLocationSelection

10
cara/apps/calculator/templates/calculator.form.html.j2
View file

@ -122,17 +122,17 @@
</div>
</div>
<div class="form-group row">
<div class="col-sm-4"><label class="col-form-label">Location:</label></div>
<div class="col-sm-6 align-self-center"><select id="location_select" form="not-submitted" class="form-control" name="location_select" required></select></div>
<div class="col-sm-5"><label class="col-form-label">Geographic location:</label></div>
<div class="col-sm-5 align-self-center"><select id="location_select" form="not-submitted" class="form-control" name="location_select" required></select></div>
</div>
<div style="display: none">
<!--
This block allows us to have hidden input values which are retained during forward/back navigation, as per
https://stackoverflow.com/a/6384276/741316
-->
<input type="text" name="location_name">
<input type="text" name="location_latitude">
<input type="text" name="location_longitude">
<input type="text" name="location_name" value="Geneva, CHE">
<input type="text" name="location_latitude" value="46.20833">
<input type="text" name="location_longitude" value="6.14275">
</div>
<hr width="80%">