diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 15:33:06 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 15:33:06 +0100 |
| commit | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (patch) | |
| tree | 6c88289c9f99be0af8635636fcdf64102090e5ec /app/views/automatic_call_distributors | |
| parent | 5ad8203ce4f1bfea997960d0b52c626dea24b944 (diff) | |
| parent | 6f69c1a85055ec7c2515719d79d2a7a4e60cec50 (diff) | |
Merge branch 'develop'5.1-beta1
Diffstat (limited to 'app/views/automatic_call_distributors')
6 files changed, 9 insertions, 9 deletions
diff --git a/app/views/automatic_call_distributors/_form_core.html.haml b/app/views/automatic_call_distributors/_form_core.html.haml index 77a38a6..d315ff3 100644 --- a/app/views/automatic_call_distributors/_form_core.html.haml +++ b/app/views/automatic_call_distributors/_form_core.html.haml @@ -1,5 +1,5 @@ .inputs - = f.input :name, :label => t('automatic_call_distributors.form.name.label'), :hint => conditional_hint('automatic_call_distributors.form.name.hint') + = f.input :name, :label => t('automatic_call_distributors.form.name.label'), :hint => conditional_hint('automatic_call_distributors.form.name.hint'), :autofocus => true = f.input :strategy, :label => t('automatic_call_distributors.form.strategy.label'), :hint => conditional_hint('automatic_call_distributors.form.strategy.hint'), :include_blank => false, :as => :select, :collection => strategies = f.input :max_callers, :label => t('automatic_call_distributors.form.max_callers.label'), :hint => conditional_hint('automatic_call_distributors.form.max_callers.hint') = f.input :agent_timeout, :label => t('automatic_call_distributors.form.agent_timeout.label'), :hint => conditional_hint('automatic_call_distributors.form.agent_timeout.hint') diff --git a/app/views/automatic_call_distributors/_index_core.html.haml b/app/views/automatic_call_distributors/_index_core.html.haml index c31a648..50908f4 100644 --- a/app/views/automatic_call_distributors/_index_core.html.haml +++ b/app/views/automatic_call_distributors/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('automatic_call_distributors.index.name') %th= t('automatic_call_distributors.index.strategy') @@ -10,9 +10,9 @@ %th= t('automatic_call_distributors.index.phone_numbers') %th= t('automatic_call_distributors.index.acd_agents') - - reset_cycle + - for automatic_call_distributor in automatic_call_distributors - %tr{:class => cycle('odd', 'even')} + %tr %td= automatic_call_distributor.name %td= t("automatic_call_distributors.strategies.#{automatic_call_distributor.strategy}") %td= automatic_call_distributor.max_callers diff --git a/app/views/automatic_call_distributors/edit.html.haml b/app/views/automatic_call_distributors/edit.html.haml index 28cba74..c776945 100644 --- a/app/views/automatic_call_distributors/edit.html.haml +++ b/app/views/automatic_call_distributors/edit.html.haml @@ -1,3 +1,3 @@ -- title t("automatic_call_distributors.edit.page_title") +- content_for :title, t("automatic_call_distributors.edit.page_title") = render "form"
\ No newline at end of file diff --git a/app/views/automatic_call_distributors/index.html.haml b/app/views/automatic_call_distributors/index.html.haml index f3f8b2b..4f2d040 100644 --- a/app/views/automatic_call_distributors/index.html.haml +++ b/app/views/automatic_call_distributors/index.html.haml @@ -1,4 +1,4 @@ -- title t("automatic_call_distributors.index.page_title") +- content_for :title, t("automatic_call_distributors.index.page_title") - if @automatic_call_distributors && @automatic_call_distributors.count > 0 = render "index_core", :automatic_call_distributors => @automatic_call_distributors diff --git a/app/views/automatic_call_distributors/new.html.haml b/app/views/automatic_call_distributors/new.html.haml index 96a2d93..72817a7 100644 --- a/app/views/automatic_call_distributors/new.html.haml +++ b/app/views/automatic_call_distributors/new.html.haml @@ -1,3 +1,3 @@ -- title t("automatic_call_distributors.new.page_title") +- content_for :title, t("automatic_call_distributors.new.page_title") = render "form"
\ No newline at end of file diff --git a/app/views/automatic_call_distributors/show.html.haml b/app/views/automatic_call_distributors/show.html.haml index 53ce127..c29f2df 100644 --- a/app/views/automatic_call_distributors/show.html.haml +++ b/app/views/automatic_call_distributors/show.html.haml @@ -1,6 +1,6 @@ -- title t("automatic_call_distributors.show.page_title") +- content_for :title, t("automatic_call_distributors.show.page_title") -%table +%table{:class => 'table table-striped'} %tr %th= t('automatic_call_distributors.show.name') + ":" %td= @automatic_call_distributor.name |