diff options
| -rw-r--r-- | app/assets/stylesheets/components/_buttons.sass | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/components/_forms.sass | 25 | ||||
| -rw-r--r-- | app/views/line_footnotes/_footnote_fields.html.slim | 18 | ||||
| -rw-r--r-- | app/views/line_footnotes/edit.html.slim | 14 | ||||
| -rw-r--r-- | config/locales/footnotes.fr.yml | 8 |
5 files changed, 57 insertions, 18 deletions
diff --git a/app/assets/stylesheets/components/_buttons.sass b/app/assets/stylesheets/components/_buttons.sass index 29feeccf8..b1cb63ec9 100644 --- a/app/assets/stylesheets/components/_buttons.sass +++ b/app/assets/stylesheets/components/_buttons.sass @@ -40,6 +40,16 @@ background-color: $darkblue color: #fff + &.btn-outline-danger + background-color: transparent + border-color: $red + color: $red + + &:hover, &:focus, &.focus, &:active, &.active, + .open > .btn-primary.dropdown-toggle + background-color: $red + color: #fff + + .btn margin-left: 15px diff --git a/app/assets/stylesheets/components/_forms.sass b/app/assets/stylesheets/components/_forms.sass index dce01daa4..a85dd921f 100644 --- a/app/assets/stylesheets/components/_forms.sass +++ b/app/assets/stylesheets/components/_forms.sass @@ -406,6 +406,11 @@ $cbx-size: 20px &:first-child border-top: none + &[class*='col'] + border: none + padding: 0 15px + margin: 0 + .wrapper display: table table-layout: fixed @@ -434,6 +439,21 @@ $cbx-size: 20px text-decoration: none color: darken($red, 10%) + &.btn-danger + color: #fff + line-height: 1.42857 + + &.btn-outline-danger + line-height: 1.42857 + background-color: transparent + border-color: $red + color: $red + + &:hover, &:focus, &.focus, &:active, &.active, + .open > .btn-primary.dropdown-toggle + background-color: $red + color: #fff + .nested-head margin: 0 padding: 0 5px @@ -466,6 +486,11 @@ $cbx-size: 20px padding: 10px 15px 0 15px text-align: right border-top: 1px solid rgba($grey, 0.5) + clear: both + + [class*='col'] ~ & + padding: 20px 0 0 0 + margin: 0 15px // Subforms .subform diff --git a/app/views/line_footnotes/_footnote_fields.html.slim b/app/views/line_footnotes/_footnote_fields.html.slim index 27fddc44c..28fcde5ab 100644 --- a/app/views/line_footnotes/_footnote_fields.html.slim +++ b/app/views/line_footnotes/_footnote_fields.html.slim @@ -1,8 +1,10 @@ -.nested-fields - .wrapper - div - = f.input :code - div - = f.input :label - div - = link_to_remove_association '', f, class: 'fa fa-trash', data: { confirm: 'Etes-vous sûr(e) ?' }, title: t('actions.delete') +.nested-fields.col-lg-4.col-md-4.col-sm-6.col-xs-12 + .panel.panel-default + .panel-body + = f.input :code, label: 'Titre' + = f.input :label, label: 'Texte' + + .text-right + = link_to_remove_association f, class: 'btn btn-outline-danger', data: { confirm: 'Etes-vous sûr(e) ?' }, title: t('actions.delete') do + span.fa.fa-trash + / span = t('actions.delete') diff --git a/app/views/line_footnotes/edit.html.slim b/app/views/line_footnotes/edit.html.slim index 4bbba8739..28e41b089 100644 --- a/app/views/line_footnotes/edit.html.slim +++ b/app/views/line_footnotes/edit.html.slim @@ -9,12 +9,14 @@ .container-fluid .row .col-lg-12 - = simple_form_for [@referential, @line], url: referential_line_footnotes_path, html: {id: 'notes_form'} do |form| + .row + = simple_form_for [@referential, @line], url: referential_line_footnotes_path, html: {id: 'notes_form'} do |form| - = form.simple_fields_for :footnotes do |f| - = render 'footnote_fields', f: f - .links.nested-linker - = link_to_add_association t('footnotes.actions.add_footnote'), form, :footnotes, class: 'btn btn-outline-primary' + = form.simple_fields_for :footnotes do |f| + = render 'footnote_fields', f: f - = form.button :submit, 'Enregistrer', class: 'btn btn-default formSubmitr', form: 'notes_form' + .links.nested-linker + = link_to_add_association t('footnotes.actions.add_footnote'), form, :footnotes, class: 'btn btn-outline-primary' + + = form.button :submit, 'Enregistrer', class: 'btn btn-default formSubmitr', form: 'notes_form' diff --git a/config/locales/footnotes.fr.yml b/config/locales/footnotes.fr.yml index a3cf2312d..fa3c31338 100644 --- a/config/locales/footnotes.fr.yml +++ b/config/locales/footnotes.fr.yml @@ -1,15 +1,15 @@ fr: notice: footnotes: - updated: 'Note en bas de page mise à jour' + updated: 'Note mise à jour' footnotes: actions: - add_footnote: "ajouter une note en bas de page" + add_footnote: "Ajouter une note" index: - title: "Notes en bas de page" + title: "Notes" activerecord: models: - footnote: "note en bas de page" + footnote: "note" attributes: footnote: code: "numéro" |