From 8de0e8215c9a2f5f8ce2dce71bf9cdca367ee94e Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 23:59:11 +0100 Subject: Use the same sip_account and phone structure for tenant as for user. --- app/views/tenants/_admin_area.html.haml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'app/views/tenants/_admin_area.html.haml') diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index 627f221..d634f73 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -1,4 +1,16 @@ -= render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => tenant} +-# SIP accounts +-# +%h2= t('sip_accounts.index.page_title') +- if tenant.sip_accounts.any? + = render "sip_accounts/index_core", :sip_accounts => tenant.sip_accounts += render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => SipAccount} + +-# Phones +-# +%h2= t('phones.index.page_title') +- if tenant.phones.any? + = render "phones/index_core", :phones => tenant.phones += render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Phone} = render :partial => 'users_table', :locals => {:tenant => tenant} -- 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 --- app/views/tenants/_admin_area.html.haml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'app/views/tenants/_admin_area.html.haml') diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index d634f73..1a05264 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -16,8 +16,13 @@ = render :partial => 'user_groups_table', :locals => {:tenant => tenant} -%h2 Features -= render :partial => 'tenants/table_of_functions', :locals => {:tenant => tenant} += render :partial => 'tenants/table_of_conferences', :locals => {:tenant => tenant} + += render :partial => 'tenants/table_of_callthroughs', :locals => {:tenant => tenant} + += render :partial => 'tenants/table_of_hunt_groups', :locals => {:tenant => tenant} + += render :partial => 'tenants/table_of_automatic_call_distributors', :locals => {:tenant => tenant} = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant} -- 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. --- app/views/tenants/_admin_area.html.haml | 85 ++++++++++++++------------------- 1 file changed, 37 insertions(+), 48 deletions(-) (limited to 'app/views/tenants/_admin_area.html.haml') diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index 1a05264..369a8ce 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -1,49 +1,38 @@ --# SIP accounts --# -%h2= t('sip_accounts.index.page_title') -- if tenant.sip_accounts.any? - = render "sip_accounts/index_core", :sip_accounts => tenant.sip_accounts -= render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => SipAccount} --# Phones --# -%h2= t('phones.index.page_title') -- if tenant.phones.any? - = render "phones/index_core", :phones => tenant.phones -= render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Phone} - -= render :partial => 'users_table', :locals => {:tenant => tenant} - -= render :partial => 'user_groups_table', :locals => {:tenant => tenant} - -= render :partial => 'tenants/table_of_conferences', :locals => {:tenant => tenant} - -= render :partial => 'tenants/table_of_callthroughs', :locals => {:tenant => tenant} - -= render :partial => 'tenants/table_of_hunt_groups', :locals => {:tenant => tenant} - -= render :partial => 'tenants/table_of_automatic_call_distributors', :locals => {:tenant => tenant} - -= render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant} - -%h2 Gemeinschaft Konfiguration -= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => tenant} - -%p - Das System kann - = PhoneModel.count - verschiedene Telefonmodelle von den folgenden Herstellern verwalten: - - Manufacturer.all.each do |manufacturer| - - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last - = succeed ', ' do - =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer) - - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last - = succeed ' und ' do - =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer) - - else - = succeed '.' do - =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer) - -= render :partial => 'call_routes', :locals => {:tenant => tenant} - -= render :partial => 'gateways', :locals => {:tenant => tenant, :gateways => gateways} \ No newline at end of file +.row + .span12 + = render :partial => 'tenants/users_table', :locals => {:tenant => tenant} + = render :partial => 'tenants/user_groups_table', :locals => {:tenant => tenant} + + = render :partial => 'tenants/table_of_sip_accounts', :locals => {:tenant => tenant} + = render :partial => 'tenants/table_of_phones', :locals => {:tenant => tenant} + + = render :partial => 'tenants/table_of_conferences', :locals => {:tenant => tenant} + = render :partial => 'tenants/table_of_callthroughs', :locals => {:tenant => tenant} + = render :partial => 'tenants/table_of_hunt_groups', :locals => {:tenant => tenant} + = render :partial => 'tenants/table_of_automatic_call_distributors', :locals => {:tenant => tenant} + + = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant} + + .well + %h2 Gemeinschaft Konfiguration + = render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => tenant} + + %p + Das System kann + = PhoneModel.count + verschiedene Telefonmodelle von den folgenden Herstellern verwalten: + - Manufacturer.all.each do |manufacturer| + - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last + = succeed ', ' do + =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer) + - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last + = succeed ' und ' do + =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer) + - else + = succeed '.' do + =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer) + + = render :partial => 'call_routes', :locals => {:tenant => tenant} + + = render :partial => 'gateways', :locals => {:tenant => tenant, :gateways => gateways} \ No newline at end of file -- cgit v1.2.3 From e84e82032813b7acd71f8073d00f57e1cd65eb7c Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 23 Jan 2013 17:36:33 +0100 Subject: Fixed I18n bug. --- app/views/tenants/_admin_area.html.haml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'app/views/tenants/_admin_area.html.haml') diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index 369a8ce..92614c8 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -1,19 +1,21 @@ .row .span12 - = render :partial => 'tenants/users_table', :locals => {:tenant => tenant} - = render :partial => 'tenants/user_groups_table', :locals => {:tenant => tenant} - = render :partial => 'tenants/table_of_sip_accounts', :locals => {:tenant => tenant} - = render :partial => 'tenants/table_of_phones', :locals => {:tenant => tenant} + - if SipAccount.any? + = render :partial => 'tenants/table_of_phones', :locals => {:tenant => tenant} - = render :partial => 'tenants/table_of_conferences', :locals => {:tenant => tenant} - = render :partial => 'tenants/table_of_callthroughs', :locals => {:tenant => tenant} - = render :partial => 'tenants/table_of_hunt_groups', :locals => {:tenant => tenant} - = render :partial => 'tenants/table_of_automatic_call_distributors', :locals => {:tenant => tenant} + - if SipAccount.any? || Gateway.any? + = render :partial => 'tenants/table_of_conferences', :locals => {:tenant => tenant} + = render :partial => 'tenants/table_of_callthroughs', :locals => {:tenant => tenant} + = render :partial => 'tenants/table_of_hunt_groups', :locals => {:tenant => tenant} + = render :partial => 'tenants/table_of_automatic_call_distributors', :locals => {:tenant => tenant} = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant} + = render :partial => 'tenants/users_table', :locals => {:tenant => tenant} + = render :partial => 'tenants/user_groups_table', :locals => {:tenant => tenant} + .well %h2 Gemeinschaft Konfiguration = render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => tenant} -- cgit v1.2.3 From 517dbc54c595adca221249545d0e7c0815df3195 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 24 Jan 2013 13:19:29 +0100 Subject: UI --- app/views/tenants/_admin_area.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/tenants/_admin_area.html.haml') diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index 92614c8..28a8273 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -11,11 +11,11 @@ = render :partial => 'tenants/table_of_hunt_groups', :locals => {:tenant => tenant} = render :partial => 'tenants/table_of_automatic_call_distributors', :locals => {:tenant => tenant} - = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant} - = render :partial => 'tenants/users_table', :locals => {:tenant => tenant} = render :partial => 'tenants/user_groups_table', :locals => {:tenant => tenant} + = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant} + .well %h2 Gemeinschaft Konfiguration = render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => tenant} -- cgit v1.2.3