Merge branch 'develop'5.1-beta1

4 files changed, 6 insertions, 6 deletions

diff --git a/app/views/system_messages/_index_core.html.haml b/app/views/system_messages/_index_core.html.haml
index 157d964..361eb5f 100644
--- a/app/views/system_messages/_index_core.html.haml
+++ b/app/views/system_messages/_index_core.html.haml
@@ -1,11 +1,11 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('system_messages.index.created_at')
     %th= t('system_messages.index.content')
 
-  - reset_cycle
+  
   - for system_message in system_messages
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= system_message.created_at
       %td= system_message.content
       =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => system_message}
\ No newline at end of file
diff --git a/app/views/system_messages/index.html.haml b/app/views/system_messages/index.html.haml
index da77e18..ffd3fc3 100644
--- a/app/views/system_messages/index.html.haml
+++ b/app/views/system_messages/index.html.haml
@@ -1,3 +1,3 @@
-- title t("system_messages.index.page_title")
+- content_for :title, t("system_messages.index.page_title")
 
 = render "index_core", :system_messages => @system_messages
\ No newline at end of file
diff --git a/app/views/system_messages/new.html.haml b/app/views/system_messages/new.html.haml
index 3afdb24..565f5c5 100644
--- a/app/views/system_messages/new.html.haml
+++ b/app/views/system_messages/new.html.haml
@@ -1,3 +1,3 @@
-- title t("system_messages.new.page_title")
+- content_for :title, t("system_messages.new.page_title")
 
 = render "form"
diff --git a/app/views/system_messages/show.html.haml b/app/views/system_messages/show.html.haml
index 694e4c1..70be6f2 100644
--- a/app/views/system_messages/show.html.haml
+++ b/app/views/system_messages/show.html.haml
@@ -1,4 +1,4 @@
-- title t("system_messages.show.page_title")
+- content_for :title, t("system_messages.show.page_title")
 
 %p
   %strong= t('system_messages.show.created_at') + ":"