Merge branch 'tb-css' into develop

5 files changed, 8 insertions, 8 deletions

diff --git a/app/views/user_groups/_index_core.html.haml b/app/views/user_groups/_index_core.html.haml
index 481a507..941f9fa 100644
--- a/app/views/user_groups/_index_core.html.haml
+++ b/app/views/user_groups/_index_core.html.haml
@@ -1,5 +1,5 @@
 - cache(['user_groups_table', I18n.locale, current_user, @user, user_groups, User.order(:updated_at).last, User.count, UserGroupMembership.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do
-  %table
+  %table{:class => 'table table-striped'}
     %tr
       %th= t('user_groups.index.name')
       - if user_groups.pluck(:description).uniq != [nil]
@@ -8,10 +8,10 @@
         %th= t('user_groups.index.tenant_id')
       - else
         %th= t('user_groups.index.members')
-
-    - reset_cycle
+      %th{:colspan => '3'}
+    
     - for user_group in user_groups
-      %tr{:class => cycle('odd', 'even')}
+      %tr
         %td= user_group.name
         - if user_groups.pluck(:description).uniq != [nil]
           %td= user_group.description
diff --git a/app/views/user_groups/edit.html.haml b/app/views/user_groups/edit.html.haml
index 35514e0..4d263a4 100644
--- a/app/views/user_groups/edit.html.haml
+++ b/app/views/user_groups/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("user_groups.edit.page_title", :resource => @user_group)
+- content_for :title, t("user_groups.edit.page_title", :resource => @user_group)
 
 = render "form"
diff --git a/app/views/user_groups/index.html.haml b/app/views/user_groups/index.html.haml
index 545b838..7240f5f 100644
--- a/app/views/user_groups/index.html.haml
+++ b/app/views/user_groups/index.html.haml
@@ -1,4 +1,4 @@
-- title t("user_groups.index.page_title")
+- content_for :title, t("user_groups.index.page_title")
 
 - if @user_groups.count > 0
   = render "index_core", :user_groups => @user_groups
diff --git a/app/views/user_groups/new.html.haml b/app/views/user_groups/new.html.haml
index dfef18e..3c5920f 100644
--- a/app/views/user_groups/new.html.haml
+++ b/app/views/user_groups/new.html.haml
@@ -1,3 +1,3 @@
-- title t("user_groups.new.page_title")
+- content_for :title, t("user_groups.new.page_title")
 
 = render "form"
diff --git a/app/views/user_groups/show.html.haml b/app/views/user_groups/show.html.haml
index 00bdeb7..fe5b745 100644
--- a/app/views/user_groups/show.html.haml
+++ b/app/views/user_groups/show.html.haml
@@ -1,4 +1,4 @@
-- title t("user_groups.show.page_title")
+- content_for :title, t("user_groups.show.page_title")
 
 %p
   %strong= t('user_groups.show.name') + ":"