Merge branch 'tb-css' into develop

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/gui_functions/_index_core.html.haml b/app/views/gui_functions/_index_core.html.haml
index 815b9c3..0d9454e 100644
--- a/app/views/gui_functions/_index_core.html.haml
+++ b/app/views/gui_functions/_index_core.html.haml
@@ -1,13 +1,13 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('gui_functions.index.category')
     %th= t('gui_functions.index.name')
     - @user_groups.each do |user_group|
       %th= user_group
 
-  - reset_cycle
+  
   - for gui_function in gui_functions
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       - cache(['gui_functions_table_row', I18n.locale, gui_function]) do
         %td= gui_function.category
         %td
diff --git a/app/views/gui_functions/edit.html.haml b/app/views/gui_functions/edit.html.haml
index f43b5bc..a041138 100644
--- a/app/views/gui_functions/edit.html.haml
+++ b/app/views/gui_functions/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("gui_functions.edit.page_title")
+- content_for :title, t("gui_functions.edit.page_title")
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/gui_functions/index.html.haml b/app/views/gui_functions/index.html.haml
index 9b53918..b0a7d18 100644
--- a/app/views/gui_functions/index.html.haml
+++ b/app/views/gui_functions/index.html.haml
@@ -1,4 +1,4 @@
-- title t("gui_functions.index.page_title")
+- content_for :title, t("gui_functions.index.page_title")
 
 - if @gui_functions && @gui_functions.count > 0
   - cache(['gui_functions_table', I18n.locale, @gui_functions.reorder(:updated_at).last, @gui_functions.count]) do
diff --git a/app/views/gui_functions/new.html.haml b/app/views/gui_functions/new.html.haml
index 6c57e9c..0e3a809 100644
--- a/app/views/gui_functions/new.html.haml
+++ b/app/views/gui_functions/new.html.haml
@@ -1,3 +1,3 @@
-- title t("gui_functions.new.page_title")
+- content_for :title, t("gui_functions.new.page_title")
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/gui_functions/show.html.haml b/app/views/gui_functions/show.html.haml
index 8af329a..91b9d2e 100644
--- a/app/views/gui_functions/show.html.haml
+++ b/app/views/gui_functions/show.html.haml
@@ -1,4 +1,4 @@
-- title t("gui_functions.show.page_title")
+- content_for :title, t("gui_functions.show.page_title")
 
 - cache(['gui_function_show', I18n.locale, @gui_function]) do
   %p