DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

layouts: rename "application" to "application_old"

Browse source
This commit is contained in:
Pierre de La Morinerie 2019-01-07 10:59:56 +00:00
parent f42af316d9
commit 5a36546485
21 changed files with 84 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin_controller.rb
View file

@ -1,4 +1,6 @@
class AdminController < ApplicationController
layout 'application_old'
before_action :authenticate_administrateur!
def index

2
app/controllers/administrateurs/activate_controller.rb
View file

@ -3,8 +3,6 @@ require 'zxcvbn'
class Administrateurs::ActivateController < ApplicationController
include TrustedDeviceConcern
layout "new_application"
def new
@administrateur = Administrateur.find_inactive_by_token(params[:token])

2
app/controllers/administrateurs/sessions_controller.rb
View file

@ -1,6 +1,4 @@
class Administrateurs::SessionsController < Sessions::SessionsController
layout "new_application"
def new
redirect_to new_user_session_path
end

2
app/controllers/administrations/sessions_controller.rb
View file

@ -1,6 +1,4 @@
class Administrations::SessionsController < ApplicationController
layout "new_application"
def new
end

2
app/controllers/demandes_controller.rb
View file

@ -1,6 +1,4 @@
class DemandesController < ApplicationController
layout "new_application"
def new
end

2
app/controllers/gestionnaires/activate_controller.rb
View file

@ -1,8 +1,6 @@
class Gestionnaires::ActivateController < ApplicationController
include TrustedDeviceConcern
layout "new_application"
def new
@gestionnaire = Gestionnaire.with_reset_password_token(params[:token])

2
app/controllers/gestionnaires/sessions_controller.rb
View file

@ -1,6 +1,4 @@
class Gestionnaires::SessionsController < Sessions::SessionsController
layout "new_application"
def new
redirect_to new_user_session_path
end

2
app/controllers/new_administrateur/administrateur_controller.rb
View file

@ -1,7 +1,5 @@
module NewAdministrateur
class AdministrateurController < ApplicationController
layout 'new_application'
before_action :authenticate_administrateur!
end
end

2
app/controllers/new_gestionnaire/avis_controller.rb
View file

@ -76,7 +76,7 @@ module NewGestionnaire
@email = params[:email]
@dossier = Avis.includes(:dossier).find(params[:id]).dossier
render layout: 'new_application'
render
end
def create_gestionnaire

2
app/controllers/new_gestionnaire/gestionnaire_controller.rb
View file

@ -1,7 +1,5 @@
module NewGestionnaire
class GestionnaireController < ApplicationController
layout "new_application"
before_action :authenticate_gestionnaire!
def nav_bar_profile

2
app/controllers/new_user/user_controller.rb
View file

@ -1,7 +1,5 @@
module NewUser
class UserController < ApplicationController
layout "new_application"
before_action :authenticate_user!
def nav_bar_profile

2
app/controllers/root_controller.rb
View file

@ -1,6 +1,4 @@
class RootController < ApplicationController
layout 'new_application'
def index
if administrateur_signed_in?
return redirect_to admin_procedures_path

2
app/controllers/stats_controller.rb
View file

@ -1,6 +1,4 @@
class StatsController < ApplicationController
layout "new_application"
before_action :authenticate_administration!, only: [:download]
MEAN_NUMBER_OF_CHAMPS_IN_A_FORM = 24.0

2
app/controllers/support_controller.rb
View file

@ -1,6 +1,4 @@
class SupportController < ApplicationController
layout "new_application"
def index
setup_context
end

2
app/controllers/users/confirmations_controller.rb
View file

@ -1,8 +1,6 @@
# frozen_string_literal: true
class Users::ConfirmationsController < Devise::ConfirmationsController
layout "new_application"
# GET /resource/confirmation/new
def new
# Allow displaying the user email in the message

2
app/controllers/users/passwords_controller.rb
View file

@ -1,6 +1,4 @@
class Users::PasswordsController < Devise::PasswordsController
layout "new_application"
after_action :try_to_authenticate_gestionnaire, only: [:update]
after_action :try_to_authenticate_administrateur, only: [:update]

2
app/controllers/users/registrations_controller.rb
View file

@ -1,6 +1,4 @@
class Users::RegistrationsController < Devise::RegistrationsController
layout "new_application"
# before_action :configure_sign_up_params, only: [:create]
# before_action :configure_account_update_params, only: [:update]

2
app/controllers/users/sessions_controller.rb
View file

@ -2,8 +2,6 @@ class Users::SessionsController < Sessions::SessionsController
include TrustedDeviceConcern
include ActionView::Helpers::DateHelper
layout "new_application"
# GET /resource/sign_in
def new
if user_return_to_procedure_id.present? # WTF ?

60
app/views/layouts/application.html.haml
View file

@ -1,23 +1,27 @@
%html
!!! 5
%html{ lang: "fr" }
%head
%meta{ :content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }/
%meta{ "http-equiv": "Content-Type", content: "text/html; charset=UTF-8" }
%meta{ "http-equiv": "X-UA-Compatible", content: "IE=edge" }
%meta{ name: "turbolinks-cache-control", content: "no-cache" }
%meta{ name: "viewport", content: "width=device-width, initial-scale=1" }
= csrf_meta_tags
%title
= t('dynamics.page_title')
%meta{ 'http-equiv' => "X-UA-Compatible", :content => "IE=edge" }
= content_for?(:title) ? "#{yield(:title)} · demarches-simplifiees.fr" : "demarches-simplifiees.fr"
= favicon_link_tag(image_url("favicons/16x16.png"), type: "image/png", sizes: "16x16")
= favicon_link_tag(image_url("favicons/32x32.png"), type: "image/png", sizes: "32x32")
= favicon_link_tag(image_url("favicons/96x96.png"), type: "image/png", sizes: "96x96")
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': "reload"
= stylesheet_link_tag 'print', media: 'print', 'data-turbolinks-track': "reload"
= javascript_pack_tag 'application-old', defer: true, 'data-turbolinks-track': 'reload'
= javascript_include_tag 'application', defer: true, 'data-turbolinks-track': 'reload'
= csrf_meta_tags
= javascript_pack_tag 'application', defer: true, 'data-turbolinks-track': 'reload'
= stylesheet_link_tag 'new_design/new_application', media: 'all', 'data-turbolinks-track': 'reload'
= stylesheet_link_tag 'new_design/print', media: 'print', 'data-turbolinks-track': 'reload'
- if Rails.env.development?
= stylesheet_link_tag :xray
= render partial: "layouts/matomo"
= render partial: "layouts/sendinblue"
:javascript
DATA = [{
@ -25,29 +29,21 @@
}];
%body{ class: browser.platform.ios? ? 'ios' : nil }
= render partial: 'layouts/outdated_browser_banner'
= render partial: 'layouts/pre_maintenance'
- if staging?
#beta
Env Test
.page-wrapper
= render partial: "layouts/outdated_browser_banner"
= render partial: 'layouts/pre_maintenance'
- if staging?
#beta
Env Test
#wrap
.row
#header.navbar
= render partial: "layouts/navbar"
.row.no-margin
- if RenderPartialService.left_panel_exist? @left_pannel_url
.col-xs-2#left-panel
= render partial: @left_pannel_url
- main_container_size = 10
- else
- main_container_size = 12
= render partial: "layouts/new_header"
= render partial: "layouts/flash_messages"
= yield
= render partial: 'layouts/main_container', locals: { main_container_size: main_container_size }
#mask-search
%h1
%i.fa.fa-times{ style: 'position: fixed; top: 10; right: 30; color: white;' }
- if content_for?(:footer)
= content_for(:footer)
= render partial: 'layouts/switch_devise_profile_module'
- if Rails.env.development?
= javascript_include_tag :xray
= render partial: 'layouts/footer', locals: { main_container_size: main_container_size }
= yield :charts_js

53
app/views/layouts/application_old.html.haml Normal file
View file

@ -0,0 +1,53 @@
%html
%head
%meta{ :content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }/
%meta{ name: "turbolinks-cache-control", content: "no-cache" }
%title
= t('dynamics.page_title')
%meta{ 'http-equiv' => "X-UA-Compatible", :content => "IE=edge" }
= favicon_link_tag(image_url("favicons/16x16.png"), type: "image/png", sizes: "16x16")
= favicon_link_tag(image_url("favicons/32x32.png"), type: "image/png", sizes: "32x32")
= favicon_link_tag(image_url("favicons/96x96.png"), type: "image/png", sizes: "96x96")
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': "reload"
= stylesheet_link_tag 'print', media: 'print', 'data-turbolinks-track': "reload"
= javascript_pack_tag 'application-old', defer: true, 'data-turbolinks-track': 'reload'
= javascript_include_tag 'application', defer: true, 'data-turbolinks-track': 'reload'
= csrf_meta_tags
= render partial: "layouts/matomo"
= render partial: "layouts/sendinblue"
:javascript
DATA = [{
sentry: #{raw(sentry_config)}
}];
%body{ class: browser.platform.ios? ? 'ios' : nil }
= render partial: 'layouts/outdated_browser_banner'
= render partial: 'layouts/pre_maintenance'
- if staging?
#beta
Env Test
#wrap
.row
#header.navbar
= render partial: "layouts/navbar"
.row.no-margin
- if RenderPartialService.left_panel_exist? @left_pannel_url
.col-xs-2#left-panel
= render partial: @left_pannel_url
- main_container_size = 10
- else
- main_container_size = 12
= render partial: 'layouts/main_container', locals: { main_container_size: main_container_size }
#mask-search
%h1
%i.fa.fa-times{ style: 'position: fixed; top: 10; right: 30; color: white;' }
= render partial: 'layouts/switch_devise_profile_module'
= render partial: 'layouts/footer', locals: { main_container_size: main_container_size }

49
app/views/layouts/new_application.html.haml
View file

@ -1,49 +0,0 @@
!!! 5
%html{ lang: "fr" }
%head
%meta{ "http-equiv": "Content-Type", content: "text/html; charset=UTF-8" }
%meta{ "http-equiv": "X-UA-Compatible", content: "IE=edge" }
%meta{ name: "turbolinks-cache-control", content: "no-cache" }
%meta{ name: "viewport", content: "width=device-width, initial-scale=1" }
= csrf_meta_tags
%title
= content_for?(:title) ? "#{yield(:title)} · demarches-simplifiees.fr" : "demarches-simplifiees.fr"
= favicon_link_tag(image_url("favicons/16x16.png"), type: "image/png", sizes: "16x16")
= favicon_link_tag(image_url("favicons/32x32.png"), type: "image/png", sizes: "32x32")
= favicon_link_tag(image_url("favicons/96x96.png"), type: "image/png", sizes: "96x96")
= javascript_pack_tag 'application', defer: true, 'data-turbolinks-track': 'reload'
= stylesheet_link_tag 'new_design/new_application', media: 'all', 'data-turbolinks-track': 'reload'
= stylesheet_link_tag 'new_design/print', media: 'print', 'data-turbolinks-track': 'reload'
- if Rails.env.development?
= stylesheet_link_tag :xray
= render partial: "layouts/matomo"
:javascript
DATA = [{
sentry: #{raw(sentry_config)}
}];
%body{ class: browser.platform.ios? ? 'ios' : nil }
.page-wrapper
= render partial: "layouts/outdated_browser_banner"
= render partial: 'layouts/pre_maintenance'
- if staging?
#beta
Env Test
= render partial: "layouts/new_header"
= render partial: "layouts/flash_messages"
= yield
- if content_for?(:footer)
= content_for(:footer)
- if Rails.env.development?
= javascript_include_tag :xray
= yield :charts_js