Refs #3265: refacto layout

6 files changed, 85 insertions, 48 deletions

diff --git a/app/views/calendars/_date_value_fields.html.slim b/app/views/calendars/_date_value_fields.html.slim
index 3a9cdb7bd..2d072fa0a 100644
--- a/app/views/calendars/_date_value_fields.html.slim
+++ b/app/views/calendars/_date_value_fields.html.slim
@@ -5,10 +5,9 @@
         .alert.alert-danger
           - f.object.errors[:base].each do |message|
             p.small = message
-  .row
-    .col-xs-3
-      = f.input :value, as: :date, html5: true, label: t('simple_form.labels.calendar.date_value')
-    .col-xs-1.end.text-right#delete-btn
-      = link_to_remove_association f, class: 'btn btn-danger', data: { confirm: t('are_you_sure') } do
-        span.fa.fa-trash
 
+  .wrapper
+    div
+      = f.input :value, as: :date, label: false, wrapper_html: { class: 'date' }
+    div
+      = link_to_remove_association '', f, class: 'fa fa-trash', data: { confirm: 'Etes-vous sûr(e) ?' }, title: t('actions.delete')
diff --git a/app/views/calendars/_form.html.slim b/app/views/calendars/_form.html.slim
index a97c16565..9aed9f7d8 100644
--- a/app/views/calendars/_form.html.slim
+++ b/app/views/calendars/_form.html.slim
@@ -1,27 +1,53 @@
-#calendar_form
+= simple_form_for @calendar, html: { class: 'form-horizontal', id: 'calendar_form' }, wrapper: :horizontal_form do |f|
   .row
-    .col-xs-8.col-xs-offset-2
-      = simple_form_for @calendar, html: { class: 'form-horizontal' } do |f|
-        = f.input :name
-        = f.input :short_name
-        .form-group
-          = f.label :dates
-        .well
-          = f.simple_fields_for :date_values do |date_value|
-            = render 'date_value_fields', f: date_value
-          .links
-            = link_to_add_association t('simple_form.labels.calendar.add_a_date'), f, :date_values, class: 'btn btn-primary btn-xs'
-        .form-group
-          = f.label :date_ranges
-        .well
-          = f.simple_fields_for :periods do |period|
-            = render 'period_fields', f: period
-          .links
-            = link_to_add_association t('simple_form.labels.calendar.add_a_date_range'), f, :periods, class: 'btn btn-primary btn-xs'
-        - if policy(@calendar).share?
-          = f.input :shared
-        .form-actions
-          = f.button :submit, as: :button, class: 'btn btn-info'
-          = link_to t('cancel'), calendars_path, class: 'btn btn-default'
+    .col-lg-12
+      = f.input :name
+      = f.input :short_name
 
+      - if policy(@calendar).share?
+        .form-group.has_switch
+          = f.label :shared, class: 'col-sm-4 control-label'
+          = f.input :shared, as: :boolean, checked_value: true, unchecked_value: false, label: content_tag(:span, t("#{@calendar.shared}"), class: 'switch-label', data: {checkedValue: t('true'), uncheckedValue: t('false')}), wrapper_html: { class: 'col-sm-8'}
 
+  .separator
+  
+  .row
+    .col-lg-12
+      .subform
+        .nested-head
+          .wrapper
+            div
+              .form-group
+                label.control-label
+                  = Calendar.human_attribute_name(:date)
+            div
+
+        = f.simple_fields_for :date_values do |date_value|
+          = render 'date_value_fields', f: date_value
+
+        .links.nested-linker
+          = link_to_add_association t('simple_form.labels.calendar.add_a_date'), f, :date_values, class: 'btn btn-outline-primary'
+  
+  .separator
+  
+  .row
+    .col-lg-12
+      .subform
+        .nested-head
+          .wrapper
+            div
+              .form-group
+                label.control-label
+                  = t('simple_form.labels.calendar.ranges.begin')
+            div
+              .form-group
+                label.control-label
+                  = t('simple_form.labels.calendar.ranges.end')
+            div
+
+        = f.simple_fields_for :periods do |period|
+          = render 'period_fields', f: period
+        .links.nested-linker
+          = link_to_add_association t('simple_form.labels.calendar.add_a_date_range'), f, :periods, class: 'btn btn-outline-primary'
+
+  = f.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'calendar_form'
diff --git a/app/views/calendars/_period_fields.html.slim b/app/views/calendars/_period_fields.html.slim
index 024d09de2..1e201a39f 100644
--- a/app/views/calendars/_period_fields.html.slim
+++ b/app/views/calendars/_period_fields.html.slim
@@ -5,12 +5,11 @@
         .alert.alert-danger
           - f.object.errors[:base].each do |message|
             p.small = message
-  .row
-    .col-xs-4
-      = f.input :begin, as: :date, html5: true, label: t('simple_form.labels.calendar.ranges.begin')
-    .col-xs-3
-      = f.input :end, as: :date, html5: true, label: t('simple_form.labels.calendar.ranges.end')
-    .col-xs-1.text-right#delete-btn
-      = link_to_remove_association f, class: 'btn btn-danger', data: { confirm: t('are_you_sure') } do
-        span.fa.fa-trash
 
+  .wrapper
+    div
+      = f.input :begin, as: :date, label: false, wrapper_html: { class: 'date' }
+    div
+      = f.input :end, as: :date, label: false, wrapper_html: { class: 'date' }
+    div
+      = link_to_remove_association '', f, class: 'fa fa-trash', data: { confirm: 'Etes-vous sûr(e) ?' }, title: t('actions.delete')
diff --git a/app/views/calendars/edit.html.slim b/app/views/calendars/edit.html.slim
index 22645cf24..6668630e8 100644
--- a/app/views/calendars/edit.html.slim
+++ b/app/views/calendars/edit.html.slim
@@ -1,3 +1,12 @@
-= title_tag t('.title', calendar: @calendar.name)
+/ PageHeader
+= pageheader 'map-marker',
+             t('.title', calendar: @calendar.name),
+             '',
+             t('last_update', time: l(@calendar.updated_at, format: :short))
 
-= render 'form'
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+        = render 'form'
diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim
index fbb9f889d..ec3893959 100644
--- a/app/views/calendars/index.html.slim
+++ b/app/views/calendars/index.html.slim
@@ -2,12 +2,7 @@
 = pageheader 'map-marker',
              t('.title'),
              '',
-             '' do
-
-  / Below is secundary actions & optional contents (filters, ...)
-  .row.mb-sm
-    .col-lg-12.text-right
-      = link_to t('actions.add'), new_calendar_path, class: 'btn btn-primary'
+             link_to(t('actions.add'), new_calendar_path, class: 'btn btn-default') do
 
 / PageContent
 .page_content
diff --git a/app/views/calendars/new.html.slim b/app/views/calendars/new.html.slim
index f827e2eb6..7faecf587 100644
--- a/app/views/calendars/new.html.slim
+++ b/app/views/calendars/new.html.slim
@@ -1,3 +1,12 @@
-= title_tag t('.title')
+/ PageHeader
+= pageheader 'map-marker',
+             t('.title'),
+             '',
+             ''
 
-= render 'form'
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+        = render 'form'