Merge branch 'develop'5.1-beta1

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/fax_accounts/_index_core.html.haml b/app/views/fax_accounts/_index_core.html.haml
index 50dc2eb..5a04bf0 100644
--- a/app/views/fax_accounts/_index_core.html.haml
+++ b/app/views/fax_accounts/_index_core.html.haml
@@ -1,4 +1,4 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('fax_accounts.index.name')
     %th
@@ -13,9 +13,9 @@
       %small
         = t('fax_accounts.index.last_update')
 
-  - reset_cycle
+  
   - for fax_account in fax_accounts
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= truncate(fax_account.name, :length => 15)
       %td
         =render 'phone_numbers/listing', :phone_numbers => fax_account.phone_numbers.order(:number)
diff --git a/app/views/fax_accounts/edit.html.haml b/app/views/fax_accounts/edit.html.haml
index 86f664d..3cdc655 100644
--- a/app/views/fax_accounts/edit.html.haml
+++ b/app/views/fax_accounts/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("fax_accounts.edit.page_title")
+- content_for :title, t("fax_accounts.edit.page_title")
 
 = render "form"
diff --git a/app/views/fax_accounts/index.html.haml b/app/views/fax_accounts/index.html.haml
index 309a10d..9710454 100644
--- a/app/views/fax_accounts/index.html.haml
+++ b/app/views/fax_accounts/index.html.haml
@@ -1,4 +1,4 @@
-- title t("fax_accounts.index.page_title")
+- content_for :title, t("fax_accounts.index.page_title")
 
 - if @fax_accounts.count > 0
   = render "index_core", {:fax_accounts => @fax_accounts, :fax_accountable => @parent}
diff --git a/app/views/fax_accounts/new.html.haml b/app/views/fax_accounts/new.html.haml
index 9a67100..eff9347 100644
--- a/app/views/fax_accounts/new.html.haml
+++ b/app/views/fax_accounts/new.html.haml
@@ -1,3 +1,3 @@
-- title t("fax_accounts.new.page_title")
+- content_for :title, t("fax_accounts.new.page_title")
 
 = render "form"
diff --git a/app/views/fax_accounts/show.html.haml b/app/views/fax_accounts/show.html.haml
index 95fb7b2..1a32121 100644
--- a/app/views/fax_accounts/show.html.haml
+++ b/app/views/fax_accounts/show.html.haml
@@ -1,4 +1,4 @@
-- title t("fax_accounts.show.page_title")
+- content_for :title, t("fax_accounts.show.page_title")
 
 %p
   %strong= t('fax_accounts.show.name') + ":"