Skip to content

Commit

Permalink
Merge pull request #200 from cleanerx/master
Browse files Browse the repository at this point in the history
F: #187 fix typos
  • Loading branch information
cleanerx authored Feb 20, 2017
2 parents 92c4aa9 + 78964b2 commit 1d5d85c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions src/js/oseam-views-gauge.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ OSeaM.views.Gauge = OSeaM.View.extend({
var content = $(template({
id : this.model.get('id'),
name : this.model.get('name'),
type : this.model.get('gaugeType'),
lat : this.model.get('latitude'),
lon : this.model.get('longitude')
gaugeType : this.model.get('gaugeType'),
latitude : this.model.get('latitude'),
longitude : this.model.get('longitude'),
waterlevel : this.model.get('waterlevel')
}));
OSeaM.frontend.translate(content);
this.$el.html(content);
Expand Down
6 changes: 3 additions & 3 deletions src/js/templates/gauge.handlebars
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div class="control-group">
<p><label class="tableft50">Pegel Name</label></p>
<p><label class="tableft50">Gauge Name</label></p>
<div class="input-append">
<input type="text" id="name" name="name" placeholder="Maxau" value="{{name}}"/>
<span class="help-inline helpOsm"></span>
</div>
</div>
<div class="control-group">
<p><label class="tableft50">Pegeltyp</label></p>
<p><label class="tableft50">Gauge Type</label></p>
<div class="input-append">
<input type="text" id="type" name="type" placeholder="Fluss" value="{{type}}"/>
<input type="text" id="gaugeType" name="gaugeType" placeholder="Fluss" value="{{gaugeType}}"/>
<span class="help-inline helpOsm"></span>
</div>
</div>
Expand Down

0 comments on commit 1d5d85c

Please sign in to comment.