Refs #2482: starting integration for workbenches

13 files changed, 109 insertions, 159 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b616def70..c2414f5bb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,9 +2,6 @@ class ApplicationController < ActionController::Base
   include Pundit
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
-  # Comment to activate the new layout
-  # layout 'application_new'
-
   # TODO : Delete hack to authorize Cross Request for js and json get request from javascript
   protect_from_forgery unless: -> { request.get? && (request.format.json? || request.format.js?) }
   before_action :authenticate_user!
diff --git a/app/views/layouts/_flash_messages.html.slim b/app/views/layouts/_flash_messages.html.slim
new file mode 100644
index 000000000..3f9ee6203
--- /dev/null
+++ b/app/views/layouts/_flash_messages.html.slim
@@ -0,0 +1,9 @@
+- flash.each do |name, msg|
+  - if msg.is_a?(String)
+    - if name == 'notice'
+      .notice.alert class="alert-success" role="alert"
+        = content_tag :span, msg
+
+    - if name == 'error' || name == 'alert'
+      .notice.alert class="alert-danger" role="alert"
+        = content_tag :span, msg
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index 6e23c3c08..dc288a1e9 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -3,38 +3,23 @@ html lang=I18n.locale
   head
     meta charset="utf-8"
     meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
-    meta content="IE=EmulateIE7" http-equiv="X-UA-Compatible"
 
-    title = "STIF BOIV - #{title}"
+    = csrf_meta_tag
 
-    = favicon_link_tag "logo_chouette_small.ico"
-    = favicon_link_tag 'logo_chouette_small.png', rel: 'apple-touch-icon', type: 'image/png'
+    title STIF BOIV
 
-    = stylesheet_link_tag :application
-    = javascript_include_tag :application
+    = stylesheet_link_tag 'base', media: 'all', 'data-turbolinks-track': true
+    = stylesheet_link_tag 'application_new', media: 'all', 'data-turbolinks-track': true
 
-    / - if defined?(@map)
-    /   = javascript_include_tag "http://maps.google.com/maps/api/js?v=3.2&sensor=false"
-    /   = javascript_include_tag "http://openlayers.org/api/OpenLayers.js"
-    / 
-    /   = javascript_tag do
-    /     | OpenLayers.ImgPath = "#{polymorphic_path_patch('/assets/openlayers/')}"
+    = javascript_include_tag 'application', 'data-turbolinks-track': true
 
-    = analytics_init if Rails.env.production?
-    = csrf_meta_tag
 
   body
-    #header
-      = render partial: "shared/header"
-    #middle.container
-      .row
-        div class=("#{content_for?(:sidebar) ? 'col-md-9' : 'col-md-12'}") 
-          #workspace class=("#{controller_name} #{action_name}") 
-            = render partial: "shared/flash_messages", flash: flash
-            = render partial: "shared/breadcrumb"
-            = yield
-        #sidebar class=("#{content_for?(:sidebar) ? 'col-md-3' : ''}") 
-          = yield :sidebar
-    .clearfix
-    #footer
-      = render partial: "shared/footer"
+    = render 'layouts/navigation/main_nav'
+    
+    = render 'layouts/flash_messages', flash: flash
+    
+    = yield
+
+    #sidebar
+      = yield :sidebar
diff --git a/app/views/layouts/application_new.html.slim b/app/views/layouts/application_new.html.slim
deleted file mode 100644
index 0a7b6bbbf..000000000
--- a/app/views/layouts/application_new.html.slim
+++ /dev/null
@@ -1,33 +0,0 @@
-doctype html
-html lang=I18n.locale
-  head
-    meta charset="utf-8"
-    meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
-
-    = csrf_meta_tag
-
-    title STIF BOIV
-
-    = stylesheet_link_tag 'base', media: 'all', 'data-turbolinks-track': true
-    = stylesheet_link_tag 'application_new', media: 'all', 'data-turbolinks-track': true
-
-    = javascript_include_tag 'application', 'data-turbolinks-track': true
-
-
-  body
-    = render 'layouts/new/main_nav'
-    = render 'layouts/new/widget_bar'
-    
-    .container-fluid
-      = render partial: 'layouts/new/flash_messages', flash: flash
-
-      .row
-        .col-lg-12.col-md-12.col-sm-12.col-xs-12
-          .container
-            .row
-              .col-lg-12.col-md-12.col-sm-12.col-xs-12
-                #workspace class=("#{controller_name} #{action_name}")
-                  = yield
-
-                #sidebar
-                  = yield :sidebar
diff --git a/app/views/layouts/new/_breadcrumb.html.slim b/app/views/layouts/navigation/_breadcrumb.html.slim
index a101098fe..a101098fe 100644
--- a/app/views/layouts/new/_breadcrumb.html.slim
+++ b/app/views/layouts/navigation/_breadcrumb.html.slim
diff --git a/app/views/layouts/navigation/_main_nav.html.slim b/app/views/layouts/navigation/_main_nav.html.slim
new file mode 100644
index 000000000..806290223
--- /dev/null
+++ b/app/views/layouts/navigation/_main_nav.html.slim
@@ -0,0 +1,6 @@
+nav#main_nav
+  // Left menu content
+  = render 'layouts/navigation/main_nav_left'
+
+  // Top menu content
+  = render 'layouts/navigation/main_nav_top'
diff --git a/app/views/layouts/new/_main_nav_left.html.slim b/app/views/layouts/navigation/_main_nav_left.html.slim
index 832793247..832793247 100644
--- a/app/views/layouts/new/_main_nav_left.html.slim
+++ b/app/views/layouts/navigation/_main_nav_left.html.slim
diff --git a/app/views/layouts/new/_main_nav_top.html.slim b/app/views/layouts/navigation/_main_nav_top.html.slim
index 298cf8ac9..095fbca0b 100644
--- a/app/views/layouts/new/_main_nav_top.html.slim
+++ b/app/views/layouts/navigation/_main_nav_top.html.slim
@@ -3,7 +3,7 @@
 
   .menu-content
     .menu-item
-      = render 'layouts/new/breadcrumb'
+      = render 'layouts/navigation/breadcrumb'
 
     .menu-item-group.pull-right
       = link_to '#', class: 'menu-item', data: { panel: 'toggle', target: '#operations_panel' }, title: 'Opérations' do
@@ -17,5 +17,5 @@
       = link_to destroy_user_session_path, method: :delete, class: 'menu-item', title: 'Se déconnecter' do
         span.fa.fa-lg.fa-sign-out
 
-  = render 'layouts/new/nav_panel_operations'
-  = render 'layouts/new/nav_panel_profile'
+  = render 'layouts/navigation/nav_panel_operations'
+  = render 'layouts/navigation/nav_panel_profile'
diff --git a/app/views/layouts/new/_nav_panel_operations.html.slim b/app/views/layouts/navigation/_nav_panel_operations.html.slim
index 8dce829cd..8dce829cd 100644
--- a/app/views/layouts/new/_nav_panel_operations.html.slim
+++ b/app/views/layouts/navigation/_nav_panel_operations.html.slim
diff --git a/app/views/layouts/new/_nav_panel_profile.html.slim b/app/views/layouts/navigation/_nav_panel_profile.html.slim
index 82e8dda76..82e8dda76 100644
--- a/app/views/layouts/new/_nav_panel_profile.html.slim
+++ b/app/views/layouts/navigation/_nav_panel_profile.html.slim
diff --git a/app/views/layouts/new/_flash_messages.html.slim b/app/views/layouts/new/_flash_messages.html.slim
deleted file mode 100644
index 70076d42e..000000000
--- a/app/views/layouts/new/_flash_messages.html.slim
+++ /dev/null
@@ -1,18 +0,0 @@
-.row
-  .col-lg-12
-    - flash.each do |name, msg|
-      - if msg.is_a?(String)
-        - if name == 'notice'
-          .notice.alert class="alert-success" role="alert"
-            = content_tag :span, msg
-
-        - if name == 'error' || name == 'alert'
-          .notice.alert class="alert-danger" role="alert"
-            = content_tag :span, msg
-
-/ - flash.each do |type, message|
-/   div class="alert #{bootstrap_class_for(type)} fade in" role="alert"
-/     button.close data-dismiss="alert"
-/       |x
-/     
-/     = flash_message_for type, message
diff --git a/app/views/layouts/new/_main_nav.html.slim b/app/views/layouts/new/_main_nav.html.slim
deleted file mode 100644
index 17ecb1dd3..000000000
--- a/app/views/layouts/new/_main_nav.html.slim
+++ /dev/null
@@ -1,6 +0,0 @@
-nav#main_nav
-  // Left menu content
-  = render 'layouts/new/main_nav_left'
-
-  // Top menu content
-  = render 'layouts/new/main_nav_top'
diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim
index ba36a94db..4ace5dc8b 100644
--- a/app/views/workbenches/show.html.slim
+++ b/app/views/workbenches/show.html.slim
@@ -1,80 +1,90 @@
-= title_tag "#{@workbench.name} - Tableau de bord"
+.page_header
+  .container-fluid
+    .row
+      .col-lg-9.col-md-8.col-sm-8
+        h1
+          |Jeux de données
+          span.small.fa.fa-info-circle title='Description'
+      
+      .col-lg-3.col-md-4.col-sm-4.text-right
+        .btn-helper-txt = 'Dernière mise à jour le 12/12/2016 par Prenom NOM'
+        = link_to t('referentials.actions.new'), new_referential_path(workbench_id: @workbench), class: 'btn btn-default btn-primary'
 
-.referentials.paginated_content
-  h4 = "Liste des jeux de données#{' (tous)' if params[:show_all]}"
+.page_content
+  .container-fluid
+    .row
+      .col-lg-12
+        .referentials.paginated_content
+          / h4 = "Liste des jeux de données#{' (tous)' if params[:show_all]}"
+          / 
+          / h5
+          /   - if params[:show_all]
+          /     = link_to t('referentials.show.from_this_workbench'), workbench_path(@workbench.id), class: 'button', disabled: params[:archived]
+          /   - else
+          /     = link_to t('referentials.show.show_all_referentials'), workbench_path(@workbench.id, show_all: true), class: 'btn btn-default'
 
-  h5
-    - if params[:show_all]
-      = link_to t('referentials.show.from_this_workbench'), workbench_path(@workbench.id), class: 'button', disabled: params[:archived]
-    - else
-      = link_to t('referentials.show.show_all_referentials'), workbench_path(@workbench.id, show_all: true), class: 'button'
+          table.table.table-bordered.table-hover
+            thead
+              tr
+                th = Referential.human_attribute_name(:name)
+                th = Referential.human_attribute_name(:updated_at)
+                th = "Publié le"
+                th = Referential.human_attribute_name(:validity_period)
+                th = Referential.human_attribute_name(:lines)
+                th = Referential.human_attribute_name(:organisation)
+                th = "Etat"
+                th = "Actions"
 
-  table.table.table-bordered.table-hover
-    thead
-      tr
-        th = Referential.human_attribute_name(:name)
-        th = Referential.human_attribute_name(:updated_at)
-        th = "Publié le"
-        th = Referential.human_attribute_name(:validity_period)
-        th = Referential.human_attribute_name(:lines)
-        th = Referential.human_attribute_name(:organisation)
-        th = "Etat"
-        th = "Actions"
+            tbody
+              - @wbench_refs.each do |referential|
+                tr
+                  td = referential.name
+                  td = l referential.updated_at, format: :long
+                  td
+                  td
+                    - if referential.validity_period.nil?
+                      = Referential.human_attribute_name('no_validity_period')
+                    - else
+                      => Referential.human_attribute_name('start_validity_period')
+                      => l referential.validity_period.begin, format: :long
+                      => Referential.human_attribute_name('end_validity_period')
+                      => l referential.validity_period.end, format: :long
 
-    tbody
-      - @wbench_refs.each do |referential|
-        tr
-          td = referential.name
-          td = l referential.updated_at, format: :long
-          td
-          td
-            - if referential.validity_period.nil?
-              = Referential.human_attribute_name('no_validity_period')
-            - else
-              => Referential.human_attribute_name('start_validity_period')
-              => l referential.validity_period.begin, format: :long
-              => Referential.human_attribute_name('end_validity_period')
-              => l referential.validity_period.end, format: :long
+                  td = referential.lines.count
+                  td = referential.organisation.name
 
-          td = referential.lines.count
-          td = referential.organisation.name
+                  / Status (archived?)
+                  td.text-center
+                    - if referential.archived?
+                      span.fa.fa-archive title="Archivé"
+                    - else
+                      = "-"
 
-          / Status (archived?)
-          td.text-center
-            - if referential.archived?
-              span.fa.fa-archive title="Archivé"
-            - else
-              = "-"
+                  / Actions
+                  td.text-center
+                    .btn-group.btn-group-xs
+                      .btn-primary.btn.dropdown-toggle data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                        span.fa.fa-bars
+                        span.caret
 
-          / Actions
-          td.text-center
-            .btn-group.btn-group-xs
-              .btn-primary.btn.dropdown-toggle data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
-                span.fa.fa-bars
-                span.caret
+                      ul.dropdown-menu
+                        li = link_to "Voir", referential_path(referential)
 
-              ul.dropdown-menu
-                li = link_to "Voir", referential_path(referential)
+                        - if policy(referential).update?
+                          li = link_to "Editer", edit_referential_path(referential)
 
-                - if policy(referential).update?
-                  li = link_to "Editer", edit_referential_path(referential)
+                        li = link_to "Cloner", new_referential_path(from: referential)
 
-                li = link_to "Cloner", new_referential_path(from: referential)
+                        - if referential.archived?
+                          - if referential.can_unarchive?
+                            li = link_to "Désarchiver", unarchive_referential_path(referential), method: :put
+                          - else
+                            li.disabled title="L'action est impossible pour ce référentiel"
+                              = link_to "Désarchiver", "#"
+                        - else
+                          li = link_to "Archiver", archive_referential_path(referential), method: :put
 
-                - if referential.archived?
-                  - if referential.can_unarchive?
-                    li = link_to "Désarchiver", unarchive_referential_path(referential), method: :put
-                  - else
-                    li.disabled title="L'action est impossible pour ce référentiel"
-                      = link_to "Désarchiver", "#"
-                - else
-                  li = link_to "Archiver", archive_referential_path(referential), method: :put
+                        li = link_to "Supprimer", referential_path(referential), method: :delete, :data => {:confirm => t('referentials.actions.destroy_confirm')}
 
-                li = link_to "Supprimer", referential_path(referential), method: :delete, :data => {:confirm => t('referentials.actions.destroy_confirm')}
-
-  .text-center
-    = will_paginate @wbench_refs, container: false, renderer: RemoteBootstrapPaginationLinkRenderer
-
-- content_for :sidebar do
-  ul.actions
-    li = link_to t('referentials.actions.new'), new_referential_path(workbench_id: @workbench), class: 'add'
+          .text-center
+            = will_paginate @wbench_refs, container: false, renderer: RemoteBootstrapPaginationLinkRenderer