Merge branch 'develop'5.1-beta1

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/whitelists/_index_core.html.haml b/app/views/whitelists/_index_core.html.haml
index b4c5b0c..3333169 100644
--- a/app/views/whitelists/_index_core.html.haml
+++ b/app/views/whitelists/_index_core.html.haml
@@ -1,11 +1,11 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('whitelists.index.name')
     %th= t('whitelists.index.phone_numbers')
 
-  - reset_cycle
+  
   - for whitelist in whitelists
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= whitelist.name || '-'
       %td
         = render 'phone_numbers/listing', :phone_numbers => whitelist.phone_numbers
diff --git a/app/views/whitelists/edit.html.haml b/app/views/whitelists/edit.html.haml
index 9f8af90..9adcc58 100644
--- a/app/views/whitelists/edit.html.haml
+++ b/app/views/whitelists/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("whitelists.edit.page_title")
+- content_for :title, t("whitelists.edit.page_title")
 
 = render "form"
diff --git a/app/views/whitelists/index.html.haml b/app/views/whitelists/index.html.haml
index 0873189..52ab453 100644
--- a/app/views/whitelists/index.html.haml
+++ b/app/views/whitelists/index.html.haml
@@ -1,4 +1,4 @@
-- title t("whitelists.index.page_title")
+- content_for :title, t("whitelists.index.page_title")
 
 - if @whitelists.count > 0
   = render "index_core", :whitelists => @whitelists
diff --git a/app/views/whitelists/new.html.haml b/app/views/whitelists/new.html.haml
index f1101ad..7086cfd 100644
--- a/app/views/whitelists/new.html.haml
+++ b/app/views/whitelists/new.html.haml
@@ -1,3 +1,3 @@
-- title t("whitelists.new.page_title")
+- content_for :title, t("whitelists.new.page_title")
 
 = render "form"
diff --git a/app/views/whitelists/show.html.haml b/app/views/whitelists/show.html.haml
index 77652f9..054afc5 100644
--- a/app/views/whitelists/show.html.haml
+++ b/app/views/whitelists/show.html.haml
@@ -1,4 +1,4 @@
-- title t("whitelists.show.page_title")
+- content_for :title, t("whitelists.show.page_title")
 
 %p
   %strong= t('whitelists.show.name') + ":"