Merge branch 'tb-css' into develop

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/call_forwards/_index_core.html.haml b/app/views/call_forwards/_index_core.html.haml
index 7733855..27ad86f 100644
--- a/app/views/call_forwards/_index_core.html.haml
+++ b/app/views/call_forwards/_index_core.html.haml
@@ -1,4 +1,4 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     - if !@phone_number
       %th= t('call_forwards.index.phone_number_id')
@@ -10,9 +10,9 @@
       %th= t('call_forwards.index.depth')
     %th= t('call_forwards.index.active')
 
-  - reset_cycle
+  
   - for call_forward in call_forwards
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       - if !@phone_number
         %td= call_forward.phone_number
       %td= t("call_forward_cases.#{call_forward.call_forward_case.value}")
diff --git a/app/views/call_forwards/edit.html.haml b/app/views/call_forwards/edit.html.haml
index 5fa9dcd..f55052b 100644
--- a/app/views/call_forwards/edit.html.haml
+++ b/app/views/call_forwards/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("call_forwards.edit.page_title", :resource => " for phone number #{@phone_number}" )
+- content_for :title, t("call_forwards.edit.page_title", :resource => " for phone number #{@phone_number}" )
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/call_forwards/index.html.haml b/app/views/call_forwards/index.html.haml
index 93d64f2..91b923a 100644
--- a/app/views/call_forwards/index.html.haml
+++ b/app/views/call_forwards/index.html.haml
@@ -1,4 +1,4 @@
-- title t("call_forwards.index.page_title")
+- content_for :title, t("call_forwards.index.page_title")
 
 - if @call_forwards.count > 0
   = render "index_core", :call_forwards => @call_forwards
diff --git a/app/views/call_forwards/new.html.haml b/app/views/call_forwards/new.html.haml
index 960a9e6..bb0c983 100644
--- a/app/views/call_forwards/new.html.haml
+++ b/app/views/call_forwards/new.html.haml
@@ -1,3 +1,3 @@
-- title t("call_forwards.new.page_title")
+- content_for :title, t("call_forwards.new.page_title")
 
 = render "form"
diff --git a/app/views/call_forwards/show.html.haml b/app/views/call_forwards/show.html.haml
index 6d1a0c6..c2187b1 100644
--- a/app/views/call_forwards/show.html.haml
+++ b/app/views/call_forwards/show.html.haml
@@ -1,4 +1,4 @@
-- title t("call_forwards.show.page_title")
+- content_for :title, t("call_forwards.show.page_title")
 
 %p
   %strong= t('call_forwards.show.phone_number_id') + ":"