Merge branch 'master' of github.com:af83/stif-boiv

4 files changed, 39 insertions, 6 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
index e0557d651..f7a84cc22 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
@@ -2,6 +2,7 @@ var React = require('react')
 var Component = require('react').Component
 var PropTypes = require('react').PropTypes
 var JourneyPattern = require('./JourneyPattern')
+var _ = require('lodash')
 
 class JourneyPatterns extends Component{
   constructor(props){
@@ -85,12 +86,19 @@ class JourneyPatterns extends Component{
         <div className='row'>
           <div className='col-lg-12'>
             {(this.props.status.fetchSuccess == false) && (
-              <div className="alert alert-danger">
+              <div className="alert alert-danger mt-sm">
                 <strong>Erreur : </strong>
                 la récupération des missions a rencontré un problème. Rechargez la page pour tenter de corriger le problème
               </div>
             )}
 
+            { _.some(this.props.journeyPatterns, 'errors') && (
+              <div className="alert alert-danger mt-sm">
+                <strong>Erreur : </strong>
+                une erreur bloque la validation des modifications.
+              </div>
+            )}
+
             <div className={'table table-2entries mt-sm mb-sm' + ((this.props.journeyPatterns.length > 0) ? '' : ' no_result')}>
               <div className='t2e-head w20'>
                 <div className='th'>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
index 619745c6a..8575c076f 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
@@ -2,6 +2,7 @@ var React = require('react')
 var Component = require('react').Component
 var PropTypes = require('react').PropTypes
 var VehicleJourney = require('./VehicleJourney')
+var _ = require('lodash')
 
 class VehicleJourneys extends Component{
   constructor(props){
@@ -86,12 +87,19 @@ class VehicleJourneys extends Component{
         <div className='row'>
           <div className='col-lg-12'>
             {(this.props.status.fetchSuccess == false) && (
-              <div className='alert alert-danger'>
+              <div className='alert alert-danger mt-sm'>
                 <strong>Erreur : </strong>
                 la récupération des missions a rencontré un problème. Rechargez la page pour tenter de corriger le problème.
               </div>
             )}
 
+            { _.some(this.props.vehicleJourneys, 'errors') && (
+              <div className="alert alert-danger mt-sm">
+                <strong>Erreur : </strong>
+                une erreur bloque la validation des modifications.
+              </div>
+            )}
+
             <div className={'table table-2entries mt-sm mb-sm' + ((this.props.vehicleJourneys.length > 0) ? '' : ' no_result')}>
               <div className='t2e-head w20'>
                 <div className='th'>
diff --git a/app/assets/stylesheets/components/_alerts.sass b/app/assets/stylesheets/components/_alerts.sass
index 50799ff65..55e6e4b62 100644
--- a/app/assets/stylesheets/components/_alerts.sass
+++ b/app/assets/stylesheets/components/_alerts.sass
@@ -4,10 +4,27 @@
 
 .alert
   margin: 0
-  // padding: 10px 50px
   border-radius: 0
   border: none
 
+  &.mt-xs
+    margin-top: 10px
+  &.mt-sm
+    margin-top: 15px
+  &.mt-md
+    margin-top: 20px
+  &.mt-lg
+    margin-top: 40px
+
+  &.mb-xs
+    margin-bottom: 10px
+  &.mb-sm
+    margin-bottom: 15px
+  &.mb-md
+    margin-bottom: 20px
+  &.mb-lg
+    margin-bottom: 40px
+
   #main_nav + &
     padding: 10px 50px
 
diff --git a/app/views/routing_constraint_zones/edit.html.slim b/app/views/routing_constraint_zones/edit.html.slim
index 7ecba1918..d0e0ded32 100644
--- a/app/views/routing_constraint_zones/edit.html.slim
+++ b/app/views/routing_constraint_zones/edit.html.slim
@@ -18,10 +18,10 @@
 
               .separator
 
-              - @routing_constraint_zone.errors[:stop_point_ids].each do |error_message|
-                .alert.alert-danger = error_message
-
               #ITL_stoppoints
+                - @routing_constraint_zone.errors[:stop_point_ids].each do |error_message|
+                  .alert.alert-danger.mb-md = error_message
+
                 .subform
                   .nested-head
                     .wrapper