Skip to content

Commit

Permalink
Revert "Format les vues .html.erb avec erb_format"
Browse files Browse the repository at this point in the history
This reverts commit 4f9fe09.
  • Loading branch information
jbfeldis committed Sep 2, 2024
1 parent 4f9fe09 commit e7be5e5
Show file tree
Hide file tree
Showing 99 changed files with 691 additions and 1,697 deletions.
28 changes: 5 additions & 23 deletions app/views/archive_authorization_requests/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,18 @@
<turbo-frame id="main-modal-content">
<div class="fr-modal__content">
<h1 class="fr-modal__title">
<%= t(".title", authorization_request_name: @authorization_request.name) %>
<%= t('.title', authorization_request_name: @authorization_request.name) %>
</h1>

<p>
<%= t(".disclaimer").html_safe %>
<%= t('.disclaimer').html_safe %>
</p>
</div>

<div class="fr-modal__footer">
<div
class="
fr-btns-group fr-btns-group--right fr-btns-group--inline-reverse
fr-btns-group--inline-lg fr-btns-group--icon-left
"
>
<%= link_to t(".cancel"),
"#",
class: %w[fr-btn fr-btn--secondary],
aria: {
controls: "main-modal",
} %>
<%= button_to t(".archive"),
(
if namespace?(:instruction)
instruction_authorization_request_archive_index_path(@authorization_request)
else
authorization_request_archive_index_path(@authorization_request)
end
),
class: %w[fr-btn fr-btn--primary fr-icon-success-line fr-btn--icon-left] %>
<div class="fr-btns-group fr-btns-group--right fr-btns-group--inline-reverse fr-btns-group--inline-lg fr-btns-group--icon-left">
<%= link_to t('.cancel'), '#', class: %w(fr-btn fr-btn--secondary), aria: { controls: 'main-modal' } %>
<%= button_to t('.archive'), namespace?(:instruction) ? instruction_authorization_request_archive_index_path(@authorization_request) : authorization_request_archive_index_path(@authorization_request), class: %w(fr-btn fr-btn--primary fr-icon-success-line fr-btn--icon-left) %>
</div>
</div>
</turbo-frame>
Expand Down
6 changes: 2 additions & 4 deletions app/views/authorization_definitions/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="sub-header">
<h1 class="fr-m-0">
<%= t(".title") %>
<%= t('.title') %>
</h1>
</div>

Expand All @@ -19,9 +19,7 @@
</div>
<% if policy(authorization_definition.authorization_request_class).new? %>
<div class="data-provider-cta">
<%= link_to t(".cta"),
new_authorization_request_path(id: authorization_definition.id.dasherize),
class: %w[fr-btn fr-btn--sm] %>
<%= link_to t('.cta'), new_authorization_request_path(id: authorization_definition.id.dasherize), class: %w(fr-btn fr-btn--sm) %>
</div>
<% end %>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
<div
id="<%= dom_id(authorization_request_form) %>"
class="
fr-tile fr-tile--sm fr-tile--horizontal fr-enlarge-link
authorization-request-form-card
"
>
<div id="<%= dom_id(authorization_request_form) %>" class="fr-tile fr-tile--sm fr-tile--horizontal fr-enlarge-link authorization-request-form-card">
<div class="fr-tile__body">
<div class="fr-tile__content">
<h3 class="fr-tile__title">
<%= link_to authorization_request_form.name,
new_authorization_request_form_path(form_uid: authorization_request_form.id) %>
<%= link_to authorization_request_form.name, new_authorization_request_form_path(form_uid: authorization_request_form.id) %>
</h3>
<p class="fr-tile__detail">
<%= authorization_request_form.description %>
</p>
<% if authorization_request_form.editor %>
<div class="fr-tile__start">
<p class="fr-badge fr-badge--sm">
Via l'éditeur
<%= authorization_request_form.editor.name %>
Via l'éditeur <%= authorization_request_form.editor.name %>
</p>
</div>
<% end %>
Expand All @@ -27,9 +19,7 @@
<% if authorization_request_form.use_case && File.exist?(Rails.root.join("app/assets/images/pictograms/authorization_requests/#{authorization_request_form.use_case}.svg")) %>
<div class="fr-tile__header">
<div class="fr-tile__pictogram">
<%= dsfr_custom_pictogram(
"pictograms/authorization_requests/#{authorization_request_form.use_case}.svg",
) %>
<%= dsfr_custom_pictogram("pictograms/authorization_requests/#{authorization_request_form.use_case}.svg") %>
</div>
</div>
<% end %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<% if @authorization_request.only_in_contacts?(current_user) %>
<div class="fr-alert fr-alert--info fr-my-3w">
<%= t(
".text",
contact_types:
@authorization_request.humanized_contact_types_for(
current_user,
).to_sentence,
) %>
<%= t('.text', contact_types: @authorization_request.humanized_contact_types_for(current_user).to_sentence) %>
</div>
<% end %>
29 changes: 10 additions & 19 deletions app/views/authorization_request_forms/_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%= render partial: "authorization_request_forms/build/header", locals: { f: } %>
<%= render partial: 'authorization_request_forms/build/header', locals: { f: } %>

<div class="fr-container">
<%= render partial: "shared/alerts" %>
<%= render partial: 'shared/alerts' %>
<% if @authorization_request.refused? %>
<div class="fr-alert fr-alert--error fr-mb-2v">
Expand All @@ -14,7 +14,7 @@
</h3>

<% if @authorization_request.reopening? %>
<%= t("authorization_requests.show.reopening_refused.description") %>
<%= t('authorization_requests.show.reopening_refused.description') %>
<% else %>
<%= t("authorization_requests.show.refused.description") %>
<% end %>
Expand All @@ -26,25 +26,16 @@
<% end %>
<% if within_wizard? %>
<%= dsfr_stepper(
current_step:
authorization_request_step_name(
@authorization_request,
english_step_name(params[:id]),
),
steps:
@authorization_request.form.steps.map do |step|
authorization_request_step_name(@authorization_request, step[:name])
end,
) %>
<%=
dsfr_stepper(
current_step: authorization_request_step_name(@authorization_request, english_step_name(params[:id])),
steps: @authorization_request.form.steps.map { |step| authorization_request_step_name(@authorization_request, step[:name]) }
)
%>
<% end %>
<% if within_wizard? || within_edit? %>
<%= render partial: "authorization_request_forms/shared/block_titles",
locals: {
f: f,
block_name: english_step_name(params[:id]),
} %>
<%= render partial: "authorization_request_forms/shared/block_titles", locals: { f: f, block_name: english_step_name(params[:id]) } %>
<% end %>
<% if !@authorization_request.display_prefilled_banner_for_each_block? && @authorization_request.prefilled_data?(@authorization_request.data.keys) %>
Expand Down
25 changes: 7 additions & 18 deletions app/views/authorization_request_forms/_unicity_callout.html.erb
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
<% callout_key = authorization_request.validated? ? "habilitation" : "demande" %>
<% callout_key = authorization_request.validated? ? 'habilitation' : 'demande' %>

<div class="fr-callout red-callout">
<h3 class="fr-callout__title">
<span class="fr-icon-information-fill fr-mr-1w">
</span>
<%= t(".title") %>
<span class="fr-icon-information-fill fr-mr-1w"> </span>
<%= t('.title')%>
</h3>

<%= simple_format t(
".#{callout_key}.content",
organization_raison_sociale: current_organization.raison_sociale,
),
{ class: "fr-callout__text fr-my-3w" },
wrapper_tag: "p" %>
<%= link_to t(
".#{callout_key}.cta",
organization_raison_sociale: current_organization.raison_sociale,
),
authorization_request_path(authorization_request),
class: "fr-link fr-btn--icon-right fr-icon-arrow-right-line" %>
</div>

<%= simple_format t(".#{callout_key}.content", organization_raison_sociale: current_organization.raison_sociale), { class: 'fr-callout__text fr-my-3w' }, wrapper_tag: 'p' %>
<%= link_to t(".#{callout_key}.cta", organization_raison_sociale: current_organization.raison_sociale), authorization_request_path(authorization_request), class: 'fr-link fr-btn--icon-right fr-icon-arrow-right-line' %>
</div>
Original file line number Diff line number Diff line change
@@ -1,27 +1,16 @@
<%= authorization_request_form(@authorization_request) do |f| %>
<%= render partial: "authorization_request_forms/shared/block_titles",
locals: {
f:,
block_name: :contacts,
} %>
<%= render partial: "authorization_request_forms/shared/block_titles", locals: { f:, block_name: :contacts } %>

<div class="fr-container-fluid">
<div class="fr-grid-row fr-grid-row--gutters">
<% %i[responsable_traitement delegue_protection_donnees contact_metier contact_technique].each do |contact_type| %>
<%= render partial: "authorization_request_forms/shared/contact",
locals: {
contact_type:,
f:,
} %>
<%= render partial: 'authorization_request_forms/shared/contact', locals: { contact_type:, f: } %>
<% end %>
</div>
</div>

<% content_for :sticky_bar do %>
<%= render partial: "authorization_request_forms/shared/submit_buttons",
locals: {
f: f,
} %>
<%= render partial: 'authorization_request_forms/shared/submit_buttons', locals: { f: f } %>
<% end %>
<% end %>
Original file line number Diff line number Diff line change
@@ -1,69 +1,40 @@
<%= authorization_request_form(@authorization_request) do |f| %>
<p class="fr-alert fr-alert--info fr-my-3w">
Ce formulaire simplifié vous permet d'obtenir une habilitation pour un
logiciel pré-configuré de l'éditeur
<%= @authorization_request.form.editor.name %>. Une partie des informations contractuelles sont fixes et ne peuvent être
modifiées. Celles-ci vous seront résumées à la prochaine étape, et ne
nécessitent aucune intervention de votre part.
Ce formulaire simplifié vous permet d'obtenir une habilitation pour un logiciel pré-configuré de l'éditeur <%= @authorization_request.form.editor.name %>. Une partie des informations
contractuelles sont fixes et ne peuvent être modifiées. Celles-ci vous seront résumées à la prochaine étape, et ne nécessitent aucune intervention de votre part.
</p>

<div class="fr-mt-2w">
<%= render partial: "authorization_request_forms/shared/block_titles",
locals: {
f: f,
block_name: :legal,
} %>
<%= render partial: "authorization_request_forms/shared/block_titles", locals: { f: f, block_name: :legal } %>
<%= render partial: "authorization_request_forms/shared/legal", locals: { f: f } %>
<%= render partial: 'authorization_request_forms/shared/legal', locals: { f: f } %>
</div>

<div class="fr-mt-2w">
<%= render partial: "authorization_request_forms/shared/block_titles",
locals: {
f: f,
block_name: :personal_data,
} %>
<%= render partial: "authorization_request_forms/shared/block_titles", locals: { f: f, block_name: :personal_data } %>
<%= render partial: "authorization_request_forms/shared/personal_data",
locals: {
f:,
} %>
<%= render partial: 'authorization_request_forms/shared/personal_data', locals: { f: } %>
</div>

<div class="fr-mt-2w">
<%= render partial: "authorization_request_forms/shared/block_titles",
locals: {
f: f,
block_name: :scopes,
} %>
<%= render partial: "authorization_request_forms/shared/block_titles", locals: { f: f, block_name: :scopes } %>
</div>

<div class="fr-container-fluid">
<%= render partial: "authorization_request_forms/shared/scopes", locals: { f: } %>
<%= render partial: 'authorization_request_forms/shared/scopes', locals: { f: } %>
</div>

<div class="fr-mt-2w">
<%= render partial: "authorization_request_forms/shared/block_titles",
locals: {
f: f,
block_name: :contacts,
} %>
<%= render partial: "authorization_request_forms/shared/block_titles", locals: { f: f, block_name: :contacts } %>

<div class="fr-container-fluid">
<div class="fr-grid-row fr-grid-row--gutters">
<% %i[responsable_traitement delegue_protection_donnees].each do |contact_type| %>
<%= render partial: "authorization_request_forms/shared/contact",
locals: {
contact_type:,
f:,
} %>
<%= render partial: 'authorization_request_forms/shared/contact', locals: { contact_type:, f: } %>
<% end %>
</div>
</div>
</div>

<%= render partial: "authorization_request_forms/shared/submit_buttons",
locals: {
f: f,
} %>
<%= render partial: 'authorization_request_forms/shared/submit_buttons', locals: { f: f } %>
<% end %>
Original file line number Diff line number Diff line change
@@ -1,69 +1,40 @@
<%= authorization_request_form(@authorization_request) do |f| %>
<p class="fr-alert fr-alert--info fr-my-3w">
Ce formulaire simplifié vous permet d'obtenir une habilitation pour un
logiciel pré-configuré de l'éditeur
<%= @authorization_request.form.editor.name %>. Une partie des informations contractuelles sont fixes et ne peuvent être
modifiées. Celles-ci vous seront résumées à la prochaine étape, et ne
nécessitent aucune intervention de votre part.
Ce formulaire simplifié vous permet d'obtenir une habilitation pour un logiciel pré-configuré de l'éditeur <%= @authorization_request.form.editor.name %>. Une partie des informations
contractuelles sont fixes et ne peuvent être modifiées. Celles-ci vous seront résumées à la prochaine étape, et ne nécessitent aucune intervention de votre part.
</p>

<div class="fr-mt-2w">
<%= render partial: "authorization_request_forms/shared/block_titles",
locals: {
f: f,
block_name: :legal,
} %>
<%= render partial: "authorization_request_forms/shared/block_titles", locals: { f: f, block_name: :legal } %>
<%= render partial: "authorization_request_forms/shared/legal", locals: { f: f } %>
<%= render partial: 'authorization_request_forms/shared/legal', locals: { f: f } %>
</div>

<div class="fr-mt-2w">
<%= render partial: "authorization_request_forms/shared/block_titles",
locals: {
f: f,
block_name: :personal_data,
} %>
<%= render partial: "authorization_request_forms/shared/block_titles", locals: { f: f, block_name: :personal_data } %>
<%= render partial: "authorization_request_forms/shared/personal_data",
locals: {
f:,
} %>
<%= render partial: 'authorization_request_forms/shared/personal_data', locals: { f: } %>
</div>

<div class="fr-mt-2w">
<%= render partial: "authorization_request_forms/shared/block_titles",
locals: {
f: f,
block_name: :scopes,
} %>
<%= render partial: "authorization_request_forms/shared/block_titles", locals: { f: f, block_name: :scopes } %>
</div>

<div class="fr-container-fluid">
<%= render partial: "authorization_request_forms/shared/scopes", locals: { f: } %>
<%= render partial: 'authorization_request_forms/shared/scopes', locals: { f: } %>
</div>

<div class="fr-mt-2w">
<%= render partial: "authorization_request_forms/shared/block_titles",
locals: {
f: f,
block_name: :contacts,
} %>
<%= render partial: "authorization_request_forms/shared/block_titles", locals: { f: f, block_name: :contacts } %>

<div class="fr-container-fluid">
<div class="fr-grid-row fr-grid-row--gutters">
<% %i[contact_technique responsable_traitement delegue_protection_donnees].each do |contact_type| %>
<%= render partial: "authorization_request_forms/shared/contact",
locals: {
contact_type:,
f:,
} %>
<%= render partial: 'authorization_request_forms/shared/contact', locals: { contact_type:, f: } %>
<% end %>
</div>
</div>
</div>

<%= render partial: "authorization_request_forms/shared/submit_buttons",
locals: {
f: f,
} %>
<%= render partial: 'authorization_request_forms/shared/submit_buttons', locals: { f: f } %>
<% end %>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<%= render "authorization_request_forms/shared/single_page/api_service_national" %>
<%= render 'authorization_request_forms/shared/single_page/api_service_national' %>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<%= render "authorization_request_forms/shared/single_page/api_service_national" %>
<%= render 'authorization_request_forms/shared/single_page/api_service_national' %>
Loading

0 comments on commit e7be5e5

Please sign in to comment.