Refs #2802: 404/500 errors update

author: jpl 2017-03-22 11:57:04 +0100
committer: jpl 2017-03-22 11:57:19 +0100
commit: ab39dca3844ff87c063d86b65748669fa3e7d223 (patch)
tree: 082ad6cd29070194b530733bac14670c4ae67bd3
parent: fb7d67c9620a2f8168a0be5f6b922e2a2bf81e47 (diff)
download: chouette-core-ab39dca3844ff87c063d86b65748669fa3e7d223.tar.bz2
7 files changed, 47 insertions, 265 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."
diff --git a/public/403.html b/public/403.html
deleted file mode 100644
index 34d6e6bad..000000000
--- a/public/403.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>The page you were looking is forbidden (403)</title>
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <style>
-  body {
-    background-color: #EFEFEF;
-    color: #2E2F30;
-    text-align: center;
-    font-family: arial, sans-serif;
-    margin: 0;
-  }
-
-  div.dialog {
-    width: 95%;
-    max-width: 33em;
-    margin: 4em auto 0;
-  }
-
-  div.dialog > div {
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #BBB;
-    border-top: #B00100 solid 4px;
-    border-top-left-radius: 9px;
-    border-top-right-radius: 9px;
-    background-color: white;
-    padding: 7px 12% 0;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-
-  h1 {
-    font-size: 100%;
-    color: #730E15;
-    line-height: 1.5em;
-  }
-
-  div.dialog > p {
-    margin: 0 0 1em;
-    padding: 1em;
-    background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #999;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-top-color: #DADADA;
-    color: #666;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/403.html -->
-  <div class="dialog">
-    <div>
-      <h1>The page you were looking is forbidden.</h1>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/public/404.html b/public/404.html
deleted file mode 100644
index 72bd4129d..000000000
--- a/public/404.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <!-- <link href="assets/application.css" media="screen" rel="stylesheet" type="text/css" />       -->
-  <title>The page you were looking for doesn't exist (404)</title>
-  <style type="text/css">
-    body { background-color: #fff;  text-align: center;  }
-    div.dialog {
-      width: 45em;
-      padding:1em;
-      margin: 2em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-      h1 { font-size: 100%; color: #f00; line-height: 1.5em; font-weight: bold}
-      a,a:visited { text-decoration: underline; color: blue}
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/404.html 
-  <div id="header">
-    <div class="infos">
-      <div class="logo">
-	<a href="referentials">
-	  <img src="assets/logo_chouette.png" alt="Logo_chouette">
-	</a>
-      </div>
-    </div>
-  </div>-->
-  <div class="dialog">
-    <h1>D&eacute;sol&eacute;, la page demand&eacute;e n'existe pas</h1>
-    <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">N'h&eacute;sitez pas &agrave; nous d&eacute;crire le probl&egrave;me</a>, nous essaierons de le r&eacute;soudre.<br/>Merci d'avance<br/> <br/>
-    Vous pouvez n&eacute;anmoins continuer &agrave; utiliser l'application CHOUETTE<br/>
-    <a href="javascript:history.back()" >Retour</a><br/>
-    <!-- <a href="referentials" >Accueil</a> -->
-    <br/> <br/><br/> <br/>
-    <h1>The page you were looking for doesn't exist.</h1>
-    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</a>, we'll try to come back with an answer. <br/>Thank you.  <br/> <br/>
-    You can still continue the use the CHOUETTE application. <br/>
-    <a href="javascript:history.back()" >Back</a><br/>
-    <!-- <a href="referentials" >Home</a> -->
-  </div>
-</body>
-</html>
diff --git a/public/422.html b/public/422.html
deleted file mode 100644
index ea857f263..000000000
--- a/public/422.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <!-- <link href="assets/application.css" media="screen" rel="stylesheet" type="text/css" />   -->  
-  <title>The change you wanted was rejected (422)</title>
-  <style type="text/css">
-    body { background-color: #fff;  text-align: center;  }
-    div.dialog {
-      width: 45em;
-      padding:1em;
-      margin: 2em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-      h1 { font-size: 100%; color: #f00; line-height: 1.5em; font-weight: bold}
-      a,a:visited { text-decoration: underline; color: blue}
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/422.html 
-  <div id="header">
-    <div class="infos">
-      <div class="logo">
-	<a href="referentials">
-	  <img src="assets/logo_chouette.png" alt="Logo_chouette">
-	</a>
-      </div>
-    </div>
-  </div>-->
-  <div class="dialog">
-    <h1>La modification demand&eacute;e a &eacute;t&eacute; refus&eacute;e</h1>
-    <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">N'h&eacute;sitez pas &agrave; nous d&eacute;crire le probl&egrave;me</a>, nous essaierons de le r&eacute;soudre.<br/>Merci d'avance<br/> <br/>
-    Vous pouvez n&eacute;anmoins continuer &agrave; utiliser l'application CHOUETTE<br/>
-    <a href="javascript:history.back()" >Retour</a><br/>
-    <!-- <a href="referentials" >Accueil</a> -->
-    <br/> <br/><br/> <br/>
-    <h1>The change you wanted was rejected.</h1>
-    Maybe you tried to change something you didn't have access to. <br/>
-    <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">Please describe us what happened</a>, we'll try to come back with an answer. <br/>Thank you.  <br/> <br/>
-    You can still continue the use the CHOUETTE application. <br/>
-    <a href="javascript:history.back()" >Back</a><br/>
-    <!-- <a href="referentials" >Home</a> -->
-  </div>
-</body>
-</html>
diff --git a/public/500.html b/public/500.html
deleted file mode 100644
index 22a514e37..000000000
--- a/public/500.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-  <title>We're sorry, but something went wrong (500)</title>
-  <style type="text/css">
-    body { background-color: #fff;  text-align: center;  }
-    div.dialog {
-      width: 45em;
-      padding:1em;
-      margin: 2em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-      h1 { font-size: 100%; color: #f00; line-height: 1.5em; font-weight: bold}
-      a,a:visited { text-decoration: underline; color: blue}
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/500.html 
-  <div id="header">
-    <div class="infos">
-      <div class="logo">
-	<a href="referentials">
-	  <img src="assets/logo_chouette.png" alt="Logo_chouette">
-	</a>
-      </div>
-    </div>
-  </div>-->
-  <div class="dialog">
-    <h1>D&eacute;sol&eacute;, une erreur est survenue</h1>
-    <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">N'h&eacute;sitez pas &agrave; nous d&eacute;crire le probl&egrave;me</a>, nous essaierons de le r&eacute;soudre.<br/>Merci d'avance<br/> <br/>
-    Vous pouvez n&eacute;anmoins continuer &agrave; utiliser l'application CHOUETTE<br/>
-    <a href="javascript:history.back()" >Retour</a><br/>
-    <!-- <a href="referentials" >Accueil</a> -->
-    <br/> <br/><br/> <br/>
-    <h1>We're sorry, but something went wrong.</h1>
-    <a href="http://www.chouette.mobi/spip.php?rubrique38" target="_blank">Please describe us what happened</a>, we'll try to come back with an answer. <br/>Thank you.  <br/> <br/>
-    You can still continue the use the CHOUETTE application. <br/>
-    <a href="javascript:history.back()" >Back</a><br/>
-    <!-- <a href="referentials" >Home</a> -->
-  </div>
-</body>
-</html>
-\ No newline at end of file
author	jpl	2017-03-22 11:57:04 +0100
committer	jpl	2017-03-22 11:57:19 +0100
commit	ab39dca3844ff87c063d86b65748669fa3e7d223 (patch)
tree	082ad6cd29070194b530733bac14670c4ae67bd3
parent	fb7d67c9620a2f8168a0be5f6b922e2a2bf81e47 (diff)
download	chouette-core-ab39dca3844ff87c063d86b65748669fa3e7d223.tar.bz2