diff options
| -rw-r--r-- | app/views/referentials/_form.html.slim | 16 | ||||
| -rw-r--r-- | app/views/referentials/_period_fields.html.slim | 9 | ||||
| -rw-r--r-- | config/locales/referentials.en.yml | 3 | ||||
| -rw-r--r-- | config/locales/referentials.fr.yml | 3 |
4 files changed, 22 insertions, 9 deletions
diff --git a/app/views/referentials/_form.html.slim b/app/views/referentials/_form.html.slim index 30bf99632..021774458 100644 --- a/app/views/referentials/_form.html.slim +++ b/app/views/referentials/_form.html.slim @@ -51,18 +51,22 @@ .row = form.simple_fields_for :metadatas do |subform| - .row - = subform.simple_fields_for :periods do |period_form| - - if period_form.object.errors.has_key? :base + = subform.simple_fields_for :periods do |period_form| + - if period_form.object.errors.has_key? :base + .row .col-lg-12 .alert.alert-danger - period_form.object.errors[:base].each do |message| p.small = message + + .row style='margin-top:20px' = render 'period_fields', f: period_form - .links - = link_to_add_association 'Ajouter une période', subform, :periods - .row + .row + .links.pull-right style='margin-right:15px' + = link_to_add_association 'Ajouter une période', subform, :periods, class: 'btn btn-primary' + + .row style='margin-top:20px' .col-lg-8.col-md-12.col-sm-12.col-xs-12 = subform.input :lines, as: :select, collection: @referential.workbench.lines.includes(:company).order(:name), selected: subform.object.line_ids, label_method: :display_name, input_html: { 'data-select2ed': 'true', 'data-select2ed-placeholder': 'Sélection de lignes', 'multiple': 'multiple', style: 'width: 100%' } diff --git a/app/views/referentials/_period_fields.html.slim b/app/views/referentials/_period_fields.html.slim index 68db7be3f..5ab5be54b 100644 --- a/app/views/referentials/_period_fields.html.slim +++ b/app/views/referentials/_period_fields.html.slim @@ -1,6 +1,9 @@ .nested-fields - .col-lg-6.col-md-6.col-sm-6.col-xs-6 + .col-lg-5.col-md-5.col-sm-5.col-xs-5 = f.input :begin, as: :date, html5: true, input_html: { style: 'width: 100%' } - .col-lg-6.col-md-6.col-sm-6.col-xs-6 + .col-lg-5.col-md-5.col-sm-5.col-xs-5 = f.input :end, as: :date, html5: true, input_html: { style: 'width: 100%' } - = link_to_remove_association "Supprimer", f + + .col-lg-2.col-md-2.col-sm-2.col-xs-2.text-right style='margin-top:23px' + = link_to_remove_association f, class: 'btn btn-danger', data: { confirm: 'Etes-vous sûr(e) ?' } do + span.fa.fa-trash diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml index 3af12e7f4..07af15bc0 100644 --- a/config/locales/referentials.en.yml +++ b/config/locales/referentials.en.yml @@ -86,6 +86,9 @@ en: first_period_begin: 'First period begin' first_period_end: 'First period end' lines: Lines + periods: + begin: 'Period beginning' + end: 'Period end' notice: referential: diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml index 8c512a676..7762b9030 100644 --- a/config/locales/referentials.fr.yml +++ b/config/locales/referentials.fr.yml @@ -87,6 +87,9 @@ fr: first_period_begin: 'Première période de départ' first_period_end: 'Première période de fin' lines: Lignes + periods: + begin: 'Début de période' + end: 'Fin de période' notice: referential: |