Refs #2485: adding pageHeader helper, to keep views simple

3 files changed, 47 insertions, 22 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8e476a958..5edb8c3bf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,6 @@
 module ApplicationHelper
 
-  include NewfrontHelper
+  include NewapplicationHelper
 
   def font_awesome_classic_tag(name)
     name = "fa-file-text-o" if name == "fa-file-csv-o"
diff --git a/app/helpers/newfront_helper.rb b/app/helpers/newapplication_helper.rb
index 7bedbeea9..2e5a716a6 100644
--- a/app/helpers/newfront_helper.rb
+++ b/app/helpers/newapplication_helper.rb
@@ -1,4 +1,4 @@
-module NewfrontHelper
+module NewapplicationHelper
 
   # Table Builder
   def table_builder collection, columns, actions, cls = nil
@@ -115,4 +115,41 @@ module NewfrontHelper
     end
   end
 
+  # PageHeader builder
+  def pageheader pageicon, pagetitle, desc, meta, mainaction = nil, &block
+
+    firstRow = content_tag :div, '', class: 'row' do
+      # Left part with pageicon & pagetitle & desc
+      left = content_tag :div, '', class: 'col-lg-9 col-md-8 col-sm-8 col-xs-7' do
+        picon = content_tag :div, '', class: 'page-icon' do
+          content_tag :span, '', class: "fa fa-lg fa-#{pageicon}"
+        end
+        ptitle = content_tag :div, '', class: 'page-title' do
+          info = content_tag :span, '', class: 'small fa fa-info-circle', title: desc
+
+          content_tag :h1, pagetitle.concat(info).html_safe
+        end
+
+        picon + ptitle
+      end
+      # Right part with meta & mainaction
+      right = content_tag :div, '', class: 'col-lg-3 col-md-4 col-sm-4 col-xs-5 text-right' do
+        content_tag :div, '', class: 'page-action' do
+          a = content_tag :div, meta.html_safe, class: 'small'
+          b = mainaction.try(:html_safe)
+
+          a + b
+        end
+      end
+
+      left + right
+    end
+
+    content_tag :div, '', class: 'page_header' do
+      content_tag :div, '', class: 'container-fluid' do
+        firstRow + capture(&block)
+      end
+    end
+  end
+
 end
diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim
index 9aa7f054d..193344572 100644
--- a/app/views/workbenches/show.html.slim
+++ b/app/views/workbenches/show.html.slim
@@ -1,24 +1,12 @@
-.page_header
-  .container-fluid
-    .row
-      .col-lg-9.col-md-8.col-sm-8.col-xs-7
-        .page-icon
-          span.fa.fa-map-marker
-        .page-title
-          h1
-            |Jeux de données
-            span.small.fa.fa-info-circle title='Description'
-      
-      .col-lg-3.col-md-4.col-sm-4.col-xs-5.text-right
-        .page-action
-          .small
-            = "Dernière mise à jour "
-            br
-            = "le #{l @workbench.updated_at, format: '%d/%m/%Y'} par Prenom NOM"
+= pageheader 'map-marker',
+               'Jeux de données',
+               'Lorem ipsum dolor sit amet',
+               'Dernière mise à jour <br> le 22/12/2016' do
 
-    .row
-      .col-lg-12.col-md-12.col-sm-12.col-xs-12.text-right
-        = link_to t('referentials.actions.new'), new_referential_path(workbench_id: @workbench), class: 'btn btn-default btn-primary'
+  / Below is secundary actions & optional contents (filters, ...)
+  .row
+    .col-lg-12.col-md-12.col-sm-12.col-xs-12.text-right
+      = link_to t('referentials.actions.new'), new_referential_path(workbench_id: @workbench), class: 'btn btn-default btn-primary'
 
 .page_content
   .container-fluid