diff options
| author | jpl | 2017-02-24 13:02:57 +0100 |
|---|---|---|
| committer | jpl | 2017-02-24 13:02:57 +0100 |
| commit | 88ab2465ee33cc913d9a86fac652aa4d780880ac (patch) | |
| tree | 0b0193f4b4a291bc254911c16786fb4f84cad2aa /app/assets/javascripts | |
| parent | c49cd8e6d1ab49522cf4f31ff0687cb728be1bed (diff) | |
| download | chouette-core-88ab2465ee33cc913d9a86fac652aa4d780880ac.tar.bz2 | |
Refs #2648: updating per_page management on journey_patterns_collection
Diffstat (limited to 'app/assets/javascripts')
3 files changed, 5 insertions, 5 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 5d84f28fd..630341c1e 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/App.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/App.js @@ -8,11 +8,11 @@ var JourneyPatternList = require('../containers/JourneyPatternList') const App = () => ( <div> + <JourneyPatternList /> <div className='clearfix' style={{ marginBottom: 10 }}> <Navigate /> <AddJourneyPattern /> </div> - <JourneyPatternList /> <SaveJourneyPattern /> <ConfirmModal /> <Modal/> diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js index cb2b96766..6d2628446 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js @@ -24,13 +24,13 @@ class CreateModal extends Component { <div className='pull-right'> <button type='button' - className='btn btn-primary btn-sm' + className='btn btn-outline-primary' data-toggle='modal' data-target='#NewJourneyPatternModal' onClick={this.props.onOpenCreateModal} > - <span className='fa fa-plus'></span> Ajouter une mission - </button> + Ajouter une mission + </button> <div className={ 'modal fade ' + ((this.props.modal.type == 'create') ? 'in' : '') } id='NewJourneyPatternModal'> <div className='modal-dialog'> diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js index 35626d626..286922b8b 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js @@ -17,7 +17,7 @@ let SaveJourneyPattern = ({ dispatch, journeyPatterns, page, status }) => { actions.submitJourneyPattern(dispatch, journeyPatterns) }} > - Valider + Enregistrer </button> </form> ) |
