From 6db4a69cb2b17241ab4237c1b90663c53b788945 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 6 Apr 2017 19:10:25 +0200 Subject: [PATCH] Use spaces inside hashes --- .../accompagnateurs/_list_assign.html.haml | 8 ++--- .../_list_not_assign.html.haml | 8 ++--- .../admin/accompagnateurs/show.html.haml | 4 +-- .../change_dossier_state/check.html.haml | 4 +-- .../gestionnaires/_informations.html.haml | 2 +- app/views/admin/gestionnaires/_list.html.haml | 6 ++-- app/views/admin/gestionnaires/index.html.haml | 4 +-- app/views/admin/mail_templates/edit.html.haml | 2 +- .../admin/procedures/_informations.html.haml | 8 ++--- app/views/admin/procedures/_list.html.haml | 2 +- .../admin/procedures/_modal_publish.html.haml | 8 ++--- .../procedures/_modal_transfer.html.haml | 16 +++++----- app/views/admin/procedures/_onglets.html.haml | 14 ++++---- app/views/admin/procedures/edit.html.haml | 4 +-- app/views/admin/procedures/index.html.haml | 2 +- app/views/admin/procedures/new.html.haml | 4 +-- app/views/admin/procedures/show.html.haml | 20 ++++++------ .../administrateurs/sessions/new.html.haml | 2 +- app/views/administrations/index.html.haml | 2 +- .../dossiers/_filter_framed.html.haml | 6 ++-- app/views/backoffice/dossiers/_list.html.haml | 10 +++--- .../backoffice/dossiers/_pref_list.html.haml | 10 +++--- .../dossiers/_state_description.html.haml | 4 +-- app/views/cgu/index.html.haml | 26 +++++++-------- app/views/commencer/archived.html.haml | 6 ++-- app/views/demo/_list.html.haml | 2 +- app/views/dossiers/_dossier_show.html.haml | 12 +++---- app/views/dossiers/_edit_carto.html.haml | 2 +- app/views/dossiers/_edit_dossier.html.haml | 2 +- .../dossiers/_edit_pieces_jointes.html.haml | 4 +-- app/views/dossiers/_infos_carto.html.haml | 10 +++--- app/views/dossiers/_infos_dossier.html.haml | 30 ++++++++--------- .../dossiers/_infos_pieces_jointes.html.haml | 12 +++---- .../dossiers/_infos_private_fields.html.haml | 8 ++--- app/views/dossiers/_invites.html.haml | 2 +- app/views/dossiers/_messagerie.html.haml | 2 +- .../dossiers/_pieces_justificatives.html.haml | 14 ++++---- .../dossiers/commentaires/_form.html.haml | 4 +-- app/views/dossiers/etapes/_etape1.html.haml | 6 ++-- .../etapes/etape_2/_entreprise.html.haml | 8 ++--- .../etapes/etape_2/_individual.html.haml | 6 ++-- .../particulier/check_email.html.haml | 4 +-- .../france_connect/particulier/new.html.haml | 2 +- app/views/layouts/_etape_suivante.html.haml | 2 +- app/views/layouts/_footer.html.haml | 2 +- app/views/layouts/_ie_lt_10.html.haml | 2 +- .../_modifications_terminees.html.haml | 6 ++-- app/views/layouts/_navbar.html.haml | 2 +- .../_support_navigator_banner.html.haml | 2 +- .../_switch_devise_profile_module.html.haml | 2 +- app/views/layouts/application.html.haml | 14 ++++---- ...n_accompagnateurscontroller_show.html.haml | 2 +- ...min_mailtemplatescontroller_edit.html.haml | 2 +- ...in_mailtemplatescontroller_index.html.haml | 2 +- ...cesjustificativescontroller_show.html.haml | 2 +- ...previsualisationscontroller_show.html.haml | 2 +- ..._admin_procedurescontroller_edit.html.haml | 2 +- ...admin_procedurescontroller_index.html.haml | 12 +++---- ...dmin_procedurescontroller_navbar.html.haml | 32 +++++++++---------- ..._admin_procedurescontroller_show.html.haml | 2 +- ...dmin_typesdechampcontroller_show.html.haml | 2 +- ...pesdechampprivatecontroller_show.html.haml | 2 +- ...koffice_dossierscontroller_index.html.haml | 6 ++-- ...ckoffice_dossierscontroller_show.html.haml | 8 ++--- .../_left_panel_cgucontroller_index.html.haml | 2 +- ...l_users_dossierscontroller_index.html.haml | 10 +++--- .../left_panels/_search_area.html.haml | 2 +- ...admin_procedurescontroller_index.html.haml | 6 ++-- ...ssiers_procedurecontroller_index.html.haml | 2 +- ...ckoffice_dossierscontroller_show.html.haml | 2 +- ...ers_recapitulatifcontroller_show.html.haml | 2 +- app/views/root/landing.html.haml | 16 +++++----- app/views/users/carte/_init_carto.html.haml | 2 +- app/views/users/carte/_map.html.haml | 2 +- app/views/users/carte/show.html.haml | 20 ++++++------ app/views/users/description/_champs.html.haml | 8 ++--- .../_pieces_justificatives.html.haml | 6 ++-- app/views/users/description/_show.html.haml | 20 ++++++------ .../description/champs/_checkbox.html.haml | 2 +- .../description/champs/_datetime.html.haml | 12 +++---- .../description/champs/_engagement.html.haml | 4 +-- .../champs/_header_private_section.html.haml | 2 +- .../champs/_header_section.html.haml | 2 +- .../champs/_render_list_champs.html.haml | 10 +++--- .../description/champs/_textarea.html.haml | 4 +-- app/views/users/dossiers/_list.html.haml | 4 +-- .../dossiers/_state_description.html.haml | 4 +-- app/views/users/dossiers/index.html.haml | 2 +- .../recapitulatif/_modal_upload_pj.html.haml | 12 +++---- .../sessions/_resume_procedure.html.haml | 2 +- app/views/users/sessions/new.html.haml | 4 +-- app/views/users/siret/_pro.html.haml | 8 ++--- 92 files changed, 296 insertions(+), 296 deletions(-) diff --git a/app/views/admin/accompagnateurs/_list_assign.html.haml b/app/views/admin/accompagnateurs/_list_assign.html.haml index 3dac05419..13cf19de2 100644 --- a/app/views/admin/accompagnateurs/_list_assign.html.haml +++ b/app/views/admin/accompagnateurs/_list_assign.html.haml @@ -1,17 +1,17 @@ -.row{style:'height: 34px'} +.row{ style:'height: 34px' } - unless smart_listing.empty? %table.table#liste_gestionnaire %thead %th Enlever - %th#email{style:'text-align: right'} Email + %th#email{ style:'text-align: right' } Email - @accompagnateurs_assign.each do |accompagnateur| %tr %td.col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1.center - %a.btn.btn-primary{href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::NOT_ASSIGN)}", 'data-method' => 'put'} + %a.btn.btn-primary{ href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::NOT_ASSIGN)}", 'data-method' => 'put' } .fa.fa-arrow-left - %td{style:'padding-top: 11px; font-size:15px; text-align:right'}= accompagnateur.email + %td{ style:'padding-top: 11px; font-size:15px; text-align:right' }= accompagnateur.email = smart_listing.paginate = smart_listing.pagination_per_page_links diff --git a/app/views/admin/accompagnateurs/_list_not_assign.html.haml b/app/views/admin/accompagnateurs/_list_not_assign.html.haml index 3eb519dcd..253472585 100644 --- a/app/views/admin/accompagnateurs/_list_not_assign.html.haml +++ b/app/views/admin/accompagnateurs/_list_not_assign.html.haml @@ -1,8 +1,8 @@ -= smart_listing_controls_for(:accompagnateurs_not_assign, {class: "form-inline text-right"}) do += smart_listing_controls_for(:accompagnateurs_not_assign, { class: "form-inline text-right" }) do .form-group.filter.input-append = text_field_tag :filter, '', class: "search form-control", placeholder: "Recherche...", autocomplete: :off - %button.btn.btn-primary{type: :submit} + %button.btn.btn-primary{ type: :submit } %span.fa.fa-search - unless smart_listing.empty? @@ -14,9 +14,9 @@ - @accompagnateurs_not_assign.each do |accompagnateur| %tr - %td.col-xs-11{style:'padding-top: 11px; font-size:15px'}= accompagnateur.email + %td.col-xs-11{ style:'padding-top: 11px; font-size:15px' }= accompagnateur.email %td.center - %a.btn.btn-success.gestionnaire-affectation{href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::ASSIGN)}", 'data-method' => 'put'} + %a.btn.btn-success.gestionnaire-affectation{ href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::ASSIGN)}", 'data-method' => 'put' } .fa.fa-arrow-right diff --git a/app/views/admin/accompagnateurs/show.html.haml b/app/views/admin/accompagnateurs/show.html.haml index eba44b222..0d75bc522 100644 --- a/app/views/admin/accompagnateurs/show.html.haml +++ b/app/views/admin/accompagnateurs/show.html.haml @@ -9,11 +9,11 @@ %h3 = t('dynamics.admin.procedure.onglet_accompagnateurs.add.title') #procedure_new.section.section-label - = form_for @gestionnaire, url: {controller: 'admin/gestionnaires', action: :create} do |f| + = form_for @gestionnaire, url: { controller: 'admin/gestionnaires', action: :create } do |f| .row .col-xs-5 = hidden_field_tag :procedure_id, params[:procedure_id] - = render partial: 'admin/gestionnaires/informations', locals: {f: f} + = render partial: 'admin/gestionnaires/informations', locals: { f: f } .col-xs-2 %br %br diff --git a/app/views/admin/change_dossier_state/check.html.haml b/app/views/admin/change_dossier_state/check.html.haml index 957c4f3c7..e92ed72d8 100644 --- a/app/views/admin/change_dossier_state/check.html.haml +++ b/app/views/admin/change_dossier_state/check.html.haml @@ -10,8 +10,8 @@ = @dossier.decorate.display_state %br État souhaité : - %select{id: :next_state, name: :next_state} + %select{ id: :next_state, name: :next_state } - Dossier.states.each do |state| - %option{value: state[0]} + %option{ value: state[0] } = DossierDecorator.case_state_fr state[1] = f.submit 'Valider' diff --git a/app/views/admin/gestionnaires/_informations.html.haml b/app/views/admin/gestionnaires/_informations.html.haml index f7246847c..29b25928d 100644 --- a/app/views/admin/gestionnaires/_informations.html.haml +++ b/app/views/admin/gestionnaires/_informations.html.haml @@ -1,4 +1,4 @@ -- {email: 'Email*'}.each do |key, value| +- { email: 'Email*' }.each do |key, value| .form-group %h4 = value diff --git a/app/views/admin/gestionnaires/_list.html.haml b/app/views/admin/gestionnaires/_list.html.haml index e2b768e52..5558f6d13 100644 --- a/app/views/admin/gestionnaires/_list.html.haml +++ b/app/views/admin/gestionnaires/_list.html.haml @@ -6,13 +6,13 @@ - @gestionnaires.each do |gestionnaire| %tr - %td{style:'padding-top: 11px; font-size:15px'}= gestionnaire.email + %td{ style:'padding-top: 11px; font-size:15px' }= gestionnaire.email %td{ style: 'text-align:right' } .delete.btn.btn-sm.fa.fa-trash .confirm - = link_to 'Valider', admin_gestionnaire_path(id: gestionnaire.id), {method: :delete, class: 'btn btn-sm btn-success'} - .cancel.btn.btn-sm.btn-danger.fa.fa-minus{style: 'top: 0'} + = link_to 'Valider', admin_gestionnaire_path(id: gestionnaire.id), { method: :delete, class: 'btn btn-sm btn-success' } + .cancel.btn.btn-sm.btn-danger.fa.fa-minus{ style: 'top: 0' } = smart_listing.paginate = smart_listing.pagination_per_page_links diff --git a/app/views/admin/gestionnaires/index.html.haml b/app/views/admin/gestionnaires/index.html.haml index aa9836843..3c65e0e3e 100644 --- a/app/views/admin/gestionnaires/index.html.haml +++ b/app/views/admin/gestionnaires/index.html.haml @@ -9,10 +9,10 @@ .col-xs-6 %h3 Ajouter un accompagnateur #procedure_new.section.section-label - = form_for @gestionnaire, url: {controller: 'admin/gestionnaires', action: :create} do |f| + = form_for @gestionnaire, url: { controller: 'admin/gestionnaires', action: :create } do |f| .row .col-xs-5 - = render partial: 'informations', locals: {f: f} + = render partial: 'informations', locals: { f: f } .col-xs-2 %br %br diff --git a/app/views/admin/mail_templates/edit.html.haml b/app/views/admin/mail_templates/edit.html.haml index 8d72c9cc6..99e7e7c1a 100644 --- a/app/views/admin/mail_templates/edit.html.haml +++ b/app/views/admin/mail_templates/edit.html.haml @@ -9,7 +9,7 @@ .row .col-md-6 = f.input :object, label: "Objet de l'email" - = f.input :body, label: "Corps de l'email", input_html: {class: 'wysihtml5'} + = f.input :body, label: "Corps de l'email", input_html: { class: 'wysihtml5' } .text-right = link_to "Annuler", admin_procedure_mail_templates_path(@procedure), class: "btn btn-default" = f.button :submit, 'Mettre à jour', class: "btn-success" diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml index 5b62353d9..3053278d3 100644 --- a/app/views/admin/procedures/_informations.html.haml +++ b/app/views/admin/procedures/_informations.html.haml @@ -2,7 +2,7 @@ .alert.alert-info Cette procédure est publiée, certains éléments de la description ne sont plus modifiables -- {libelle: 'Libellé*', description: 'Description*', organisation: 'Organisation', direction: 'Direction', lien_site_web: 'Lien site internet', lien_notice: 'Lien notice'}.each do |key, value| +- { libelle: 'Libellé*', description: 'Description*', organisation: 'Organisation', direction: 'Direction', lien_site_web: 'Lien site internet', lien_notice: 'Lien notice' }.each do |key, value| .form-group %h4 = value @@ -16,10 +16,10 @@ .col-md-6 %h4 Logo de la procédure - unless @procedure.logo.blank? - = image_tag @procedure.decorate.logo_img, {style: 'height: 40px; display: inline; margin-right: 6px', id: 'preview_procedure_logo'} + = image_tag @procedure.decorate.logo_img, { style: 'height: 40px; display: inline; margin-right: 6px', id: 'preview_procedure_logo' } = f.file_field :logo, accept: 'image/png, image/jpg, image/jpeg', style: 'display:inline' - %div{style:'margin-top:5px'} + %div{ style:'margin-top:5px' } %i Fichier accepté : JPG / JPEG / PNG .col-md-6 @@ -83,7 +83,7 @@ .col-md-6 %h4 Options avancées - %label{ for: :auto_archive_on} Archivage automatique le + %label{ for: :auto_archive_on } Archivage automatique le = f.text_field :auto_archive_on, id: 'auto_archive_on', value: @procedure.auto_archive_on.try{ |d| d.strftime("%d-%m-%Y") }, data: { provide: 'datepicker', 'date-language' => 'fr', 'date-format' => 'dd/mm/yyyy' } (à 00h00) %p.help-block diff --git a/app/views/admin/procedures/_list.html.haml b/app/views/admin/procedures/_list.html.haml index 365c6cab6..cc2f21c65 100644 --- a/app/views/admin/procedures/_list.html.haml +++ b/app/views/admin/procedures/_list.html.haml @@ -10,7 +10,7 @@ - @procedures.each do |procedure| - procedure = procedure.decorate - %tr{id: "tr_dossier_#{procedure.id}", 'data-dossier_url' => admin_procedure_path(id: procedure.id)} + %tr{ id: "tr_dossier_#{procedure.id}", 'data-dossier_url' => admin_procedure_path(id: procedure.id) } %td= procedure.id %td.col-xs-6 = procedure.libelle diff --git a/app/views/admin/procedures/_modal_publish.html.haml b/app/views/admin/procedures/_modal_publish.html.haml index 1749f2e77..746d58325 100644 --- a/app/views/admin/procedures/_modal_publish.html.haml +++ b/app/views/admin/procedures/_modal_publish.html.haml @@ -1,10 +1,10 @@ -#publishModal.modal.fade{"aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1"} - .modal-dialog.modal-lg{:role => "document"} +#publishModal.modal.fade{ "aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1" } + .modal-dialog.modal-lg{ :role => "document" } = form_tag admin_procedure_publish_path(procedure_id: @procedure.id), method: :put, remote: true do .modal-content .modal-header - %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"} - %span{"aria-hidden" => "true"} × + %button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" } + %span{ "aria-hidden" => "true" } × %h4#myModalLabel.modal-title = @procedure.archived?? 'Réactiver' : 'Publier' la procédure diff --git a/app/views/admin/procedures/_modal_transfer.html.haml b/app/views/admin/procedures/_modal_transfer.html.haml index bda255d8f..777c292da 100644 --- a/app/views/admin/procedures/_modal_transfer.html.haml +++ b/app/views/admin/procedures/_modal_transfer.html.haml @@ -1,21 +1,21 @@ -#transferModal.modal.fade{"aria-labelledby" => "TransferProcedureModal", :role => "dialog", :tabindex => "-1"} - .modal-dialog.modal-md{:role => "document"} +#transferModal.modal.fade{ "aria-labelledby" => "TransferProcedureModal", :role => "dialog", :tabindex => "-1" } + .modal-dialog.modal-md{ :role => "document" } = form_tag admin_procedure_transfer_path(procedure_id: @procedure.id), method: :post, remote: true do .modal-content .modal-header - %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"} - %span{"aria-hidden" => "true"} × + %button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" } + %span{ "aria-hidden" => "true" } × %h4#myModalLabel.modal-title Petit transfert de procédure entre administrateur .modal-body %p Cette fonctionnalité vous permet de transmettre un clone de votre procédure à un autre administrateur. - %div{style:'margin-top:20px'} - = text_field_tag :email_admin, '', {class: 'form-control', + %div{ style:'margin-top:20px' } + = text_field_tag :email_admin, '', { class: 'form-control', type: 'email', placeholder: 'Email administrateur cible', - style: 'width: 300px; margin-left:auto; margin-right:auto'} - %div#not_found_admin.center.text-danger{style:'display:none; margin-top: 10px'} + style: 'width: 300px; margin-left:auto; margin-right:auto' } + %div#not_found_admin.center.text-danger{ style:'display:none; margin-top: 10px' } Cet administrateur n'existe pas. .modal-footer = submit_tag "Envoyer", class: 'btn btn-success' diff --git a/app/views/admin/procedures/_onglets.html.haml b/app/views/admin/procedures/_onglets.html.haml index c6a98171e..0f25a9e36 100644 --- a/app/views/admin/procedures/_onglets.html.haml +++ b/app/views/admin/procedures/_onglets.html.haml @@ -1,17 +1,17 @@ #onglets %ul.nav.nav-tabs - %li{class: @draft_class} - %a{:href => "#{url_for :admin_procedures_draft}"} + %li{ class: @draft_class } + %a{ :href => "#{url_for :admin_procedures_draft}" } %h5.text-primary Brouillons - %li{class: @active_class} - %a{:href => "#{url_for :admin_procedures}"} + %li{ class: @active_class } + %a{ :href => "#{url_for :admin_procedures}" } %h5.text-success Actives - %li{class: @archived_class} - %a{:href => "#{url_for :admin_procedures_archived}"} - %h5{style: 'color: black'} + %li{ class: @archived_class } + %a{ :href => "#{url_for :admin_procedures_archived}" } + %h5{ style: 'color: black' } Archivées %br diff --git a/app/views/admin/procedures/edit.html.haml b/app/views/admin/procedures/edit.html.haml index de42e8835..6ffe6fb12 100644 --- a/app/views/admin/procedures/edit.html.haml +++ b/app/views/admin/procedures/edit.html.haml @@ -1,6 +1,6 @@ .row.white-back #procedure_new.section.section-label - = form_for @procedure, url: url_for({controller: 'admin/procedures', action: :update, id: @procedure.id}), multipart: true do |f| - = render partial: 'informations', locals: {f: f} + = form_for @procedure, url: url_for({ controller: 'admin/procedures', action: :update, id: @procedure.id }), multipart: true do |f| + = render partial: 'informations', locals: { f: f } .text-right = f.submit 'Enregistrer', class: 'btn btn-success' diff --git a/app/views/admin/procedures/index.html.haml b/app/views/admin/procedures/index.html.haml index cd41c6513..43344b41d 100644 --- a/app/views/admin/procedures/index.html.haml +++ b/app/views/admin/procedures/index.html.haml @@ -6,7 +6,7 @@ .carret-right .carret-down Procédures - %a{href:'/admin/procedures/new'} + %a{ href:'/admin/procedures/new' } %div#new-procedure.col-lg-2.col-md-2.col-sm-2.col-xs-2.action Nouvelle diff --git a/app/views/admin/procedures/new.html.haml b/app/views/admin/procedures/new.html.haml index 703f98e12..d8bbb4c37 100644 --- a/app/views/admin/procedures/new.html.haml +++ b/app/views/admin/procedures/new.html.haml @@ -3,6 +3,6 @@ = t('dynamics.admin.dossiers.tableau_de_bord.nouvelle_procedure') #procedure_new.section.section-label - = form_for @procedure, url: {controller: 'admin/procedures', action: :create}, multipart: true do |f| - = render partial: 'informations', locals: {f: f} + = form_for @procedure, url: { controller: 'admin/procedures', action: :create }, multipart: true do |f| + = render partial: 'informations', locals: { f: f } = f.submit 'Valider', class: 'btn btn-info', id: 'save-procedure', style: 'float:right' diff --git a/app/views/admin/procedures/show.html.haml b/app/views/admin/procedures/show.html.haml index 38297849c..28d584650 100644 --- a/app/views/admin/procedures/show.html.haml +++ b/app/views/admin/procedures/show.html.haml @@ -2,24 +2,24 @@ #procedure_show - unless @facade.procedure.published? - if @facade.procedure.gestionnaires.size == 0 - %a.action_button.btn.btn-success{style:'float: right; margin-top: 10px', disabled: 'disabled', 'data-toggle' => :tooltip, title: 'Vous ne pouvez pas publier une procédure sans qu\'aucun accompagnateur ne soit affecté à celle-ci.', id: 'publish-procedure'} + %a.action_button.btn.btn-success{ style:'float: right; margin-top: 10px', disabled: 'disabled', 'data-toggle' => :tooltip, title: 'Vous ne pouvez pas publier une procédure sans qu\'aucun accompagnateur ne soit affecté à celle-ci.', id: 'publish-procedure' } %i.fa.fa-eraser Publier - else - %a.btn.btn-success{"data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px', id: 'publish-procedure'} + %a.btn.btn-success{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px', id: 'publish-procedure' } %i.fa.fa-eraser Publier = render partial: '/admin/procedures/modal_publish' - %a#transfer.btn.btn-small.btn-default{"data-target" => "#transferModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px; margin-right: 10px'} + %a#transfer.btn.btn-small.btn-default{ "data-target" => "#transferModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px; margin-right: 10px' } %i.fa.fa-exchange Transférer = render partial: '/admin/procedures/modal_transfer' - if @facade.procedure.archived? - %a#reenable.btn.btn-small.btn-default.text-info{"data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px'} + %a#reenable.btn.btn-small.btn-default.text-info{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px' } %i.fa.fa-eraser Réactiver @@ -27,14 +27,14 @@ - elsif @facade.procedure.published? = form_tag admin_procedure_archive_path(procedure_id: @facade.procedure.id, archive: !@facade.procedure.archived?), method: :put, style:'float: right; margin-top: 10px' do - %button#archive.btn.btn-small.btn-default.text-info{type: :button} + %button#archive.btn.btn-small.btn-default.text-info{ type: :button } %i.fa.fa-eraser Archiver #confirm - %button#valid.btn.btn-small.btn-success{type: :submit} + %button#valid.btn.btn-small.btn-success{ type: :submit } %i.fa.fa-check Valider - %button#cancel.btn.btn-small.btn-danger{type: :button} + %button#cancel.btn.btn-small.btn-danger{ type: :button } %i.fa.fa-remove Annuler @@ -45,7 +45,7 @@ %div %h3 Lien procédure - %div{style:'margin-left:3%'} + %div{ style:'margin-left:3%' } - if @facade.procedure.published? = link_to @facade.procedure.lien, @facade.procedure.lien, target: '_blank' - else @@ -55,7 +55,7 @@ %br %h3 Détails - .row{style:'margin-right:3%; margin-left:3%;'} + .row{ style:'margin-right:3%; margin-left:3%;' } .description.col-xs-6.col-md-3.procedure-description %h4.text-info = @facade.procedure.libelle @@ -93,7 +93,7 @@ = t('dynamics.admin.procedure.stats.title') .row - .col-xs-6{style:'margin-left:3%'} + .col-xs-6{ style:'margin-left:3%' } %h4 Total %div = @facade.dossiers_total diff --git a/app/views/administrateurs/sessions/new.html.haml b/app/views/administrateurs/sessions/new.html.haml index 1d2a616cb..e522d82b1 100644 --- a/app/views/administrateurs/sessions/new.html.haml +++ b/app/views/administrateurs/sessions/new.html.haml @@ -8,7 +8,7 @@ %br %br #new_user - = form_for @administrateur, url: {controller: 'administrateurs/sessions', action: :create } do |f| + = form_for @administrateur, url: { controller: 'administrateurs/sessions', action: :create } do |f| %h4 = f.label :email .input-group diff --git a/app/views/administrations/index.html.haml b/app/views/administrations/index.html.haml index 0262424be..c90769e91 100644 --- a/app/views/administrations/index.html.haml +++ b/app/views/administrations/index.html.haml @@ -1,6 +1,6 @@ .container .mt-1 - = form_for @admin, url: {controller: 'administrations', action: :create} do |f| + = form_for @admin, url: { controller: 'administrations', action: :create } do |f| .form-group.form-inline.text-center = f.text_field :email, placeholder: :email, class: 'form-control' = f.text_field :password, placeholder: :password, class: 'form-control' diff --git a/app/views/backoffice/dossiers/_filter_framed.html.haml b/app/views/backoffice/dossiers/_filter_framed.html.haml index f8c7b1e55..0112c2d09 100644 --- a/app/views/backoffice/dossiers/_filter_framed.html.haml +++ b/app/views/backoffice/dossiers/_filter_framed.html.haml @@ -1,9 +1,9 @@ -.filter_framed.panel.panel-primary{id: "#{filter_framed_id}", style:'width: 300px; height: 100px; position: absolute; top: 0; left: 0; display: none'} +.filter_framed.panel.panel-primary{ id: "#{filter_framed_id}", style:'width: 300px; height: 100px; position: absolute; top: 0; left: 0; display: none' } .panel-heading = preference.libelle - = form_tag @facade_data_view.filter_url, {class: 'panel-body form-inline', method: :post} do - %input.form-control.filter_input{name: "filter_input[#{preference.table_attr}]", style:'width: 69%', value: "#{preference.filter}"} + = form_tag @facade_data_view.filter_url, { class: 'panel-body form-inline', method: :post } do + %input.form-control.filter_input{ name: "filter_input[#{preference.table_attr}]", style:'width: 69%', value: "#{preference.filter}" } %button.btn.btn-sm.btn-success %i.fa.fa-check .btn.btn-sm.btn-danger.erase-filter diff --git a/app/views/backoffice/dossiers/_list.html.haml b/app/views/backoffice/dossiers/_list.html.haml index c4c7a796d..e6c7f902b 100644 --- a/app/views/backoffice/dossiers/_list.html.haml +++ b/app/views/backoffice/dossiers/_list.html.haml @@ -8,21 +8,21 @@ - @facade_data_view.preference_list_dossiers_filter.each do |preference| - unless preference.libelle == 'Statut' || preference.libelle == 'État' - %th{class: "col-md-#{preference.bootstrap_lg} col-lg-#{preference.bootstrap_lg}"} + %th{ class: "col-md-#{preference.bootstrap_lg} col-lg-#{preference.bootstrap_lg}" } - if preference.table.to_s.include? 'champs' = preference.libelle - else = smart_listing.sortable preference.libelle, preference.table_attr - if @facade_data_view.active_filter? preference - %i.filter.fa.fa-filter{style: "color:#{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}"} - = render partial: 'backoffice/dossiers/filter_framed', locals:{preference: preference, filter_framed_id: "framed_filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}"} + %i.filter.fa.fa-filter{ style: "color:#{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}" } + = render partial: 'backoffice/dossiers/filter_framed', locals:{ preference: preference, filter_framed_id: "framed_filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}" } %th.col-xs-1.center Actions %th.col-xs-1.center Abonnés - unless smart_listing.empty? - smart_listing.collection.each do |dossier| - %tr.dossier-row{id: "tr_dossier_#{dossier.id}", 'data-dossier_url' => backoffice_dossier_url(id: dossier.id)} + %tr.dossier-row{ id: "tr_dossier_#{dossier.id}", 'data-dossier_url' => backoffice_dossier_url(id: dossier.id) } - if smart_listing.name.to_s == 'follow_dossiers' %td.col-xs-1.center - total_notif = dossier.notifications.where(already_read: false).count @@ -56,7 +56,7 @@ = link_to('Quitter'.html_safe, backoffice_dossier_follow_path(dossier_id: dossier.id), 'data-method' => :put, class: 'btn-sm btn-danger', id: "suivre_dossier_#{dossier.id}") - else = link_to('Suivre', backoffice_dossier_follow_path(dossier_id: dossier.id), 'data-method' => :put, class: 'btn-sm btn-primary', id: "suivre_dossier_#{dossier.id}") - %td.center{style:"color: #{dossier.total_follow == 0 ? 'red' : ''}"} + %td.center{ style:"color: #{dossier.total_follow == 0 ? 'red' : ''}" } = dossier.total_follow = smart_listing.paginate diff --git a/app/views/backoffice/dossiers/_pref_list.html.haml b/app/views/backoffice/dossiers/_pref_list.html.haml index 1e171f124..cccd84ba6 100644 --- a/app/views/backoffice/dossiers/_pref_list.html.haml +++ b/app/views/backoffice/dossiers/_pref_list.html.haml @@ -3,7 +3,7 @@ %h3 = t('dynamics.backoffice.pref_list.title') -%p{style:'margin-top: 15px; margin-bottom: 20px'} +%p{ style:'margin-top: 15px; margin-bottom: 20px' } = t('dynamics.backoffice.pref_list.description') %h4.text-primary @@ -16,10 +16,10 @@ = hidden_field_tag :pref_id, preference.id = hidden_field_tag :procedure_id, preference.procedure_id = preference.libelle - %button.btn.btn-default.btn-xs{type: :submit, id: "delete_pref_list_#{preference[:table]}_#{preference[:attr]}"} + %button.btn.btn-default.btn-xs{ type: :submit, id: "delete_pref_list_#{preference[:table]}_#{preference[:attr]}" } %i.fa.fa-minus -%h4.text-success{style:'margin-top: 15px'} +%h4.text-success{ style:'margin-top: 15px' } Disponibles %table @@ -27,7 +27,7 @@ - if index%2 == 0 || tables.first.to_s.include?('champs') %tr - %td.col-xs-5{style: 'vertical-align: top', colspan: (tables.first == :champs ? 2 : 1)} + %td.col-xs-5{ style: 'vertical-align: top', colspan: (tables.first == :champs ? 2 : 1) } %h5= tables.first.to_s.gsub('_', ' ').capitalize %ul - if tables.second @@ -42,5 +42,5 @@ = hidden_field_tag :procedure_id, @facade_data_view.procedure_id = columns.second[:libelle] - %button.btn.btn-default.btn-xs{type: :submit, id: "add_pref_list_#{columns.second[:table]}_#{columns.second[:attr]}"} + %button.btn.btn-default.btn-xs{ type: :submit, id: "add_pref_list_#{columns.second[:table]}_#{columns.second[:attr]}" } %i.fa.fa-plus diff --git a/app/views/backoffice/dossiers/_state_description.html.haml b/app/views/backoffice/dossiers/_state_description.html.haml index 1b726ba0d..03a062ad9 100644 --- a/app/views/backoffice/dossiers/_state_description.html.haml +++ b/app/views/backoffice/dossiers/_state_description.html.haml @@ -1,9 +1,9 @@ -#state_description.row{style:'width: 50%; margin-left: auto; margin-right: auto'} +#state_description.row{ style:'width: 50%; margin-left: auto; margin-right: auto' } .panel.panel-info .panel-body.center .row .col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1 - .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'} + .fa.fa-info-circle.text-info{ style:'font-size: 2em; margin-top: 20%' } .col-xs-11 - if dossiers_list_facade.liste == 'nouveaux' Tous les dossiers présents dans cette liste sont ceux qui diff --git a/app/views/cgu/index.html.haml b/app/views/cgu/index.html.haml index cb51ab8dc..7f2116cd0 100644 --- a/app/views/cgu/index.html.haml +++ b/app/views/cgu/index.html.haml @@ -41,14 +41,14 @@ %br %h3#object_website Object du site internet - %a{:href => "https://tps.apientreprise.fr/"} + %a{ :href => "https://tps.apientreprise.fr/" } %strong tps.apientreprise.fr %p Le site internet tps.apientreprise.fr a pour objet de faciliter la création de démarches administratives en ligne par les acteurs publics, et l’examen par plusieurs services des demandes formulées par les usagers auprès d’un ou organismes publics. %br %h3#acteurs Acteurs de - %a{:href => "https://tps.apientreprise.fr/"} + %a{ :href => "https://tps.apientreprise.fr/" } TPS %p Les acteurs de TPS sont les suivants : %ul @@ -64,7 +64,7 @@ %li N° de sécurité sociale, %li Infractions, condamnations, mesures de sécurité, %li - %a{:href => "https://www.declaration.cnil.fr/declarations/declaration/donneesSensibles_DN.display.action"} Opinions philosophiques, politiques, religieuses, syndicales, vie sexuelle, données de santé, origine raciale. + %a{ :href => "https://www.declaration.cnil.fr/declarations/declaration/donneesSensibles_DN.display.action" } Opinions philosophiques, politiques, religieuses, syndicales, vie sexuelle, données de santé, origine raciale. %br %h3#data_collects Données collectées et responsabilité des organismes publics à l’initiative de démarches en ligne avec TPS. @@ -78,7 +78,7 @@ %h4 Données personnelles : %p En application de la loi n°78-17 Informatique et Libertés du 6 janvier 1978, vous disposez d'un droit d'accès, de rectification, de modification et de suppression concernant les données qui vous concernent. Vous pouvez exercer ce droit à travers la rubrique - %a{:href => "http://www.faire-simple.gouv.fr/contact"} Contact + %a{ :href => "http://www.faire-simple.gouv.fr/contact" } Contact %h4 Données de connexion : %p Conformément à la loi n°2004-575 du 21 juin 2004 pour la confiance dans l’économie numérique, certaines données de connexion sont conservées par le service aux fins de protection contre les intrusions et de poursuites judiciaires le cas échéant. Ces données sont conservées pendant un an. @@ -97,9 +97,9 @@ %br/ Tél. : 01 41 17 50 50 %p - %a{:href => "http://www.insee.fr/fr/bases-de-donnees/default.asp?page=sirene.htm"} Informations de la base SIRENE + %a{ :href => "http://www.insee.fr/fr/bases-de-donnees/default.asp?page=sirene.htm" } Informations de la base SIRENE %br/ - %a{:href => "http://www.sirene.fr/sirene/public/static/mentions-legales"} Condition légales d’utilisation de service SIRENE + %a{ :href => "http://www.sirene.fr/sirene/public/static/mentions-legales" } Condition légales d’utilisation de service SIRENE %br %h4 INFOGREFFE : %p @@ -112,9 +112,9 @@ 94300 VINCENNES %p Les informations transmises aux autorités publiques en charges de l’examen de dossiers de candidature sont définis par le service en ligne suivant proposé aux internautes : - %a{:href => "https://www.infogreffe.fr/societes/documents-officiels/demande-kbis.html"} https://www.infogreffe.fr/societes/documents-officiels/demande-kbis.html + %a{ :href => "https://www.infogreffe.fr/societes/documents-officiels/demande-kbis.html" } https://www.infogreffe.fr/societes/documents-officiels/demande-kbis.html %p - %a{:href => "https://www.infogreffe.fr/societes/cgu-cgv.html"} Conditions générales d’utilisation des données d’infogreffe + %a{ :href => "https://www.infogreffe.fr/societes/cgu-cgv.html" } Conditions générales d’utilisation des données d’infogreffe %br %h4 TPS fait appel à d’autres services opérés par le SGMAP afin de faciliter les démarches administratives : @@ -122,18 +122,18 @@ %p %strong> France CONNECT \ : informations complémentaires : - %a{:href => "https://franceconnect.gouv.fr/"} https://franceconnect.gouv.fr/ + %a{ :href => "https://franceconnect.gouv.fr/" } https://franceconnect.gouv.fr/ %p %strong La base d’adresse nationale : - %a{:href => "https://adresse.data.gouv.fr/"} https://adresse.data.gouv.fr/ + %a{ :href => "https://adresse.data.gouv.fr/" } https://adresse.data.gouv.fr/ %p %strong TPS est un service de l’Etat Plateforme : - %a{:href => "http://etatplateforme.modernisation.gouv.fr/"} http://etatplateforme.modernisation.gouv.fr/ + %a{ :href => "http://etatplateforme.modernisation.gouv.fr/" } http://etatplateforme.modernisation.gouv.fr/ %p %strong Il met en œuvre les principes définis par le programme « Dites-le nous une fois » %p - %a{:href => "http://www.modernisation.gouv.fr/les-services-publics-se-simplifient-et-innovent/par-des-simplifications-pour-les-entreprises/dites-le-nous-une-fois-un-programme-pour-simplifier-la-vie-des-entreprises"} http://www.modernisation.gouv.fr/les-services-publics-se-simplifient-et-innovent/par-des-simplifications-pour-les-entreprises/dites-le-nous-une-fois-un-programme-pour-simplifier-la-vie-des-entreprises + %a{ :href => "http://www.modernisation.gouv.fr/les-services-publics-se-simplifient-et-innovent/par-des-simplifications-pour-les-entreprises/dites-le-nous-une-fois-un-programme-pour-simplifier-la-vie-des-entreprises" } http://www.modernisation.gouv.fr/les-services-publics-se-simplifient-et-innovent/par-des-simplifications-pour-les-entreprises/dites-le-nous-une-fois-un-programme-pour-simplifier-la-vie-des-entreprises %br %h3#reproduction Droit de reproduction : @@ -143,7 +143,7 @@ %p L’autorisation de création de liens est valable pour tout support, à l’exception de ceux diffusant des informations à caractère raciste, pornographique, xénophobe ou pouvant porter atteinte à la sensibilité du plus grand nombre. %p La rubrique - %a{:href => "http://www.faire-simple.gouv.fr/contact"} Contactez-nous + %a{ :href => "http://www.faire-simple.gouv.fr/contact" } Contactez-nous est à votre disposition pour nous faire part de vos remarques et suggestions. %br %h3#propriete_intellectuelle diff --git a/app/views/commencer/archived.html.haml b/app/views/commencer/archived.html.haml index d550d24e4..e41e7ca5a 100644 --- a/app/views/commencer/archived.html.haml +++ b/app/views/commencer/archived.html.haml @@ -1,8 +1,8 @@ %br -%div{style: 'text-align: center; max-width:500px; margin-left:auto; margin-right:auto; padding: 20px;'} +%div{ style: 'text-align: center; max-width:500px; margin-left:auto; margin-right:auto; padding: 20px;' } = render partial: 'users/sessions/resume_procedure' -.center{style:'margin-top: -20px'} +.center{ style:'margin-top: -20px' } %h3 La campagne de création de nouveau dossier %br @@ -11,5 +11,5 @@ %br %p Si vous avez déjà déposé un ou plusieurs dossiers : - %a.btn.btn-lg.btn-info{href: new_user_session_path} + %a.btn.btn-lg.btn-info{ href: new_user_session_path } Accéder à mon espace en ligne. diff --git a/app/views/demo/_list.html.haml b/app/views/demo/_list.html.haml index ebc52f855..60ea99bdc 100644 --- a/app/views/demo/_list.html.haml +++ b/app/views/demo/_list.html.haml @@ -1,7 +1,7 @@ - unless smart_listing.empty? %table.table %tr - %th{colspan: 4} + %th{ colspan: 4 } %h4 Lien vers les procédures TPS %tr %th= smart_listing.sortable 'ID', 'id' diff --git a/app/views/dossiers/_dossier_show.html.haml b/app/views/dossiers/_dossier_show.html.haml index 5b0114a97..be5f83190 100644 --- a/app/views/dossiers/_dossier_show.html.haml +++ b/app/views/dossiers/_dossier_show.html.haml @@ -8,7 +8,7 @@ .carret-right INFORMATIONS DU DEMANDEUR - if !@current_gestionnaire && ["draft", "updated", "replied", "initiated"].include?(@facade.dossier.state) - %a#add_siret.action{href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id)} + %a#add_siret.action{ href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id) } .col-lg-4.col-md-4.col-sm-4.col-xs-4.action Renseigner un SIRET @@ -44,12 +44,12 @@ CARTOGRAPHIE = render partial: '/dossiers/edit_carto' .body.display-block-on-print - %input{id: 'json_latlngs', type: 'hidden', value: "#{@facade.dossier.json_latlngs}", name: 'json_latlngs'} - %input{id: 'quartier_prioritaires', type: 'hidden', value: "#{@facade.dossier.quartier_prioritaires.to_json}"} - %input{id: 'cadastres', type: 'hidden', value: "#{@facade.dossier.cadastres.to_json}"} + %input{ id: 'json_latlngs', type: 'hidden', value: "#{@facade.dossier.json_latlngs}", name: 'json_latlngs' } + %input{ id: 'quartier_prioritaires', type: 'hidden', value: "#{@facade.dossier.quartier_prioritaires.to_json}" } + %input{ id: 'cadastres', type: 'hidden', value: "#{@facade.dossier.cadastres.to_json}" } - = render partial: '/users/carte/map', locals: {dossier: @facade.dossier} - = render partial: 'users/carte/init_carto', locals: {dossier: @facade.dossier} + = render partial: '/users/carte/map', locals: { dossier: @facade.dossier } + = render partial: 'users/carte/init_carto', locals: { dossier: @facade.dossier } - if @current_gestionnaire && gestionnaire_signed_in? && @champs_private.count > 0 diff --git a/app/views/dossiers/_edit_carto.html.haml b/app/views/dossiers/_edit_carto.html.haml index fedcf055d..91ece5bd1 100644 --- a/app/views/dossiers/_edit_carto.html.haml +++ b/app/views/dossiers/_edit_carto.html.haml @@ -1,5 +1,5 @@ - unless @facade.dossier.read_only? - if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email)) - %a#maj_carte.action{href: "/users/dossiers/#{@facade.dossier.id}/carte"} + %a#maj_carte.action{ href: "/users/dossiers/#{@facade.dossier.id}/carte" } .col-lg-2.col-md-2.col-sm-2.col-xs-2.action = 'éditer'.upcase diff --git a/app/views/dossiers/_edit_dossier.html.haml b/app/views/dossiers/_edit_dossier.html.haml index 5f07d7ccc..d02c08c89 100644 --- a/app/views/dossiers/_edit_dossier.html.haml +++ b/app/views/dossiers/_edit_dossier.html.haml @@ -1,5 +1,5 @@ - unless @facade.dossier.read_only? - if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email)) - %a#maj_infos.action{href: "/users/dossiers/#{@facade.dossier.id}/description"} + %a#maj_infos.action{ href: "/users/dossiers/#{@facade.dossier.id}/description" } %div#edit-dossier.col-lg-2.col-md-2.col-sm-2.col-xs-2.action = "éditer".upcase diff --git a/app/views/dossiers/_edit_pieces_jointes.html.haml b/app/views/dossiers/_edit_pieces_jointes.html.haml index 88f4bff34..129e551ef 100644 --- a/app/views/dossiers/_edit_pieces_jointes.html.haml +++ b/app/views/dossiers/_edit_pieces_jointes.html.haml @@ -2,10 +2,10 @@ - if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email)) - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0 .col-lg-4.col-md-4.col-sm-4.col-xs-4.action - %a#maj_pj.action{"data-target" => "#UploadPJmodal", + %a#maj_pj.action{ "data-target" => "#UploadPJmodal", "data-toggle" => "modal", :type => "button", - style: 'margin-bottom: 15px; margin-top: -30px'} + style: 'margin-bottom: 15px; margin-top: -30px' } Modifier les documents %br = render partial: 'users/recapitulatif/modal_upload_pj' diff --git a/app/views/dossiers/_infos_carto.html.haml b/app/views/dossiers/_infos_carto.html.haml index c51812500..467adf177 100644 --- a/app/views/dossiers/_infos_carto.html.haml +++ b/app/views/dossiers/_infos_carto.html.haml @@ -1,11 +1,11 @@ .row .col-xs-12 - #map.mini{class: @facade.dossier.procedure.module_api_carto.classes} + #map.mini{ class: @facade.dossier.procedure.module_api_carto.classes } - %input{id: 'json_latlngs', type:'hidden', value: "#{@facade.dossier.json_latlngs}"} - %input{id: 'quartier_prioritaires', type:'hidden', value: "#{@facade.dossier.quartier_prioritaires.to_json}"} - %input{id: 'cadastres', type:'hidden', value: "#{@facade.dossier.cadastres.to_json}"} + %input{ id: 'json_latlngs', type:'hidden', value: "#{@facade.dossier.json_latlngs}" } + %input{ id: 'quartier_prioritaires', type:'hidden', value: "#{@facade.dossier.quartier_prioritaires.to_json}" } + %input{ id: 'cadastres', type:'hidden', value: "#{@facade.dossier.cadastres.to_json}" } - %script{type: 'text/javascript'} + %script{ type: 'text/javascript' } = "var dossier_id =#{@facade.dossier.id}" initCarto(); diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml index bd7e90fe8..ede81e7f8 100644 --- a/app/views/dossiers/_infos_dossier.html.haml +++ b/app/views/dossiers/_infos_dossier.html.haml @@ -65,7 +65,7 @@ .col-xs-5.despositaire-info - if @facade.dossier.cerfa_available? %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter - %span{style:'margin-left:12px'} + %span{ style:'margin-left:12px' } \- = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => 'cerfa' do %span.fa.fa-clock-o @@ -84,7 +84,7 @@ %span.text-success Nous l'avons récupéré pour vous. - elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil? %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter - %span{style:'margin-left:12px'} + %span{ style:'margin-left:12px' } \- - if @facade.dossier.pieces_justificatives.where(type_de_piece_justificative_id: type_de_piece_justificative.id).count > 1 = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" do @@ -97,7 +97,7 @@ - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0 .row .col-xs-4 - %a#maj_pj.action{"data-target" => "#UploadPJmodal", "data-toggle" => "modal", :type => "button"} + %a#maj_pj.action{ "data-target" => "#UploadPJmodal", "data-toggle" => "modal", :type => "button" } .col-xs-4.action Modifier les documents %br @@ -105,12 +105,12 @@ .col-xs-4 - if gestionnaire_signed_in? - #PJmodal.modal.fade{"aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1"} - .modal-dialog.modal-lg{:role => "document"} + #PJmodal.modal.fade{ "aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1" } + .modal-dialog.modal-lg{ :role => "document" } .modal-content .modal-header - %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"} - %span{"aria-hidden" => "true"} × + %button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" } + %span{ "aria-hidden" => "true" } × %h4#myModalLabel.modal-title Historique des %span#PJmodal_title @@ -133,9 +133,9 @@ %td.col-md-6.col-sm-6.col-xs-6.col-lg-4 = cerfa.created_at %td.col-md-6.col-sm-6.col-xs-6.col-lg-4 - = link_to 'Récupérer', cerfa.content_url, {target: :blank} + = link_to 'Récupérer', cerfa.content_url, { target: :blank } - @facade.dossier.types_de_piece_justificative.each do |type_de_piece_justificative| - %tbody.tr_content{id: "type_de_pj_#{type_de_piece_justificative.id}"} + %tbody.tr_content{ id: "type_de_pj_#{type_de_piece_justificative.id}" } - @facade.dossier.retrieve_all_piece_justificative_by_type(type_de_piece_justificative.id).each do |piece_justificative| %tr %td.col-md-6.col-sm-6.col-xs-6.col-lg-4 @@ -143,15 +143,15 @@ %td.col-md-6.col-sm-6.col-xs-6.col-lg-4 = piece_justificative.created_at %td.col-md-6.col-sm-6.col-xs-6.col-lg-4 - = link_to 'Récupérer', piece_justificative.content_url, {target: :blank} + = link_to 'Récupérer', piece_justificative.content_url, { target: :blank } .modal-footer -#modalCommentairesDossierParChamp.modal.fade{"tabindex" => -1, "role" => "dialog"} - .modal-dialog{"role" => "document"} +#modalCommentairesDossierParChamp.modal.fade{ "tabindex" => -1, "role" => "dialog" } + .modal-dialog{ "role" => "document" } .modal-content .modal-header - %button.close{"data-dismiss" => "modal", "aria-label" => "Fermer"} - %span{"aria-hidden" => true} + %button.close{ "data-dismiss" => "modal", "aria-label" => "Fermer" } + %span{ "aria-hidden" => true } × .modal-title Commentaires @@ -159,5 +159,5 @@ %p Chargement des commentaires en cours... .modal-footer - %button.btn.btn-primary{"data-dismiss" => "modal"} + %button.btn.btn-primary{ "data-dismiss" => "modal" } Fermer diff --git a/app/views/dossiers/_infos_pieces_jointes.html.haml b/app/views/dossiers/_infos_pieces_jointes.html.haml index de4b03aa1..1481578ad 100644 --- a/app/views/dossiers/_infos_pieces_jointes.html.haml +++ b/app/views/dossiers/_infos_pieces_jointes.html.haml @@ -8,14 +8,14 @@ .col-xs-5 - if @facade.dossier.cerfa_available? %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter - %span{style:'margin-left:12px'} + %span{ style:'margin-left:12px' } \- - %a.btn.fa.fa-timer{style:'color: black; padding-top: 0', + %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0', "data-target" => "#PJmodal", "data-toggle" => "modal", :type => "button", "data-modal_title" => 'formulaires', - "data-modal_index" => 'cerfa'} + "data-modal_index" => 'cerfa' } - else = 'Pièce non fournie' @@ -34,14 +34,14 @@ -# = 'Pièce fournie' -# - elsif gestionnaire_signed_in? %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter - %span{style:'margin-left:12px'} + %span{ style:'margin-left:12px' } \- - %a.btn.fa.fa-timer{style:'color: black; padding-top: 0', + %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0', "data-target" => "#PJmodal", "data-toggle" => "modal", :type => "button", "data-modal_title" => type_de_piece_justificative.libelle, - "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}"} + "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" } - else = 'Pièce non fournie' diff --git a/app/views/dossiers/_infos_private_fields.html.haml b/app/views/dossiers/_infos_private_fields.html.haml index 295f6be56..f1bf3816a 100644 --- a/app/views/dossiers/_infos_private_fields.html.haml +++ b/app/views/dossiers/_infos_private_fields.html.haml @@ -1,6 +1,6 @@ -.row{style: 'margin-top: -20px'} +.row{ style: 'margin-top: -20px' } .col-xs-12 - = form_for @facade.dossier, url: {controller: 'backoffice/private_formulaires', action: :update, dossier_id: @facade.dossier.id}, remote: true do - = render partial: '/users/description/champs', locals:{private: true} + = form_for @facade.dossier, url: { controller: 'backoffice/private_formulaires', action: :update, dossier_id: @facade.dossier.id }, remote: true do + = render partial: '/users/description/champs', locals:{ private: true } .row.center - = submit_tag :Enregistrer, {class: 'btn-action'} + = submit_tag :Enregistrer, { class: 'btn-action' } diff --git a/app/views/dossiers/_invites.html.haml b/app/views/dossiers/_invites.html.haml index 88bead8bb..0d8f47d58 100644 --- a/app/views/dossiers/_invites.html.haml +++ b/app/views/dossiers/_invites.html.haml @@ -14,4 +14,4 @@ .col-xs-3 = form_tag invites_dossier_path(dossier_id: @facade.dossier.id), method: :post, class: 'form-inline' do = text_field_tag :email, '', class: 'form-control', placeholder: 'Envoyer une invitation' - = submit_tag 'Ajouter', class: 'btn btn-success', id: 'send-invitation', data: {confirm: "Envoyer l'invitation ?"} + = submit_tag 'Ajouter', class: 'btn btn-success', id: 'send-invitation', data: { confirm: "Envoyer l'invitation ?" } diff --git a/app/views/dossiers/_messagerie.html.haml b/app/views/dossiers/_messagerie.html.haml index 58a8ac81b..24729c9a4 100644 --- a/app/views/dossiers/_messagerie.html.haml +++ b/app/views/dossiers/_messagerie.html.haml @@ -1,4 +1,4 @@ -.default_data_block{style:'margin-top: 40px'} +.default_data_block{ style:'margin-top: 40px' } .row.show-block.clearfix#messages .header .col-xs-10.title diff --git a/app/views/dossiers/_pieces_justificatives.html.haml b/app/views/dossiers/_pieces_justificatives.html.haml index a3ca7abbf..bc4f660fe 100644 --- a/app/views/dossiers/_pieces_justificatives.html.haml +++ b/app/views/dossiers/_pieces_justificatives.html.haml @@ -1,20 +1,20 @@ #pieces_justificatives %table.table - if @facade.procedure.cerfa_flag? - %tr{id: "piece_justificative_0"} + %tr{ id: "piece_justificative_0" } %th.col-lg-6 Formulaire %td.col-lg-6.col-md-6.col-sm-6.col-xs-6 - if @facade.dossier.cerfa_available? %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter - %span{style:'margin-left:12px'} + %span{ style:'margin-left:12px' } \- - %a.btn.fa.fa-timer{style:'color: black; padding-top: 0', + %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0', "data-target" => "#PJmodal", "data-toggle" => "modal", :type => "button", "data-modal_title" => 'formulaires', - "data-modal_index" => 'cerfa'} + "data-modal_index" => 'cerfa' } - else Pièce non fournie @@ -30,14 +30,14 @@ -# = 'Pièce fournie' -# - elsif gestionnaire_signed_in? %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter - %span{style:'margin-left:12px'} + %span{ style:'margin-left:12px' } \- - %a.btn.fa.fa-timer{style:'color: black; padding-top: 0', + %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0', "data-target" => "#PJmodal", "data-toggle" => "modal", :type => "button", "data-modal_title" => type_de_piece_justificative.libelle, - "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}"} + "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" } - else = 'Pièce non fournie' diff --git a/app/views/dossiers/commentaires/_form.html.haml b/app/views/dossiers/commentaires/_form.html.haml index 5296a3f1d..a2b5815e6 100644 --- a/app/views/dossiers/commentaires/_form.html.haml +++ b/app/views/dossiers/commentaires/_form.html.haml @@ -1,10 +1,10 @@ = form_tag(url_for({ controller: 'commentaires', action: :create, dossier_id: dossier_facade.dossier.id, champ_id: dossier_facade.champ_id }), class: 'form-inline', method: 'POST', multipart: true) do - %textarea.form-control.wysihtml5{id: 'texte_commentaire', name: 'texte_commentaire', style: 'width: 100%; margin-bottom:2%', rows: '5', placeholder:"Commentaire"} + %textarea.form-control.wysihtml5{ id: 'texte_commentaire', name: 'texte_commentaire', style: 'width: 100%; margin-bottom:2%', rows: '5', placeholder:"Commentaire" } .row .col-md-6 - %h4.text-primary{style: 'margin-top: 0px'} Ajouter un fichier + %h4.text-primary{ style: 'margin-top: 0px' } Ajouter un fichier = file_field_tag "piece_justificative[content]", accept: PieceJustificative.accept_format, style: 'float: left; margin-left: 20px' .col-md-6.text-right diff --git a/app/views/dossiers/etapes/_etape1.html.haml b/app/views/dossiers/etapes/_etape1.html.haml index 98efbc2ae..d5bce96d1 100644 --- a/app/views/dossiers/etapes/_etape1.html.haml +++ b/app/views/dossiers/etapes/_etape1.html.haml @@ -1,7 +1,7 @@ .col-xs-3.center %h3 Ma procédure - #logos.center{class: (@facade.entreprise.nil? ? '' : 'mask')} + #logos.center{ class: (@facade.entreprise.nil? ? '' : 'mask') } - if @facade.procedure.euro_flag #euro_flag.flag = image_tag('drapeau_europe.png') @@ -15,10 +15,10 @@ %h2#titre_procedure.text-info = @facade.procedure.libelle - %p#description_procedure{style:'width: 95%;', class: (@facade.entreprise.nil? ? '' : 'mask')} + %p#description_procedure{ style:'width: 95%;', class: (@facade.entreprise.nil? ? '' : 'mask') } = h @facade.procedure.description.html_safe - unless @facade.procedure.lien_site_web.blank? .center - %a{href: "#{@facade.procedure.lien_site_web.html_safe}", target: '_blank'} + %a{ href: "#{@facade.procedure.lien_site_web.html_safe}", target: '_blank' } En savoir plus ... diff --git a/app/views/dossiers/etapes/etape_2/_entreprise.html.haml b/app/views/dossiers/etapes/etape_2/_entreprise.html.haml index 6f0d121f8..5038d4f17 100644 --- a/app/views/dossiers/etapes/etape_2/_entreprise.html.haml +++ b/app/views/dossiers/etapes/etape_2/_entreprise.html.haml @@ -3,7 +3,7 @@ Mes informations %br - unless @facade.entreprise.nil? - .center{style:'margin-left: -5%'} + .center{ style:'margin-left: -5%' } Vous êtes authentifié avec le SIRET %h3.text-success @@ -15,8 +15,8 @@ .etape.etapes_informations.col-xs-9 .row - if @facade.entreprise.nil? - #new_siret{style:'margin-left: 20%; margin-top: 5%'} - = form_for @facade.dossier, html: {class: 'form-inline'}, url: users_dossier_siret_informations_path(dossier_id: @facade.dossier.id), method: :post, remote: true do |f| + #new_siret{ style:'margin-left: 20%; margin-top: 5%' } + = form_for @facade.dossier, html: { class: 'form-inline' }, url: users_dossier_siret_informations_path(dossier_id: @facade.dossier.id), method: :post, remote: true do |f| .form-group.form-group-lg = f.text_field :siret, class: "form-control", placeholder: "Entrez votre Siret", value: @siret = f.hidden_field :dossier_id, value: @facade.dossier.id @@ -26,7 +26,7 @@ #recap_info_entreprise = render partial: '/dossiers/infos_entreprise' - %p#insee_infogreffe{style:'color:grey; float:right'} + %p#insee_infogreffe{ style:'color:grey; float:right' } %i Informations récupérées auprès de l'INSEE et d'INFOGREFFE diff --git a/app/views/dossiers/etapes/etape_2/_individual.html.haml b/app/views/dossiers/etapes/etape_2/_individual.html.haml index d6b78e478..e74506f0b 100644 --- a/app/views/dossiers/etapes/etape_2/_individual.html.haml +++ b/app/views/dossiers/etapes/etape_2/_individual.html.haml @@ -21,17 +21,17 @@ %label %h4 Nom * - = ff.text_field :nom, {class: 'form-control'} + = ff.text_field :nom, { class: 'form-control' } .form-group %label %h4 Prénom * - = ff.text_field :prenom, {class: 'form-control'} + = ff.text_field :prenom, { class: 'form-control' } .form-group %label %h4 Date de naissance * - = ff.date_field :birthdate, {class: 'form-control', placeholder: 'jj/mm/aaaa'} + = ff.date_field :birthdate, { class: 'form-control', placeholder: 'jj/mm/aaaa' } %p %label{ style:'font-weight:normal' } diff --git a/app/views/france_connect/particulier/check_email.html.haml b/app/views/france_connect/particulier/check_email.html.haml index 9ec330f2b..41e6f1413 100644 --- a/app/views/france_connect/particulier/check_email.html.haml +++ b/app/views/france_connect/particulier/check_email.html.haml @@ -3,7 +3,7 @@  France Connect - Particulier %h3 Nouvelle connexion -%h4.text-warning{style:'margin-left: 20px'} Email déjà utilisé +%h4.text-warning{ style:'margin-left: 20px' } Email déjà utilisé %br %p @@ -13,7 +13,7 @@ %br .center #france_connect_particulier_email - = form_for @user, url: {controller: 'france_connect/particulier', action: :check_email}, method: :post do |f| + = form_for @user, url: { controller: 'france_connect/particulier', action: :check_email }, method: :post do |f| .form-group.form-group-lg = f.text_field :email_france_connect, class: "form-control", readonly: 'readonly' %br diff --git a/app/views/france_connect/particulier/new.html.haml b/app/views/france_connect/particulier/new.html.haml index 494d40c6b..ab3bc7e94 100644 --- a/app/views/france_connect/particulier/new.html.haml +++ b/app/views/france_connect/particulier/new.html.haml @@ -24,7 +24,7 @@ .center #france_connect_particulier_email - = form_for @user, url: {controller: 'france_connect/particulier', action: :check_email}, method: :post do |f| + = form_for @user, url: { controller: 'france_connect/particulier', action: :check_email }, method: :post do |f| .form-group.form-group-lg = f.text_field :email_france_connect, class: "form-control", placeholder: "Entrez votre email" = hidden_field_tag :fci_id, params[:fci_id] diff --git a/app/views/layouts/_etape_suivante.html.haml b/app/views/layouts/_etape_suivante.html.haml index 145167c0d..259899cc8 100644 --- a/app/views/layouts/_etape_suivante.html.haml +++ b/app/views/layouts/_etape_suivante.html.haml @@ -1 +1 @@ -= submit_tag 'Etape suivante', class: %w(btn btn btn-info), style: 'float:right', id: 'etape_suivante', data: { disable_with: 'Etape suivante', submit: true} += submit_tag 'Etape suivante', class: %w(btn btn btn-info), style: 'float:right', id: 'etape_suivante', data: { disable_with: 'Etape suivante', submit: true } diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index 41b2dbeff..a16a8ef9c 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,5 +1,5 @@ %div#footer - %p{class: "copyright col-md-push-#{12-main_container_size} col-md-#{main_container_size} col-lg-push-#{12-main_container_size} col-lg-#{main_container_size} text-muted small"} + %p{ class: "copyright col-md-push-#{12-main_container_size} col-md-#{main_container_size} col-lg-push-#{12-main_container_size} col-lg-#{main_container_size} text-muted small" } = link_to 'SGMAP', "http://etatplateforme.modernisation.gouv.fr" = Time.now.year \- diff --git a/app/views/layouts/_ie_lt_10.html.haml b/app/views/layouts/_ie_lt_10.html.haml index d191ed313..772f29b3a 100644 --- a/app/views/layouts/_ie_lt_10.html.haml +++ b/app/views/layouts/_ie_lt_10.html.haml @@ -1,6 +1,6 @@ = "