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

style(admin): multiple style improvements, essentially links & buttons

Browse source
This commit is contained in:
Colin Darie 2022-10-06 15:10:20 +02:00
parent 0a2460ba71
commit fa9bc5d185
13 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/archive.scss
View file

@ -12,4 +12,8 @@ table.archive-table {
td {
padding: 3 * $default-spacer $default-spacer;
}
a.button {
background-image: none; // remove DSFR underline
}
}

8
app/assets/stylesheets/attachment.scss
View file

@ -11,6 +11,14 @@
.button {
text-transform: lowercase;
background-image: none; // remove DSFR underline
}
}
.attachment-link {
a:not(:hover) {
background-image: none; // remove DSFR underline
}
}

3
app/assets/stylesheets/procedure_champs_editor.scss
View file

@ -158,9 +158,6 @@
font-size: 14px;
a {
text-decoration: underline;
text-decoration-style: dotted;
// Remove the icon indicating an external link (for less visual noise)
&[target="_blank"]::after {
display: none;

4
app/views/administrateurs/_breadcrumbs.html.haml
View file

@ -17,8 +17,8 @@
- if defined?(preview) && preview
.mb-2
= link_to t('preview', scope: [:layouts, :breadcrumb]), apercu_admin_procedure_path(@procedure), target: "_blank", rel: "noopener", class: 'button'
= link_to t('continue', scope: [:layouts, :breadcrumb]), admin_procedure_path(@procedure), title: t('continue_title', scope: [:layouts, :breadcrumb]), class: 'button accepted'
= link_to t('preview', scope: [:layouts, :breadcrumb]), apercu_admin_procedure_path(@procedure), target: "_blank", rel: "noopener", class: 'fr-btn fr-btn--secondary'
= link_to t('continue', scope: [:layouts, :breadcrumb]), admin_procedure_path(@procedure), title: t('continue_title', scope: [:layouts, :breadcrumb]), class: 'fr-btn fr-ml-2w fr-btn--icon-right fr-icon-arrow-right-fill'
- if defined?(metadatas)
.metadatas.pb-3

4
app/views/administrateurs/attestation_templates/edit.html.haml
View file

@ -36,8 +36,8 @@
%span.toggle-switch-label.off Attestation désactivée
.actions-right
= link_to 'Annuler', edit_admin_procedure_attestation_template_path(id: @procedure), class: 'button', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'}
= f.button 'Enregistrer', class: 'button primary send'
= link_to 'Annuler', edit_admin_procedure_attestation_template_path(id: @procedure), class: 'fr-btn fr-btn--secondary fr-mr-2w', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'}
= f.button 'Enregistrer', class: 'fr-btn'
.procedure-form__column--preview
.procedure-form__preview.sticky--top

6
app/views/administrateurs/groupe_instructeurs/_instructeurs.html.haml
View file

@ -18,7 +18,7 @@
label: 'Emails',
acceptNewValues: true)
= f.submit 'Affecter', class: 'button primary send', disabled: disabled_as_super_admin
= f.submit 'Affecter', class: 'fr-btn', disabled: disabled_as_super_admin
%table.table.mt-2
%thead
@ -32,11 +32,11 @@
#{instructeur.email}
- confirmation_message = procedure.routee? ? "Êtes-vous sûr de vouloir retirer l’instructeur « #{instructeur.email} » du groupe « #{groupe_instructeur.label} » ?" : "Êtes-vous sûr de vouloir retirer l’instructeur « #{instructeur.email} » de la démarche ?"
%td.actions= button_to 'retirer',
%td.actions= button_to 'Retirer',
{ action: :remove_instructeur, id: groupe_instructeur.id },
{ method: :delete,
data: { confirm: confirmation_message },
params: { instructeur: { id: instructeur.id }},
class: 'button' }
class: 'fr-btn fr-btn--secondary' }
= paginate instructeurs

4
app/views/administrateurs/groupe_instructeurs/_routing.html.haml
View file

@ -6,9 +6,9 @@
- if procedure.routee?
- if procedure.routing_enabled? && procedure.groupe_instructeurs.size == 1
= link_to t('.button.routing_disable'), update_routing_enabled_admin_procedure_groupe_instructeurs_path(procedure, routing: :disable), class: 'button primary mt-1', method: 'patch'
= link_to t('.button.routing_disable'), update_routing_enabled_admin_procedure_groupe_instructeurs_path(procedure, routing: :disable), class: 'fr-btn', method: 'patch'
- else
= link_to t('.button.routing_enable'), update_routing_enabled_admin_procedure_groupe_instructeurs_path(procedure, routing: :enable), class: 'button primary mt-1', method: 'patch'
= link_to t('.button.routing_enable'), update_routing_enabled_admin_procedure_groupe_instructeurs_path(procedure, routing: :enable), class: 'fr-btn', method: 'patch'
.card
%h2.card-title L‘autogestion des instructeurs
%p.notice= t('.self_managment_notice_html')

2
app/views/administrateurs/mail_templates/index.html.haml
View file

@ -15,4 +15,4 @@
%span.badge.baseline modifié le #{mail_template.updated_at.strftime('%d-%m-%Y')}
%div
= link_to 'Modifier', edit_admin_procedure_mail_template_path(@procedure, mail_template.class.const_get(:SLUG)), class: 'button'
= link_to 'Modifier', edit_admin_procedure_mail_template_path(@procedure, mail_template.class.const_get(:SLUG)), class: 'fr-btn'

4
app/views/administrateurs/procedures/edit.html.haml
View file

@ -17,8 +17,8 @@
.procedure-form__actions.sticky--bottom
.actions-right
= link_to 'Annuler', admin_procedure_path(id: @procedure), class: 'button', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'}
= f.button 'Enregistrer', class: 'button primary send'
= link_to 'Annuler', admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary fr-mr-2w', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'}
= f.button 'Enregistrer', class: 'fr-btn'
.procedure-form__column--preview
.procedure-form__preview.sticky--top

4
app/views/administrateurs/procedures/new.html.haml
View file

@ -17,8 +17,8 @@
.procedure-form__actions.sticky--bottom
.actions-right
= link_to 'Annuler', admin_procedures_path, class: 'button', data: { confirm: 'Êtes-vous sûr de vouloir annuler la création de cette démarche ?'}
= f.button 'Créer la démarche', class: 'button primary send'
= link_to 'Annuler', admin_procedures_path, class: 'fr-btn fr-btn--secondary fr-mr-2w', data: { confirm: 'Êtes-vous sûr de vouloir annuler la création de cette démarche ?'}
= f.button 'Créer la démarche', class: 'fr-btn'
.procedure-form__column--preview
.procedure-form__preview.sticky--top

4
app/views/users/dossiers/_merci.html.haml
View file

@ -19,8 +19,8 @@
%p.m-2= procedure.active_dossier_submitted_message.message_on_submit_by_usager
.flex.column.align-center
= link_to t('views.users.dossiers.merci.acces_dossier'), dossier ? dossier_path(dossier) : "#dossier" , class: 'button large primary mt-4'
= link_to t('views.users.dossiers.merci.submit_dossier'), procedure_lien(procedure), class: 'mt-4'
= link_to t('views.users.dossiers.merci.acces_dossier'), dossier ? dossier_path(dossier) : "#dossier" , class: 'fr-btn fr-btn--xl fr-mt-5w'
= link_to t('views.users.dossiers.merci.submit_dossier'), procedure_lien(procedure), class: 'fr-btn fr-btn--secondary fr-mt-3w'
.monavis
!= procedure.monavis_embed

2
config/locales/views/layouts/_breadcrumb.en.yml
View file

@ -5,7 +5,7 @@ en:
you_are_here: "You are here"
show: Show breadcrumb
preview: "Preview the form"
continue: "Continue >"
continue: "Continue"
continue_title: "You can comeback using this link"
created_at: "Created at %{date} - n° %{number}"
closed_at: "Closed at %{date}"

2
config/locales/views/layouts/_breadcrumb.fr.yml
View file

@ -5,7 +5,7 @@ fr:
you_are_here: "Vous êtes ici"
show: "Voir le fil d’Ariane"
preview: "Prévisualiser le formulaire"
continue: "Continuer >"
continue: "Continuer"
continue_title: "Vous pourrez revenir ici par la suite"
created_at: "Créée le %{date} - n° %{number}"
closed_at: "Close le %{date}"