Refs #1995: update route#new & route#edit

3 files changed, 46 insertions, 46 deletions

diff --git a/app/assets/javascripts/es6_browserified/components/BSelect2.js b/app/assets/javascripts/es6_browserified/components/BSelect2.js
index a78dc625f..ec0d130d2 100644
--- a/app/assets/javascripts/es6_browserified/components/BSelect2.js
+++ b/app/assets/javascripts/es6_browserified/components/BSelect2.js
@@ -53,6 +53,7 @@ class BSelect3 extends React.Component{
               className='form-control form-control-link'
               href={origin + path + '/stop_areas/' + this.props.value.stoparea_id}
               title={"Voir l'arrêt '" + this.props.value.text + "'"}
+              style={{lineHeight: '22px', overflow: 'hidden'}}
             >
               {this.props.value.text}
             </a>
diff --git a/app/assets/javascripts/es6_browserified/components/Todo.js b/app/assets/javascripts/es6_browserified/components/Todo.js
index bf60a405e..2a670370f 100644
--- a/app/assets/javascripts/es6_browserified/components/Todo.js
+++ b/app/assets/javascripts/es6_browserified/components/Todo.js
@@ -2,59 +2,57 @@ var React = require('react')
 var PropTypes = require('react').PropTypes
 var BSelect2 = require('./BSelect2')
 
-const Container = {display: 'table', tableLayout: 'fixed', width: '100%'}
-const firstBlock = {display: 'table-cell', verticalAlign: 'middle', width: '55%'}
-const secondBlock = {display: 'table-cell', verticalAlign: 'middle', textAlign: 'right'}
-const thirdBlock = {display: 'table-cell', verticalAlign: 'middle', width: 125, textAlign: 'right'}
-
 const Todo = (props) => {
   return (
-    <div className='list-group-item' style={Container}>
-      <div style={firstBlock}>
-        <div style={{display: 'inline-block', width: '10%', verticalAlign: 'middle', textAlign: 'right'}}>
-          <span className='label label-default' style={{marginRight: 10}}>{props.value.stoparea_id}</span>
-        </div>
+    <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'}}>
+            <span className='label label-default' style={{marginRight: 10}}>{props.value.stoparea_id}</span>
+          </div>
 
-        <div style={{display: 'inline-block', width: '90%', verticalAlign: 'middle'}}>
-          <BSelect2 id={'route_stop_points_' + props.id} value={props.value} onChange={props.onChange} index={props.index} />
-        </div>
-      </div>
-      <div style={secondBlock}>
-        <div style={{display: 'inline-block', width: '100%', verticalAlign: 'middle'}}>
-          <select value={props.value.for_boarding} id="for_boarding" onChange={props.onSelectChange}>
-            <option value="forbidden">interdit</option>
-            <option value="normal">normal</option>
-          </select>
-        </div>
-      </div>
-      <div style={secondBlock}>
-        <div style={{display: 'inline-block', width: '100%', verticalAlign: 'middle'}}>
-          <select value={props.value.for_alighting} id="for_alighting" onChange={props.onSelectChange}>
-            <option value="forbidden">interdit</option>
-            <option value="normal">normal</option>
-          </select>
+          <div style={{display: 'inline-block', width: '80%', verticalAlign: 'middle'}}>
+            <BSelect2 id={'route_stop_points_' + props.id} value={props.value} onChange={props.onChange} index={props.index} />
+          </div>
         </div>
-      </div>
 
-      <div style={thirdBlock}>
-        <div className='btn-group btn-group-sm'>
-          <div
-            className={'btn btn-primary' + (props.first ? ' disabled' : '')}
-            onClick={props.onMoveUpClick}
-          >
-            <span className='fa fa-arrow-up'></span>
+        <div className='col-lg-2 col-md-2 col-sm-2 col-xs-2'>
+          <div style={{display: 'inline-block', width: '100%', verticalAlign: 'middle'}}>
+            <select className='form-control' value={props.value.for_boarding} id="for_boarding" onChange={props.onSelectChange}>
+              <option value="forbidden">interdit</option>
+              <option value="normal">normal</option>
+            </select>
           </div>
-          <div
-            className={'btn btn-primary' + (props.last ? ' disabled' : '')}
-            onClick={props.onMoveDownClick}
-          >
-            <span className='fa fa-arrow-down'></span>
+        </div>
+        <div className='col-lg-2 col-md-2 col-sm-2 col-xs-2'>
+          <div style={{display: 'inline-block', width: '100%', verticalAlign: 'middle'}}>
+            <select className='form-control' value={props.value.for_alighting} id="for_alighting" onChange={props.onSelectChange}>
+              <option value="forbidden">interdit</option>
+              <option value="normal">normal</option>
+            </select>
           </div>
-          <div
-            className='btn btn-danger'
-            onClick={props.onDeleteClick}
-          >
-            <span className='fa fa-trash'></span>
+        </div>
+
+        <div className='col-lg-3 col-md-3 col-sm-4 col-xs-3' style={{textAlign: 'right'}}>
+          <div className='btn-group btn-group-sm'>
+            <div
+              className={'btn btn-primary' + (props.first ? ' disabled' : '')}
+              onClick={props.onMoveUpClick}
+            >
+              <span className='fa fa-arrow-up'></span>
+            </div>
+            <div
+              className={'btn btn-primary' + (props.last ? ' disabled' : '')}
+              onClick={props.onMoveDownClick}
+            >
+              <span className='fa fa-arrow-down'></span>
+            </div>
+            <div
+              className='btn btn-danger'
+              onClick={props.onDeleteClick}
+            >
+              <span className='fa fa-trash'></span>
+            </div>
           </div>
         </div>
       </div>
diff --git a/app/assets/javascripts/es6_browserified/containers/AddTodo.js b/app/assets/javascripts/es6_browserified/containers/AddTodo.js
index 98904ec21..d0128f16d 100644
--- a/app/assets/javascripts/es6_browserified/containers/AddTodo.js
+++ b/app/assets/javascripts/es6_browserified/containers/AddTodo.js
@@ -9,6 +9,7 @@ let AddTodo = ({ dispatch }) => {
         e.preventDefault()
         dispatch(actions.addStop())
       }}>
+        <label>Séquence d'arrêts</label>
         <button type="submit" className="btn btn-primary btn-xs pull-right">
           <span className="fa fa-plus"></span> Ajouter un arrêt
         </button>