Merge branch 'develop'5.1-beta1

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/sip_domains/_index_core.html.haml b/app/views/sip_domains/_index_core.html.haml
index 37374f2..d26fd1b 100644
--- a/app/views/sip_domains/_index_core.html.haml
+++ b/app/views/sip_domains/_index_core.html.haml
@@ -1,11 +1,11 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('sip_domains.index.host')
     %th= t('sip_domains.index.realm')
 
-  - reset_cycle
+  
   - for sip_domain in sip_domains
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= sip_domain.host
       %td= sip_domain.realm
       =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => sip_domain}
\ No newline at end of file
diff --git a/app/views/sip_domains/edit.html.haml b/app/views/sip_domains/edit.html.haml
index dcf8d6b..adf77ef 100644
--- a/app/views/sip_domains/edit.html.haml
+++ b/app/views/sip_domains/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("sip_domains.edit.page_title")
+- content_for :title, t("sip_domains.edit.page_title")
 
 = render "form"
diff --git a/app/views/sip_domains/index.html.haml b/app/views/sip_domains/index.html.haml
index 6de7f42..3eb0c28 100644
--- a/app/views/sip_domains/index.html.haml
+++ b/app/views/sip_domains/index.html.haml
@@ -1,4 +1,4 @@
-- title t("sip_domains.index.page_title")
+- content_for :title, t("sip_domains.index.page_title")
 
 - if @sip_domains.count > 0
   = render "index_core", :sip_domains => @sip_domains
diff --git a/app/views/sip_domains/new.html.haml b/app/views/sip_domains/new.html.haml
index 12ff340..863e680 100644
--- a/app/views/sip_domains/new.html.haml
+++ b/app/views/sip_domains/new.html.haml
@@ -1,3 +1,3 @@
-- title t("sip_domains.new.page_title")
+- content_for :title, t("sip_domains.new.page_title")
 
 = render "form"
diff --git a/app/views/sip_domains/show.html.haml b/app/views/sip_domains/show.html.haml
index e136eaf..b7b74cd 100644
--- a/app/views/sip_domains/show.html.haml
+++ b/app/views/sip_domains/show.html.haml
@@ -1,4 +1,4 @@
-- title t("sip_domains.show.page_title")
+- content_for :title, t("sip_domains.show.page_title")
 
 %p
   %strong= t('sip_domains.show.host') + ":"