From 8fdc1332bbff9c23400459dc7018cba147279cc5 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 21:21:49 +0100 Subject: Added %thead and %tbody to the tables. --- .../_index_core.html.haml | 69 +++++++++++----------- 1 file changed, 35 insertions(+), 34 deletions(-) (limited to 'app/views/automatic_call_distributors') diff --git a/app/views/automatic_call_distributors/_index_core.html.haml b/app/views/automatic_call_distributors/_index_core.html.haml index 50908f4..4878b56 100644 --- a/app/views/automatic_call_distributors/_index_core.html.haml +++ b/app/views/automatic_call_distributors/_index_core.html.haml @@ -1,39 +1,40 @@ %table{:class => 'table table-striped'} - %tr - %th= t('automatic_call_distributors.index.name') - %th= t('automatic_call_distributors.index.strategy') - %th= t('automatic_call_distributors.index.max_callers') - %th= t('automatic_call_distributors.index.agent_timeout') - %th= t('automatic_call_distributors.index.retry_timeout') - %th= t('automatic_call_distributors.index.join') - %th= t('automatic_call_distributors.index.leave') - %th= t('automatic_call_distributors.index.phone_numbers') - %th= t('automatic_call_distributors.index.acd_agents') - - - - for automatic_call_distributor in automatic_call_distributors + %thead %tr - %td= automatic_call_distributor.name - %td= t("automatic_call_distributors.strategies.#{automatic_call_distributor.strategy}") - %td= automatic_call_distributor.max_callers - %td= automatic_call_distributor.agent_timeout - %td= automatic_call_distributor.retry_timeout - %td= t("automatic_call_distributors.join_on.#{automatic_call_distributor.join}") - %td= t("automatic_call_distributors.leave_on.#{automatic_call_distributor.leave}") + %th= t('automatic_call_distributors.index.name') + %th= t('automatic_call_distributors.index.strategy') + %th= t('automatic_call_distributors.index.max_callers') + %th= t('automatic_call_distributors.index.agent_timeout') + %th= t('automatic_call_distributors.index.retry_timeout') + %th= t('automatic_call_distributors.index.join') + %th= t('automatic_call_distributors.index.leave') + %th= t('automatic_call_distributors.index.phone_numbers') + %th= t('automatic_call_distributors.index.acd_agents') + + %tbody + - for automatic_call_distributor in automatic_call_distributors + %tr + %td= automatic_call_distributor.name + %td= t("automatic_call_distributors.strategies.#{automatic_call_distributor.strategy}") + %td= automatic_call_distributor.max_callers + %td= automatic_call_distributor.agent_timeout + %td= automatic_call_distributor.retry_timeout + %td= t("automatic_call_distributors.join_on.#{automatic_call_distributor.join}") + %td= t("automatic_call_distributors.leave_on.#{automatic_call_distributor.leave}") - %td - - if automatic_call_distributor.phone_numbers.count > 0 - = render 'phone_numbers/listing', :phone_numbers => automatic_call_distributor.phone_numbers - %br - = render :partial => 'shared/create_link', :locals => {:parent => automatic_call_distributor, :child_class => PhoneNumber, :short_link => true} + %td + - if automatic_call_distributor.phone_numbers.count > 0 + = render 'phone_numbers/listing', :phone_numbers => automatic_call_distributor.phone_numbers + %br + = render :partial => 'shared/create_link', :locals => {:parent => automatic_call_distributor, :child_class => PhoneNumber, :short_link => true} - %td - - if automatic_call_distributor.acd_agents.count > 3 - = link_to automatic_call_distributor.acd_agents.count, automatic_call_distributor_acd_agents_path(automatic_call_distributor) - %br - - elsif automatic_call_distributor.acd_agents.count > 0 - = render 'acd_agents/listing', :acd_agents => automatic_call_distributor.acd_agents - %br - = render :partial => 'shared/create_link', :locals => {:parent => automatic_call_distributor, :child_class => AcdAgent, :short_link => true} + %td + - if automatic_call_distributor.acd_agents.count > 3 + = link_to automatic_call_distributor.acd_agents.count, automatic_call_distributor_acd_agents_path(automatic_call_distributor) + %br + - elsif automatic_call_distributor.acd_agents.count > 0 + = render 'acd_agents/listing', :acd_agents => automatic_call_distributor.acd_agents + %br + = render :partial => 'shared/create_link', :locals => {:parent => automatic_call_distributor, :child_class => AcdAgent, :short_link => true} - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => automatic_call_distributor.automatic_call_distributorable, :child => automatic_call_distributor} \ No newline at end of file + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => automatic_call_distributor.automatic_call_distributorable, :child => automatic_call_distributor} \ No newline at end of file -- cgit v1.2.3 From e4da52d673f12673614f7f9303ad384c77dbc37c Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 23 Jan 2013 10:40:33 +0100 Subject: Improved UI for tenant#show --- .../_index_core.html.haml | 59 ++++++++++++---------- 1 file changed, 33 insertions(+), 26 deletions(-) (limited to 'app/views/automatic_call_distributors') diff --git a/app/views/automatic_call_distributors/_index_core.html.haml b/app/views/automatic_call_distributors/_index_core.html.haml index 4878b56..85790aa 100644 --- a/app/views/automatic_call_distributors/_index_core.html.haml +++ b/app/views/automatic_call_distributors/_index_core.html.haml @@ -2,39 +2,46 @@ %thead %tr %th= t('automatic_call_distributors.index.name') - %th= t('automatic_call_distributors.index.strategy') - %th= t('automatic_call_distributors.index.max_callers') - %th= t('automatic_call_distributors.index.agent_timeout') - %th= t('automatic_call_distributors.index.retry_timeout') - %th= t('automatic_call_distributors.index.join') - %th= t('automatic_call_distributors.index.leave') + %th + %span.hidden-phone + = t('automatic_call_distributors.index.strategy') %th= t('automatic_call_distributors.index.phone_numbers') - %th= t('automatic_call_distributors.index.acd_agents') + %th + %span.hidden-phone + = t('automatic_call_distributors.index.max_callers') + %th + %span.hidden-phone + = t('automatic_call_distributors.index.agent_timeout') + %th + %span.hidden-phone + = t('automatic_call_distributors.index.acd_agents') %tbody - for automatic_call_distributor in automatic_call_distributors %tr - %td= automatic_call_distributor.name - %td= t("automatic_call_distributors.strategies.#{automatic_call_distributor.strategy}") - %td= automatic_call_distributor.max_callers - %td= automatic_call_distributor.agent_timeout - %td= automatic_call_distributor.retry_timeout - %td= t("automatic_call_distributors.join_on.#{automatic_call_distributor.join}") - %td= t("automatic_call_distributors.leave_on.#{automatic_call_distributor.leave}") - %td - - if automatic_call_distributor.phone_numbers.count > 0 + %span.hidden-phone + = automatic_call_distributor.name + %span.visible-phone + = truncate(automatic_call_distributor.name, :length => 8) + %td + %span.hidden-phone + = t("automatic_call_distributors.strategies.#{automatic_call_distributor.strategy}") + %td + - if automatic_call_distributor.phone_numbers.any? = render 'phone_numbers/listing', :phone_numbers => automatic_call_distributor.phone_numbers - %br - = render :partial => 'shared/create_link', :locals => {:parent => automatic_call_distributor, :child_class => PhoneNumber, :short_link => true} - %td - - if automatic_call_distributor.acd_agents.count > 3 - = link_to automatic_call_distributor.acd_agents.count, automatic_call_distributor_acd_agents_path(automatic_call_distributor) - %br - - elsif automatic_call_distributor.acd_agents.count > 0 - = render 'acd_agents/listing', :acd_agents => automatic_call_distributor.acd_agents - %br - = render :partial => 'shared/create_link', :locals => {:parent => automatic_call_distributor, :child_class => AcdAgent, :short_link => true} + %span.hidden-phone + = automatic_call_distributor.max_callers + %td + %span.hidden-phone + = automatic_call_distributor.agent_timeout + %td + %span.hidden-phone + - if automatic_call_distributor.acd_agents.count > 3 + = link_to automatic_call_distributor.acd_agents.count, automatic_call_distributor_acd_agents_path(automatic_call_distributor) + %br + - elsif automatic_call_distributor.acd_agents.any? + = render 'acd_agents/listing', :acd_agents => automatic_call_distributor.acd_agents =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => automatic_call_distributor.automatic_call_distributorable, :child => automatic_call_distributor} \ No newline at end of file -- cgit v1.2.3 From d14b99c32f0c6a88298c9bed1d91b7fec0fb04b5 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 23 Jan 2013 11:27:21 +0100 Subject: UI improvements. --- .../_index_core.html.haml | 12 --- .../automatic_call_distributors/show.html.haml | 95 ++++++++++++---------- 2 files changed, 54 insertions(+), 53 deletions(-) (limited to 'app/views/automatic_call_distributors') diff --git a/app/views/automatic_call_distributors/_index_core.html.haml b/app/views/automatic_call_distributors/_index_core.html.haml index 85790aa..3634ec4 100644 --- a/app/views/automatic_call_distributors/_index_core.html.haml +++ b/app/views/automatic_call_distributors/_index_core.html.haml @@ -6,12 +6,6 @@ %span.hidden-phone = t('automatic_call_distributors.index.strategy') %th= t('automatic_call_distributors.index.phone_numbers') - %th - %span.hidden-phone - = t('automatic_call_distributors.index.max_callers') - %th - %span.hidden-phone - = t('automatic_call_distributors.index.agent_timeout') %th %span.hidden-phone = t('automatic_call_distributors.index.acd_agents') @@ -30,12 +24,6 @@ %td - if automatic_call_distributor.phone_numbers.any? = render 'phone_numbers/listing', :phone_numbers => automatic_call_distributor.phone_numbers - %td - %span.hidden-phone - = automatic_call_distributor.max_callers - %td - %span.hidden-phone - = automatic_call_distributor.agent_timeout %td %span.hidden-phone - if automatic_call_distributor.acd_agents.count > 3 diff --git a/app/views/automatic_call_distributors/show.html.haml b/app/views/automatic_call_distributors/show.html.haml index c29f2df..b3eae2c 100644 --- a/app/views/automatic_call_distributors/show.html.haml +++ b/app/views/automatic_call_distributors/show.html.haml @@ -1,47 +1,60 @@ - content_for :title, t("automatic_call_distributors.show.page_title") %table{:class => 'table table-striped'} - %tr - %th= t('automatic_call_distributors.show.name') + ":" - %td= @automatic_call_distributor.name - %tr - %th= t('automatic_call_distributors.show.strategy') + ":" - %td= t("automatic_call_distributors.strategies.#{@automatic_call_distributor.strategy}") - %tr - %th= t('automatic_call_distributors.show.max_callers') + ":" - %td= @automatic_call_distributor.max_callers - %tr - %th= t('automatic_call_distributors.show.agent_timeout') + ":" - %td= @automatic_call_distributor.agent_timeout - %tr - %th= t('automatic_call_distributors.show.retry_timeout') + ":" - %td= @automatic_call_distributor.retry_timeout - %tr - %th= t('automatic_call_distributors.show.join') + ":" - %td= t("automatic_call_distributors.join_on.#{@automatic_call_distributor.join}") - %tr - %th= t('automatic_call_distributors.show.leave') + ":" - %td= t("automatic_call_distributors.leave_on.#{@automatic_call_distributor.leave}") - - %tr - %th= t('automatic_call_distributors.show.announce_position') + ":" - %td= @automatic_call_distributor.announce_position - - %tr - %th= t('automatic_call_distributors.show.announce_call_agents') + ":" - %td= @automatic_call_distributor.announce_call_agents - - %tr - %th= t('automatic_call_distributors.show.greeting') + ":" - %td= @automatic_call_distributor.greeting - - %tr - %th= t('automatic_call_distributors.show.goodbye') + ":" - %td= @automatic_call_distributor.goodbye - - %tr - %th= t('automatic_call_distributors.show.music') + ":" - %td= @automatic_call_distributor.music + %tbody + %tr + %td + %strong= t('automatic_call_distributors.show.name') + ":" + %td= @automatic_call_distributor.name + %tr + %td + %strong= t('automatic_call_distributors.show.strategy') + ":" + %td= t("automatic_call_distributors.strategies.#{@automatic_call_distributor.strategy}") + %tr + %td + %strong= t('automatic_call_distributors.show.max_callers') + ":" + %td= @automatic_call_distributor.max_callers + %tr + %td + %strong= t('automatic_call_distributors.show.agent_timeout') + ":" + %td= @automatic_call_distributor.agent_timeout + %tr + %td + %strong= t('automatic_call_distributors.show.retry_timeout') + ":" + %td= @automatic_call_distributor.retry_timeout + %tr + %td + %strong= t('automatic_call_distributors.show.join') + ":" + %td= t("automatic_call_distributors.join_on.#{@automatic_call_distributor.join}") + %tr + %td + %strong= t('automatic_call_distributors.show.leave') + ":" + %td= t("automatic_call_distributors.leave_on.#{@automatic_call_distributor.leave}") + + %tr + %td + %strong= t('automatic_call_distributors.show.announce_position') + ":" + %td= @automatic_call_distributor.announce_position + + %tr + %td + %strong= t('automatic_call_distributors.show.announce_call_agents') + ":" + %td= @automatic_call_distributor.announce_call_agents + + %tr + %td + %strong= t('automatic_call_distributors.show.greeting') + ":" + %td= @automatic_call_distributor.greeting + + %tr + %td + %strong= t('automatic_call_distributors.show.goodbye') + ":" + %td= @automatic_call_distributor.goodbye + + %tr + %td + %strong= t('automatic_call_distributors.show.music') + ":" + %td= @automatic_call_distributor.music = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @automatic_call_distributor.automatic_call_distributorable, :child => @automatic_call_distributor } -- cgit v1.2.3 From 680073d4cf7619bddfb7f79ea9e538a33d9dcdee Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 26 Jan 2013 20:11:45 +0100 Subject: Refactoring --- app/views/automatic_call_distributors/_index_core.html.haml | 2 +- app/views/automatic_call_distributors/show.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/automatic_call_distributors') diff --git a/app/views/automatic_call_distributors/_index_core.html.haml b/app/views/automatic_call_distributors/_index_core.html.haml index 3634ec4..e264c29 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{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('automatic_call_distributors.index.name') diff --git a/app/views/automatic_call_distributors/show.html.haml b/app/views/automatic_call_distributors/show.html.haml index b3eae2c..a461652 100644 --- a/app/views/automatic_call_distributors/show.html.haml +++ b/app/views/automatic_call_distributors/show.html.haml @@ -1,6 +1,6 @@ - content_for :title, t("automatic_call_distributors.show.page_title") -%table{:class => 'table table-striped'} +%table.table.table-striped %tbody %tr %td -- cgit v1.2.3