WIP: import

alexandre-melard · Jun 4, 2015 · 247be6e · 247be6e
1 parent ceb12af
commit 247be6e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/models/mtg-trail.js b/app/models/mtg-trail.js
@@ -53,10 +53,9 @@ let Trail = DS.Model.extend({
     var layer = this.layer;
     if (this.get('version') !== consts.VERSION) {
       console.log("major version change, deleting model");
-      localStorage.clear();
-      this.set('version', consts.VERSION);
-      this.save();
-      location.reload();
+      //TODO gerer les montées de version
+      //localStorage.clear();
+      //location.reload();
     }
     var mapDraw = this.get('mapDraw');
     if (mapDraw !== null) {

diff --git a/app/templates/map-location.hbs b/app/templates/map-location.hbs
@@ -1,10 +1,11 @@
 <div class="input-group">
-    <span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span>
   {{input type="text" class="form-control map-location-search-input" value=locationSearch action='findLocation'}}
     <span class="input-group-btn">
-      <button type="button" data-toggle="tooltip" data-original-title="Place Lookup" class="btn btn-default" {{action 'findLocation'}}>Go
+      <button type="button" data-toggle="tooltip" data-original-title="Place Lookup" class="btn btn-default" {{action 'findLocation'}}>
+          <i class="glyphicon glyphicon-search"></i>
       </button>
-      <button type="button" data-toggle="tooltip" data-original-title="Get address on map" class="btn btn-default" {{action 'locateOnMap'}}>
+      <button type="button" data-toggle="tooltip" data-original-title="Get address on map"
+              class="btn btn-default" {{action 'locateOnMap'}}>
           <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
       </button>
       <button type="button" data-toggle="tooltip" data-original-title="Track GPS location"