Merge branch 'develop'5.1-beta1

6 files changed, 9 insertions, 9 deletions

diff --git a/app/views/call_forwards/_form_core.html.haml b/app/views/call_forwards/_form_core.html.haml
index 3dadb68..b751fb3 100644
--- a/app/views/call_forwards/_form_core.html.haml
+++ b/app/views/call_forwards/_form_core.html.haml
@@ -1,5 +1,5 @@
 .inputs
-  = f.input :call_forward_case_id, :as => :select, :collection => @available_call_forward_cases.map {|x| [I18n.t("call_forward_cases.#{x.value}"), x.id] }, :label => t('call_forwards.form.call_forward_case_id.label'), :hint => conditional_hint('call_forwards.form.call_forward_case_id.hint'), :include_blank => false
+  = f.input :call_forward_case_id, :as => :select, :collection => @available_call_forward_cases.map {|x| [I18n.t("call_forward_cases.#{x.value}"), x.id] }, :label => t('call_forwards.form.call_forward_case_id.label'), :hint => conditional_hint('call_forwards.form.call_forward_case_id.hint'), :include_blank => false, :autofocus => true
   = f.input :timeout, :label => t('call_forwards.form.timeout.label'), :hint => conditional_hint('call_forwards.form.timeout.hint')
   
   = f.input :call_forwarding_destination , :as => :select, :collection => @call_forwarding_destinations, :label => t('call_forwards.form.call_forwarding_destination.label'), :hint => conditional_hint('call_forwards.form.call_forwarding_destination.hint'), :include_blank => false
@@ -9,7 +9,7 @@
 
   = f.input :source, :label => t('call_forwards.form.source.label'), :hint => conditional_hint('call_forwards.form.source.hint')
   - if GuiFunction.display?('depth_field_in_call_forward_form', current_user)
-    = f.input :depth, :collection => 1..MAX_CALL_FORWARD_DEPTH, :label => t('call_forwards.form.depth.label'), :hint => conditional_hint('call_forwards.form.depth.hint')
+    = f.input :depth, :collection => 1..GsParameter.get('MAX_CALL_FORWARD_DEPTH'), :label => t('call_forwards.form.depth.label'), :hint => conditional_hint('call_forwards.form.depth.hint')
   - else
     = f.hidden_field :depth
   = f.input :active, :label => t('call_forwards.form.active.label'), :hint => conditional_hint('call_forwards.form.active.hint')
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') + ":"