Merge branch 'dev'
This commit is contained in:
commit
c52ffc6dec
10 changed files with 38 additions and 3 deletions
15
app/assets/stylesheets/_maintenance.scss
Normal file
15
app/assets/stylesheets/_maintenance.scss
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
.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;
|
||||||
|
}
|
||||||
|
}
|
|
@ -12,6 +12,7 @@
|
||||||
// defined in the other CSS/SCSS files in this directory. It is generally better to create a new
|
// defined in the other CSS/SCSS files in this directory. It is generally better to create a new
|
||||||
// file per style scope.
|
// file per style scope.
|
||||||
//
|
//
|
||||||
|
// = require _maintenance
|
||||||
// = require _card
|
// = require _card
|
||||||
// = require _helpers
|
// = require _helpers
|
||||||
// = require _turbolinks
|
// = require _turbolinks
|
||||||
|
|
8
app/assets/stylesheets/new_design/_maintenance.scss
Normal file
8
app/assets/stylesheets/new_design/_maintenance.scss
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
@import "colors";
|
||||||
|
|
||||||
|
.maintenance {
|
||||||
|
padding: 20px;
|
||||||
|
text-align: center;
|
||||||
|
width: 100%;
|
||||||
|
background: $orange-bg;
|
||||||
|
}
|
4
app/views/layouts/_pre_maintenance.html.haml
Normal file
4
app/views/layouts/_pre_maintenance.html.haml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
- if Flipflop.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.
|
|
@ -17,6 +17,7 @@
|
||||||
= csrf_meta_tags
|
= csrf_meta_tags
|
||||||
%body
|
%body
|
||||||
= render partial: 'layouts/support_navigator_banner'
|
= render partial: 'layouts/support_navigator_banner'
|
||||||
|
= render partial: 'layouts/pre_maintenance'
|
||||||
- if Rails.env == 'staging'
|
- if Rails.env == 'staging'
|
||||||
#beta
|
#beta
|
||||||
Env Test
|
Env Test
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
.page-wrapper
|
.page-wrapper
|
||||||
= render partial: "layouts/support_navigator_banner"
|
= render partial: "layouts/support_navigator_banner"
|
||||||
= render partial: "layouts/ie_lt_10"
|
= render partial: "layouts/ie_lt_10"
|
||||||
|
= render partial: 'layouts/pre_maintenance'
|
||||||
- if Rails.env == "staging"
|
- if Rails.env == "staging"
|
||||||
#beta
|
#beta
|
||||||
Env Test
|
Env Test
|
||||||
|
|
|
@ -22,5 +22,6 @@ Flipflop.configure do
|
||||||
default: Rails.env.production?
|
default: Rails.env.production?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
feature :pre_maintenance_mode
|
||||||
feature :maintenance_mode
|
feature :maintenance_mode
|
||||||
end
|
end
|
||||||
|
|
|
@ -150,7 +150,7 @@ Devise.setup do |config|
|
||||||
# ==> Configuration for :timeoutable
|
# ==> Configuration for :timeoutable
|
||||||
# The time you want to timeout the user session without activity. After this
|
# The time you want to timeout the user session without activity. After this
|
||||||
# time the user will be asked for credentials again. Default is 30 minutes.
|
# time the user will be asked for credentials again. Default is 30 minutes.
|
||||||
config.timeout_in = 24.hours
|
config.timeout_in = 1.hour
|
||||||
|
|
||||||
# If true, expires auth token on session timeout.
|
# If true, expires auth token on session timeout.
|
||||||
# config.expire_auth_token_on_timeout = false
|
# config.expire_auth_token_on_timeout = false
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
class RemoveParentProcedureForeignKey < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
remove_foreign_key :procedures, column: "parent_procedure_id"
|
||||||
|
end
|
||||||
|
end
|
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 2018_04_24_130548) do
|
ActiveRecord::Schema.define(version: 2018_05_02_092852) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
@ -574,7 +574,6 @@ ActiveRecord::Schema.define(version: 2018_04_24_130548) do
|
||||||
add_foreign_key "procedure_paths", "administrateurs"
|
add_foreign_key "procedure_paths", "administrateurs"
|
||||||
add_foreign_key "procedure_paths", "procedures"
|
add_foreign_key "procedure_paths", "procedures"
|
||||||
add_foreign_key "procedure_presentations", "assign_tos"
|
add_foreign_key "procedure_presentations", "assign_tos"
|
||||||
add_foreign_key "procedures", "procedures", column: "parent_procedure_id"
|
|
||||||
add_foreign_key "received_mails", "procedures"
|
add_foreign_key "received_mails", "procedures"
|
||||||
add_foreign_key "refused_mails", "procedures"
|
add_foreign_key "refused_mails", "procedures"
|
||||||
add_foreign_key "without_continuation_mails", "procedures"
|
add_foreign_key "without_continuation_mails", "procedures"
|
||||||
|
|
Loading…
Reference in a new issue