updating journey patterns integration

4 files changed, 42 insertions, 38 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/App.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/App.js
index c61613b9e..9b6b0d143 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/App.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/App.js
@@ -5,8 +5,10 @@ var JourneyPatternList = require('../containers/JourneyPatternList')
 
 const App = () => (
   <div>
-    <AddJourneyPattern />
-    <Navigate />
+    <div classNam='clearfix' style={{ marginBottom: 10 }}>
+      <AddJourneyPattern />
+      <Navigate />
+    </div>
     <JourneyPatternList />
   </div>
 )
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
index 9265099e7..e2e94a7b7 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
@@ -4,10 +4,16 @@ var PropTypes = require('react').PropTypes
 const JourneyPattern = (props) => {
   return (
     <div className='list-group-item'>
-      <span className='label label-default' style={{marginRight: 10}}>{props.index}</span>
-      <span className='label label-default' style={{marginRight: 10}}>{props.value.name}</span>
-      <span className='label label-default' style={{marginRight: 10}}>{props.value.object_id}</span>
-      <span className='label label-default' style={{marginRight: 10}}>{props.value.published_name}</span>
+      <p className='small'><strong>Index: </strong>{props.index}</p>
+      <p className='small'><strong>Name: </strong>{props.value.name}</p>
+      <p className='small'><strong>ObjectID: </strong>{props.value.object_id}</p>
+      <p className='small'><strong>Published name: </strong>{props.value.published_name}</p>
+      <p className='small'>
+        <strong>Stop points: </strong>
+        <ul>
+          <li>{props.value.stop_points}</li>
+        </ul>
+      </p>
     </div>
   )
 }
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js
index 0f0656b4e..17b5b0506 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js
@@ -4,15 +4,13 @@ var actions = require('../actions')
 
 let AddJourneyPattern = ({ dispatch }) => {
   return (
-    <div className="clearfix" style={{marginBottom: 10}}>
-      <form onSubmit={e => {
-        e.preventDefault()
-      }}>
-        <button type="submit" className="btn btn-primary btn-xs pull-right">
-          <span className="fa fa-plus"></span> Ajouter une mission
-        </button>
-      </form>
-    </div>
+    <form onSubmit={e => {
+      e.preventDefault()
+    }}>
+      <button type="submit" className="btn btn-primary btn-sm pull-right">
+        <span className="fa fa-plus"></span> Ajouter une mission
+      </button>
+    </form>
   )
 }
 AddJourneyPattern = connect()(AddJourneyPattern)
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/containers/Navigate.js b/app/assets/javascripts/es6_browserified/journey_patterns/containers/Navigate.js
index c9d804bc4..75c94e8c3 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/Navigate.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/Navigate.js
@@ -4,30 +4,28 @@ var actions = require('../actions')
 
 let Navigate = ({ dispatch, journeyPatterns, page }) => {
   return (
-    <div className="clearfix" style={{marginBottom: 10}}>
-      <form onSubmit={e => {
+    <form className='btn-group btn-group-sm' onSubmit={e => {
+      e.preventDefault()
+    }}>
+    <button
+      onClick={e => {
         e.preventDefault()
-      }}>
-        <button
-          onClick={e => {
-            e.preventDefault()
-            dispatch(actions.goToNextPage(dispatch, page))
-          }}
-          type="submit"
-          className="btn btn-primary btn-xs pull-right">
-          <span className="fa fa-plus"></span> Suivant
-        </button>
-        <button
-          onClick={e => {
-            e.preventDefault()
-            dispatch(actions.goToPreviousPage(dispatch, page))
-          }}
-          type="submit"
-          className="btn btn-primary btn-xs pull-right">
-          <span className="fa fa-plus"></span> Précédent
-        </button>
-      </form>
-    </div>
+        dispatch(actions.goToPreviousPage(dispatch, page))
+      }}
+      type="submit"
+      className="btn btn-default">
+      <span className="fa fa-chevron-left"></span>
+      </button>
+      <button
+        onClick={e => {
+          e.preventDefault()
+          dispatch(actions.goToNextPage(dispatch, page))
+        }}
+        type="submit"
+        className="btn btn-default">
+        <span className="fa fa-chevron-right"></span>
+      </button>
+    </form>
   )
 }