From f5a512fe34fff50bcc7e96b57120d56a79ea47cb Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 30 Dec 2012 22:25:52 +0100 Subject: Set a couple of :autofocus => true to make the UI better. --- app/views/call_forwards/_form_core.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/call_forwards') diff --git a/app/views/call_forwards/_form_core.html.haml b/app/views/call_forwards/_form_core.html.haml index 3dadb68..f75181f 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 -- cgit v1.2.3 From ddb3dfa92ec0878240211cb2b7a8e125961b1360 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 23:01:16 +0100 Subject: Moved to GsParemeter.get and set defaults for a couple of validations. --- app/views/call_forwards/_form_core.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/call_forwards') diff --git a/app/views/call_forwards/_form_core.html.haml b/app/views/call_forwards/_form_core.html.haml index f75181f..b751fb3 100644 --- a/app/views/call_forwards/_form_core.html.haml +++ b/app/views/call_forwards/_form_core.html.haml @@ -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') -- cgit v1.2.3 From 18ed88c7e3c789366f6e5443dc4ee0bc981a4b88 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 20:18:16 +0100 Subject: Started the migration to Twitter Bootstrap. --- app/views/call_forwards/_index_core.html.haml | 2 +- app/views/call_forwards/edit.html.haml | 2 +- app/views/call_forwards/index.html.haml | 2 +- app/views/call_forwards/new.html.haml | 2 +- app/views/call_forwards/show.html.haml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views/call_forwards') diff --git a/app/views/call_forwards/_index_core.html.haml b/app/views/call_forwards/_index_core.html.haml index 7733855..286cdae 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') 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') + ":" -- cgit v1.2.3 From d8fe3b636cab1504cb5d3cb5dc57ed818749ccf5 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 21:30:48 +0100 Subject: Twitter Bootstrap stuff. --- app/views/call_forwards/_index_core.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/call_forwards') diff --git a/app/views/call_forwards/_index_core.html.haml b/app/views/call_forwards/_index_core.html.haml index 286cdae..27ad86f 100644 --- a/app/views/call_forwards/_index_core.html.haml +++ b/app/views/call_forwards/_index_core.html.haml @@ -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}") -- cgit v1.2.3