aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorjpl2017-03-06 18:17:30 +0100
committerjpl2017-03-06 18:17:30 +0100
commit74715fc2bd926e9871d50bbad82bc19fe50cf087 (patch)
treef2cd8a3996add9e591df5cb16aece0b708235e19 /app/assets/javascripts
parentd5496952b22064e8c74c3e5f06b8401f37b337ca (diff)
downloadchouette-core-74715fc2bd926e9871d50bbad82bc19fe50cf087.tar.bz2
Refs #2720: adding navigation on page bottom
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js8
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/containers/SaveVehicleJourneys.js24
2 files changed, 7 insertions, 25 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js
index 55a83091d..6bc23bd4f 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js
@@ -21,9 +21,15 @@ const App = () => (
</div>
<VehicleJourneysList />
+
+ <div className='row'>
+ <div className='col-lg-12 text-right'>
+ <Navigate />
+ </div>
+ </div>
+
<SaveVehicleJourneys />
<ConfirmModal />
-
<Tools />
</div>
)
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/SaveVehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/SaveVehicleJourneys.js
index 00275ae45..5af30ab82 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/SaveVehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/SaveVehicleJourneys.js
@@ -3,30 +3,6 @@ var connect = require('react-redux').connect
var actions = require('../actions')
var SaveVehicleJourneysComponent = require('../components/SaveVehicleJourneys')
-// let SaveVehicleJourneys = ({ dispatch, vehicleJourneys, page, status }) => {
-// if(status.isFetching == true) {
-// return false
-// }
-// if(status.fetchSuccess == true) {
-// return (
-// <form className='clearfix' onSubmit={e => {e.preventDefault()}}>
-// <button
-// className='btn btn-danger pull-right'
-// type='submit'
-// onClick={e => {
-// e.preventDefault()
-// actions.submitVehicleJourneys(dispatch, vehicleJourneys)
-// }}
-// >
-// Valider
-// </button>
-// </form>
-// )
-// } else {
-// return false
-// }
-// }
-
const mapStateToProps = (state) => {
return {
vehicleJourneys: state.vehicleJourneys,