diff options
5 files changed, 23 insertions, 8 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> ) diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb index 23f6c3b70..1ee267ffa 100644 --- a/app/controllers/journey_patterns_collections_controller.rb +++ b/app/controllers/journey_patterns_collections_controller.rb @@ -11,7 +11,8 @@ class JourneyPatternsCollectionsController < ChouetteController def show @q = route.journey_patterns.includes(:stop_points) - @journey_patterns ||= @q.paginate(:page => params[:page]).order(:name) + @ppage = 3 + @journey_patterns ||= @q.paginate(page: params[:page], per_page: @ppage).order(:name) end def update diff --git a/app/views/journey_patterns_collections/show.html.slim b/app/views/journey_patterns_collections/show.html.slim index 10ac476a5..beaaa53a0 100644 --- a/app/views/journey_patterns_collections/show.html.slim +++ b/app/views/journey_patterns_collections/show.html.slim @@ -1,5 +1,19 @@ -#journey_patterns +/ pageheader += pageheader 'map-marker', + "Missions de #{@route.name}", + 'Lorem ipsum dolor sit amet', + t('last_update', time: l(@journey_patterns.last.updated_at, format: :short)) +/ # link_to(t('actions.edit'), edit_referential_path(@referential), class: 'btn btn-default') + +/ PageContent +.page_content + .container-fluid + .row + .col-lg-12 + #journey_patterns + + = javascript_tag do | window.journeyPatternLength = #{@journey_patterns.total_entries()}; - | window.journeyPatternsPerPage = 12 + | window.journeyPatternsPerPage = #{@ppage} = javascript_include_tag 'es6_browserified/journey_patterns/index.js' |