diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/components/_alerts.sass | 7 | ||||
| -rw-r--r-- | app/views/errors/not_found.html.slim | 50 | ||||
| -rw-r--r-- | app/views/errors/server_error.html.slim | 52 | 
3 files changed, 47 insertions, 62 deletions
diff --git a/app/assets/stylesheets/components/_alerts.sass b/app/assets/stylesheets/components/_alerts.sass index f05a4f39f..923b67cbc 100644 --- a/app/assets/stylesheets/components/_alerts.sass +++ b/app/assets/stylesheets/components/_alerts.sass @@ -14,6 +14,13 @@    .fa + span      margin-left: 10px +  p a +    border-color: inherit + +    &:hover +      color: inherit +      border-color: inherit +    &.alert-dismissible      padding-right: 70px diff --git a/app/views/errors/not_found.html.slim b/app/views/errors/not_found.html.slim index 913362251..6348ea1be 100644 --- a/app/views/errors/not_found.html.slim +++ b/app/views/errors/not_found.html.slim @@ -1,31 +1,21 @@ -.error -  h2 = "Désolé, la page demandée n'existe pas" +/ PageHeader += pageheader 'bug', +             'Erreur 404', +             '' -  a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank" -    = "N'hésitez pas à nous décrire le problème" -  = ", nous essaierons de le résoudre." -  br -  = "Merci d'avance" -  br - -  = "Vous pouvez néanmoins continuer à utiliser l'application CHOUETTE" -  br -  br -  br -  br -  br - -  h2 = "The page you were looking for doesn't exist." - -  = "You may have mistyped the address or the page may have moved." -  br - -  a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank" -    = "Please describe us what happened" -  = ", we'll try to come back with an answer." -  br -  = "Thank you." -  br -  br -  = "You can still continue the use the CHOUETTE application." -  br
\ No newline at end of file +.page_content +  .container-fluid +    .row +      .col-lg-12 +        .alert.alert-danger +          - if I18n.locale == :fr +            p +              strong = "Désolé, la page demandée n'existe pas." +             +            p = "Vous pouvez néanmoins continuer à utiliser l'application IBOO." +               +          - else +            p +              strong = "The page you were looking for doesn't exist." +             +            p = "You can still continue the use the IBOO application. Thank you for understanding." diff --git a/app/views/errors/server_error.html.slim b/app/views/errors/server_error.html.slim index b11176421..09884dc29 100644 --- a/app/views/errors/server_error.html.slim +++ b/app/views/errors/server_error.html.slim @@ -1,33 +1,21 @@ -.error -  h2 = "Désolé, une erreur est survenue" +/ PageHeader += pageheader 'bug', +             'Erreur serveur', +             '' -  a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank" -    = "N'hésitez pas à nous décrire le problème" -  = ", nous essaierons de le résoudre." -  br -  = "Merci d'avance" -  br -  br - -  = "Vous pouvez néanmoins continuer à utiliser l'application CHOUETTE" -  br -  br -  br -  br -  br - -  h2 = "We're sorry, but something went wrong." - -  = "You may have mistyped the address or the page may have moved." -  br - -  a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank" -    = "Please describe us what happened" -  = ", we'll try to come back with an answer." -  br -  = "Thank you." -  br -  br - -  = "You can still continue the use the CHOUETTE application." -  br
\ No newline at end of file +.page_content +  .container-fluid +    .row +      .col-lg-12 +        .alert.alert-danger +          - if I18n.locale == :fr +            p +              strong = "Désolé, une erreur est survenue." +             +            p = "Vous pouvez néanmoins continuer à utiliser l'application IBOO." +               +          - else +            p +              strong = "We're sorry, but something went wrong." +             +            p = "You can still continue the use the IBOO application. Thank you for understanding."  | 
