From 7f2d5f6248d70ab1b1e837f55231750d9ffff5a0 Mon Sep 17 00:00:00 2001
From: Pierre de La Morinerie <kemenaran@gmail.com>
Date: Wed, 4 Dec 2019 14:28:42 +0000
Subject: [PATCH] app: unify pre-maintenance banner with other site-wide
 banners

---
 app/assets/stylesheets/_maintenance.scss          | 15 ---------------
 app/assets/stylesheets/application.scss           |  1 -
 .../stylesheets/new_design/_maintenance.scss      |  8 --------
 .../stylesheets/new_design/site_banner.scss       |  4 ++++
 app/assets/stylesheets/site_banner.scss           |  4 ++++
 app/views/layouts/_main_container.html.haml       |  1 +
 app/views/layouts/_pre_maintenance.html.haml      | 11 ++++++++---
 app/views/layouts/application_old.html.haml       |  1 -
 8 files changed, 17 insertions(+), 28 deletions(-)
 delete mode 100644 app/assets/stylesheets/_maintenance.scss
 delete mode 100644 app/assets/stylesheets/new_design/_maintenance.scss

diff --git a/app/assets/stylesheets/_maintenance.scss b/app/assets/stylesheets/_maintenance.scss
deleted file mode 100644
index dd59c31d6..000000000
--- a/app/assets/stylesheets/_maintenance.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-.maintenance {
-  width: 100%;
-  position: fixed;
-  top: 0;
-  z-index: 100;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-
-  span {
-    margin: auto;
-    background: #FFD8A6;
-    padding: 0 4px;
-  }
-}
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e9254da3e..e9dd51d18 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -9,7 +9,6 @@
 // defined in the other CSS/SCSS files in this directory. It is generally better to create a new
 // file per style scope.
 //
-// = require _maintenance
 // = require _card
 // = require _helpers
 // = require _turbolinks
diff --git a/app/assets/stylesheets/new_design/_maintenance.scss b/app/assets/stylesheets/new_design/_maintenance.scss
deleted file mode 100644
index 153a5f685..000000000
--- a/app/assets/stylesheets/new_design/_maintenance.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import "colors";
-
-.maintenance {
-  padding: 20px;
-  text-align: center;
-  width: 100%;
-  background: $orange-bg;
-}
diff --git a/app/assets/stylesheets/new_design/site_banner.scss b/app/assets/stylesheets/new_design/site_banner.scss
index db86d4938..6b4448781 100644
--- a/app/assets/stylesheets/new_design/site_banner.scss
+++ b/app/assets/stylesheets/new_design/site_banner.scss
@@ -9,6 +9,10 @@
   background-color: $yellow;
   border-bottom: 1px dashed rgba(0, 0, 0, 0.6);
 
+  &.warning {
+    background-color: $orange-bg;
+  }
+
   .container {
     display: flex;
     align-items: center;
diff --git a/app/assets/stylesheets/site_banner.scss b/app/assets/stylesheets/site_banner.scss
index d4b20a9a1..9db9b754f 100644
--- a/app/assets/stylesheets/site_banner.scss
+++ b/app/assets/stylesheets/site_banner.scss
@@ -6,6 +6,10 @@
   background-color: #FEF3B8;
   border-bottom: 1px dashed rgba(0, 0, 0, 0.6);
 
+  &.warning {
+    background-color: #FFD8A6;
+  }
+
   .container {
     display: flex;
     width: auto;
diff --git a/app/views/layouts/_main_container.html.haml b/app/views/layouts/_main_container.html.haml
index ff74bc38d..bd4d39896 100644
--- a/app/views/layouts/_main_container.html.haml
+++ b/app/views/layouts/_main_container.html.haml
@@ -1,6 +1,7 @@
 #main-container{ class: "col-xs-#{main_container_size}" }
   .row
     = render partial: 'layouts/outdated_browser_banner'
+    = render partial: 'layouts/pre_maintenance'
   .row
     = render partial: 'layouts/flash_messages'
   .row
diff --git a/app/views/layouts/_pre_maintenance.html.haml b/app/views/layouts/_pre_maintenance.html.haml
index c14ca1e61..28327f13d 100644
--- a/app/views/layouts/_pre_maintenance.html.haml
+++ b/app/views/layouts/_pre_maintenance.html.haml
@@ -1,4 +1,9 @@
 - if feature_enabled?(:pre_maintenance_mode)
-  .maintenance
-    %span
-      Une opération de maintenance est prévue sur demarches-simplifiees.fr à 23 h 00. La plateforme sera inaccessible pendant une vingtaine de minutes.
+  .site-banner.warning
+    .container
+      .site-banner-icon 🕚
+      .site-banner-text
+        %strong
+          Une opération de maintenance est prévue sur demarches-simplifiees.fr à 23 h 00.
+        %br
+        La plateforme sera inaccessible pendant une vingtaine de minutes.
diff --git a/app/views/layouts/application_old.html.haml b/app/views/layouts/application_old.html.haml
index 80fd1109e..96217b370 100644
--- a/app/views/layouts/application_old.html.haml
+++ b/app/views/layouts/application_old.html.haml
@@ -19,7 +19,6 @@
     = Gon::Base.render_data(camel_case: true, init: true)
 
   %body{ class: browser.platform.ios? ? 'ios' : nil }
-    = render partial: 'layouts/pre_maintenance'
     - if staging?
       #beta
         Env Test