Merge branch 'develop'5.1-beta1

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/addresses/_index_core.html.haml b/app/views/addresses/_index_core.html.haml
index 2050ded..3645009 100644
--- a/app/views/addresses/_index_core.html.haml
+++ b/app/views/addresses/_index_core.html.haml
@@ -1,4 +1,4 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('addresses.index.phone_book_entry_id')
     %th= t('addresses.index.line1')
@@ -9,9 +9,9 @@
     %th= t('addresses.index.country_id')
     %th= t('addresses.index.position')
 
-  - reset_cycle
+  
   - for address in addresses
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= address.phone_book_entry_id
       %td= address.line1
       %td= address.line2
diff --git a/app/views/addresses/edit.html.haml b/app/views/addresses/edit.html.haml
index 3d85ae6..a9e482f 100644
--- a/app/views/addresses/edit.html.haml
+++ b/app/views/addresses/edit.html.haml
@@ -1,4 +1,4 @@
-- title t("addresses.edit.page_title")
+- content_for :title, t("addresses.edit.page_title")
 
 = render "form"
 
diff --git a/app/views/addresses/index.html.haml b/app/views/addresses/index.html.haml
index ecebc65..615f267 100644
--- a/app/views/addresses/index.html.haml
+++ b/app/views/addresses/index.html.haml
@@ -1,4 +1,4 @@
-- title t("addresses.index.page_title")
+- content_for :title, t("addresses.index.page_title")
 
 - if @addresses.count > 0
   = render "index_core", :addresses => @addresses
diff --git a/app/views/addresses/new.html.haml b/app/views/addresses/new.html.haml
index 280de55..e75b55a 100644
--- a/app/views/addresses/new.html.haml
+++ b/app/views/addresses/new.html.haml
@@ -1,3 +1,3 @@
-- title t("addresses.new.page_title")
+- content_for :title, t("addresses.new.page_title")
 
 = render "form"
diff --git a/app/views/addresses/show.html.haml b/app/views/addresses/show.html.haml
index 211d020..6c8c651 100644
--- a/app/views/addresses/show.html.haml
+++ b/app/views/addresses/show.html.haml
@@ -1,4 +1,4 @@
-- title t("addresses.show.page_title")
+- content_for :title, t("addresses.show.page_title")
 
 %p
   %strong= t('addresses.show.phone_book_entry_id') + ":"