Refs #2402: upd map trigger btn integration

2 files changed, 19 insertions, 16 deletions

diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
index 4eb9ed315..492693a6d 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
@@ -7,13 +7,16 @@ const StopPoint = (props) => {
     <div className='list-group-item'>
       <div className='row'>
         <div className='col-lg-5 col-md-5 col-sm-4 col-xs-5'>
-          <div style={{display: 'inline-block', width: '20%', verticalAlign: 'middle', textAlign: 'right', marginTop: 24}}>
+          <div style={{display: 'inline-block', width: '17%', verticalAlign: 'middle', textAlign: 'right', marginTop: 24}}>
             <span className='label label-default' style={{marginRight: 10}}>{props.value.user_objectid}</span>
           </div>
 
-          <div style={{display: 'inline-block', width: '80%', verticalAlign: 'middle'}}>
+          <div style={{display: 'inline-block', width: '66%', verticalAlign: 'middle'}}>
             <label>Arrêt</label>
             <BSelect2 id={'route_stop_points_' + props.id} value={props.value} onChange={props.onChange} index={props.index} />
+          </div>
+
+          <div style={{display: 'inline-block', width: '17%', verticalAlign: 'middle', textAlign: 'right', marginTop: 24}}>
             <div
               className={'btn btn-primary'}
               onClick={props.onToggleMap}
diff --git a/app/views/routes/edit.html.slim b/app/views/routes/edit.html.slim
index 1feaafec3..22a828efe 100644
--- a/app/views/routes/edit.html.slim
+++ b/app/views/routes/edit.html.slim
@@ -1,19 +1,19 @@
 = title_tag t('routes.edit.title', route: @route.name )
 
-#CUSTOM_map style='height:250px'
-  = javascript_tag do
-    | var map = new ol.Map({
-    |   target: 'CUSTOM_map',
-    |   layers: [
-    |     new ol.layer.Tile({
-    |       source: new ol.source.OSM()
-    |     })
-    |   ],
-    |   view: new ol.View({
-    |     center: ol.proj.fromLonLat([37.41, 8.82]),
-    |     zoom: 4
-    |   })
-    | });
+/ #CUSTOM_map style='height:250px'
+/   = javascript_tag do
+/     | var map = new ol.Map({
+/     |   target: 'CUSTOM_map',
+/     |   layers: [
+/     |     new ol.layer.Tile({
+/     |       source: new ol.source.OSM()
+/     |     })
+/     |   ],
+/     |   view: new ol.View({
+/     |     center: ol.proj.fromLonLat([37.41, 8.82]),
+/     |     zoom: 4
+/     |   })
+/     | });
 
 .row
   .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-8.col-sm-offset-2