Merge branch 'develop'5.1-beta1

4 files changed, 7 insertions, 7 deletions

diff --git a/app/views/phone_sip_accounts/_index_core.html.haml b/app/views/phone_sip_accounts/_index_core.html.haml
index 89afb2b..1e6d3ca 100644
--- a/app/views/phone_sip_accounts/_index_core.html.haml
+++ b/app/views/phone_sip_accounts/_index_core.html.haml
@@ -1,12 +1,12 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('phone_sip_accounts.index.phone_id')
     %th= t('phone_sip_accounts.index.sip_account_id')
     %th= t('phone_sip_accounts.index.position')
-
-  - reset_cycle
+    %th{:colspan => '3'}
+  
   - for phone_sip_account in phone_sip_accounts
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= phone_sip_account.phone
       %td= phone_sip_account.sip_account
       %td= phone_sip_account.position
diff --git a/app/views/phone_sip_accounts/index.html.haml b/app/views/phone_sip_accounts/index.html.haml
index a9e3f85..f9ff716 100644
--- a/app/views/phone_sip_accounts/index.html.haml
+++ b/app/views/phone_sip_accounts/index.html.haml
@@ -1,4 +1,4 @@
-- title t("phone_sip_accounts.index.page_title")
+- content_for :title, t("phone_sip_accounts.index.page_title")
 
 - if @phone_sip_accounts.count > 0
   =render "index_core", :phone_sip_accounts => @phone_sip_accounts
diff --git a/app/views/phone_sip_accounts/new.html.haml b/app/views/phone_sip_accounts/new.html.haml
index bfe40b8..3ad8895 100644
--- a/app/views/phone_sip_accounts/new.html.haml
+++ b/app/views/phone_sip_accounts/new.html.haml
@@ -1,3 +1,3 @@
-- title t("phone_sip_accounts.new.page_title")
+- content_for :title, t("phone_sip_accounts.new.page_title")
 
 = render "form"
diff --git a/app/views/phone_sip_accounts/show.html.haml b/app/views/phone_sip_accounts/show.html.haml
index 0dd5a9b..54e1e5d 100644
--- a/app/views/phone_sip_accounts/show.html.haml
+++ b/app/views/phone_sip_accounts/show.html.haml
@@ -1,4 +1,4 @@
-- title t("phone_sip_accounts.show.page_title")
+- content_for :title, t("phone_sip_accounts.show.page_title")
 
 %p
   %strong= t('phone_sip_accounts.show.phone_id') + ":"