aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorjpl2017-03-06 12:39:39 +0100
committerjpl2017-03-06 12:39:39 +0100
commit56e03d8d85f29eb02fb4fed025e916371e9efe43 (patch)
tree60f75cde83fee4249d84777f336f28b908d372f5 /app/assets/javascripts
parenta835e44c06440c83a86d6ebb15b88e1a9af84aca (diff)
downloadchouette-core-56e03d8d85f29eb02fb4fed025e916371e9efe43.tar.bz2
Refs #2720: updating toolbox for grouped actions on vj
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js2
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/components/Tools.js18
2 files changed, 9 insertions, 11 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 75b5d2ba0..65990a52d 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js
@@ -9,7 +9,7 @@ var Tools = require('../containers/Tools')
const App = () => (
<div>
- <div className='clearfix' style={{ marginBottom: 10 }}>
+ <div>
<Filters />
<ToggleArrivals />
<Navigate />
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Tools.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Tools.js
index e3db42075..a54485490 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Tools.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Tools.js
@@ -11,9 +11,8 @@ var actions = require('../actions')
const Tools = ({vehicleJourneys, onCancelSelection}) => {
return (
- <div>
- <h4>Sélectionner une ou plusieurs courses (en colonne)</h4>
- <div className='list-inline clearfix'>
+ <div className='select_toolbox'>
+ <ul>
<AddVehicleJourney />
<DuplicateVehicleJourney />
<ShiftVehicleJourney />
@@ -21,14 +20,13 @@ const Tools = ({vehicleJourneys, onCancelSelection}) => {
<CalendarsEditVehicleJourney />
<NotesEditVehicleJourney />
<DeleteVehicleJourneys />
- </div>
- <div>
- <span>{actions.getSelected(vehicleJourneys).length} course(s) sélectionnée(s)</span>
+ </ul>
+
+ <span className='info-msg'>{actions.getSelected(vehicleJourneys).length} course(s) sélectionnée(s)</span>
<br/>
- <button
- onClick={onCancelSelection}
- ><span className='fa fa-times'>Annuler la sélection</span></button>
- </div>
+ <button onClick={onCancelSelection}>
+ <span className='fa fa-times'>Annuler la sélection</span>
+ </button>
</div>
)
}