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. --- .../access_authorizations/_index_core.html.haml | 39 +++---- app/views/acd_agents/_index_core.html.haml | 31 +++--- app/views/acd_callers/_index_core.html.haml | 39 +++---- app/views/addresses/_index_core.html.haml | 43 ++++---- .../_index_core.html.haml | 69 ++++++------ app/views/call_forwards/_index_core.html.haml | 55 +++++----- app/views/call_histories/_index_core.html.haml | 107 +++++++++--------- app/views/call_routes/_index_core.html.haml | 39 +++---- app/views/calls/_index_core.html.haml | 15 +-- app/views/callthroughs/_index_core.html.haml | 29 ++--- .../conference_invitees/_index_core.html.haml | 31 +++--- app/views/conferences/_index_core.html.haml | 93 ++++++++-------- app/views/fax_accounts/_index_core.html.haml | 61 ++++++----- app/views/fax_documents/_index_core.html.haml | 61 ++++++----- .../_index_core.html.haml | 21 ++-- app/views/gateway_parameters/_index_core.html.haml | 23 ++-- app/views/gateway_settings/_index_core.html.haml | 23 ++-- app/views/gateways/_index_core.html.haml | 33 +++--- .../_index_core.html.haml | 31 +++--- app/views/gs_nodes/_index_core.html.haml | 35 +++--- app/views/gs_parameters/_index_core.html.haml | 29 ++--- app/views/gui_functions/_index_core.html.haml | 47 ++++---- app/views/hunt_group_members/_index_core.html.haml | 35 +++--- app/views/hunt_groups/_index_core.html.haml | 55 +++++----- app/views/manufacturers/_index_core.html.haml | 33 +++--- app/views/phone_books/_index_core.html.haml | 29 ++--- app/views/phone_models/_index_core.html.haml | 35 +++--- .../phone_number_ranges/_index_core.html.haml | 37 ++++--- app/views/phone_numbers/_index_core.html.haml | 24 ++-- app/views/phone_sip_accounts/_index_core.html.haml | 23 ++-- app/views/phones/_index_core.html.haml | 27 ++--- app/views/phones/show.html.haml | 122 ++++++++++++--------- app/views/ringtones/_index_core.html.haml | 19 ++-- app/views/route_elements/_index_core.html.haml | 35 +++--- app/views/shared/_show_edit_destroy_part.html.haml | 8 +- app/views/sip_accounts/_index_core.html.haml | 47 ++++---- app/views/sip_domains/_index_core.html.haml | 19 ++-- app/views/softkeys/_index_core.html.haml | 25 +++-- app/views/system_messages/_index_core.html.haml | 19 ++-- app/views/tenants/_gs_parameter_table.html.haml | 38 +++---- app/views/tenants/_index_core.html.haml | 31 +++--- app/views/tenants/_table_of_functions.html.haml | 103 ++++++++--------- .../user_group_memberships/_index_core.html.haml | 23 ++-- app/views/user_groups/_index_core.html.haml | 43 ++++---- app/views/users/_index_core.html.haml | 51 ++++----- app/views/whitelists/_index_core.html.haml | 25 +++-- 46 files changed, 961 insertions(+), 899 deletions(-) diff --git a/app/views/access_authorizations/_index_core.html.haml b/app/views/access_authorizations/_index_core.html.haml index 7469a1d..a36317a 100644 --- a/app/views/access_authorizations/_index_core.html.haml +++ b/app/views/access_authorizations/_index_core.html.haml @@ -1,21 +1,22 @@ %table{:class => 'table table-striped'} - %tr - %th= t('access_authorizations.index.name') - %th= t('access_authorizations.index.login') - %th= t('access_authorizations.index.pin') - %th= t('callthroughs.index.phone_numbers') - - - - for access_authorization in access_authorizations - - show_path_method = method( :"#{access_authorization.access_authorizationable.class.name.underscore}_access_authorization_path" ) - - edit_path_method = method( :"edit_#{access_authorization.access_authorizationable.class.name.underscore}_access_authorization_path" ) + %thead %tr - %td= access_authorization.name - %td= access_authorization.login - %td= access_authorization.pin - %td - =render 'phone_numbers/listing', :phone_numbers => access_authorization.phone_numbers - - if access_authorization.phone_numbers.count > 0 - %br - = link_to t('phone_numbers.index.actions.create'), new_access_authorization_phone_number_path(access_authorization) - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => access_authorization.access_authorizationable, :child => access_authorization} \ No newline at end of file + %th= t('access_authorizations.index.name') + %th= t('access_authorizations.index.login') + %th= t('access_authorizations.index.pin') + %th= t('callthroughs.index.phone_numbers') + + %tbody + - for access_authorization in access_authorizations + - show_path_method = method( :"#{access_authorization.access_authorizationable.class.name.underscore}_access_authorization_path" ) + - edit_path_method = method( :"edit_#{access_authorization.access_authorizationable.class.name.underscore}_access_authorization_path" ) + %tr + %td= access_authorization.name + %td= access_authorization.login + %td= access_authorization.pin + %td + =render 'phone_numbers/listing', :phone_numbers => access_authorization.phone_numbers + - if access_authorization.phone_numbers.count > 0 + %br + = link_to t('phone_numbers.index.actions.create'), new_access_authorization_phone_number_path(access_authorization) + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => access_authorization.access_authorizationable, :child => access_authorization} \ No newline at end of file diff --git a/app/views/acd_agents/_index_core.html.haml b/app/views/acd_agents/_index_core.html.haml index c082fd1..e3d6f0a 100644 --- a/app/views/acd_agents/_index_core.html.haml +++ b/app/views/acd_agents/_index_core.html.haml @@ -1,18 +1,19 @@ %table{:class => 'table table-striped'} - %tr - %th= t('acd_agents.index.name') - %th= t('acd_agents.index.status') - %th= t('acd_agents.index.last_call') - %th= t('acd_agents.index.calls_answered') - %th= t('acd_agents.index.destination') - - - - for acd_agent in acd_agents + %thead %tr - %td= acd_agent.name - %td= acd_agent.status - %td= acd_agent.last_call - %td= acd_agent.calls_answered - %td= acd_agent.destination - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => acd_agent.automatic_call_distributor, :child => acd_agent} + %th= t('acd_agents.index.name') + %th= t('acd_agents.index.status') + %th= t('acd_agents.index.last_call') + %th= t('acd_agents.index.calls_answered') + %th= t('acd_agents.index.destination') + + %tbody + - for acd_agent in acd_agents + %tr + %td= acd_agent.name + %td= acd_agent.status + %td= acd_agent.last_call + %td= acd_agent.calls_answered + %td= acd_agent.destination + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => acd_agent.automatic_call_distributor, :child => acd_agent} \ No newline at end of file diff --git a/app/views/acd_callers/_index_core.html.haml b/app/views/acd_callers/_index_core.html.haml index 79aa974..0a2e505 100644 --- a/app/views/acd_callers/_index_core.html.haml +++ b/app/views/acd_callers/_index_core.html.haml @@ -1,21 +1,22 @@ %table{:class => 'table table-striped'} - %tr - %th= t('acd_callers.index.channel_uuid') - %th= t('acd_callers.index.automatic_call_distributor_id') - %th= t('acd_callers.index.status') - %th= t('acd_callers.index.enter_time') - %th= t('acd_callers.index.agent_answer_time') - %th= t('acd_callers.index.callback_number') - %th= t('acd_callers.index.callback_attempts') - - - - for acd_caller in acd_callers + %thead %tr - %td= acd_caller.channel_uuid - %td= acd_caller.automatic_call_distributor_id - %td= acd_caller.status - %td= acd_caller.enter_time - %td= acd_caller.agent_answer_time - %td= acd_caller.callback_number - %td= acd_caller.callback_attempts - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => acd_caller} \ No newline at end of file + %th= t('acd_callers.index.channel_uuid') + %th= t('acd_callers.index.automatic_call_distributor_id') + %th= t('acd_callers.index.status') + %th= t('acd_callers.index.enter_time') + %th= t('acd_callers.index.agent_answer_time') + %th= t('acd_callers.index.callback_number') + %th= t('acd_callers.index.callback_attempts') + + %tbody + - for acd_caller in acd_callers + %tr + %td= acd_caller.channel_uuid + %td= acd_caller.automatic_call_distributor_id + %td= acd_caller.status + %td= acd_caller.enter_time + %td= acd_caller.agent_answer_time + %td= acd_caller.callback_number + %td= acd_caller.callback_attempts + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => acd_caller} \ No newline at end of file diff --git a/app/views/addresses/_index_core.html.haml b/app/views/addresses/_index_core.html.haml index 3645009..8b9e0c2 100644 --- a/app/views/addresses/_index_core.html.haml +++ b/app/views/addresses/_index_core.html.haml @@ -1,23 +1,24 @@ %table{:class => 'table table-striped'} - %tr - %th= t('addresses.index.phone_book_entry_id') - %th= t('addresses.index.line1') - %th= t('addresses.index.line2') - %th= t('addresses.index.street') - %th= t('addresses.index.zip_code') - %th= t('addresses.index.city') - %th= t('addresses.index.country_id') - %th= t('addresses.index.position') - - - - for address in addresses + %thead %tr - %td= address.phone_book_entry_id - %td= address.line1 - %td= address.line2 - %td= address.street - %td= address.zip_code - %td= address.city - %td= address.country_id - %td= address.position - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => address.phone_book_entry, :child => address} \ No newline at end of file + %th= t('addresses.index.phone_book_entry_id') + %th= t('addresses.index.line1') + %th= t('addresses.index.line2') + %th= t('addresses.index.street') + %th= t('addresses.index.zip_code') + %th= t('addresses.index.city') + %th= t('addresses.index.country_id') + %th= t('addresses.index.position') + + %tbody + - for address in addresses + %tr + %td= address.phone_book_entry_id + %td= address.line1 + %td= address.line2 + %td= address.street + %td= address.zip_code + %td= address.city + %td= address.country_id + %td= address.position + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => address.phone_book_entry, :child => address} \ No newline at end of file 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 diff --git a/app/views/call_forwards/_index_core.html.haml b/app/views/call_forwards/_index_core.html.haml index 27ad86f..7a1672f 100644 --- a/app/views/call_forwards/_index_core.html.haml +++ b/app/views/call_forwards/_index_core.html.haml @@ -1,31 +1,32 @@ %table{:class => 'table table-striped'} - %tr - - if !@phone_number - %th= t('call_forwards.index.phone_number_id') - %th= t('call_forwards.index.call_forward_case_id') - %th= t('call_forwards.index.timeout') - %th= t('call_forwards.index.destination') - %th= t('call_forwards.index.source') - - if GuiFunction.display?('depth_field_value_in_index_table', current_user) - %th= t('call_forwards.index.depth') - %th= t('call_forwards.index.active') - - - - for call_forward in call_forwards + %thead %tr - if !@phone_number - %td= call_forward.phone_number - %td= t("call_forward_cases.#{call_forward.call_forward_case.value}") - %td= call_forward.timeout - %td - = call_forward.destination - - if call_forward.call_forwardable_type - %br - = call_forward.call_forwardable_type - - if call_forward.call_forwardable - = ": #{call_forward.call_forwardable}" - %td= call_forward.source + %th= t('call_forwards.index.phone_number_id') + %th= t('call_forwards.index.call_forward_case_id') + %th= t('call_forwards.index.timeout') + %th= t('call_forwards.index.destination') + %th= t('call_forwards.index.source') - if GuiFunction.display?('depth_field_value_in_index_table', current_user) - %td= call_forward.depth - %td= call_forward.active - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => call_forward.phone_number, :child => call_forward} \ No newline at end of file + %th= t('call_forwards.index.depth') + %th= t('call_forwards.index.active') + + %tbody + - for call_forward in call_forwards + %tr + - if !@phone_number + %td= call_forward.phone_number + %td= t("call_forward_cases.#{call_forward.call_forward_case.value}") + %td= call_forward.timeout + %td + = call_forward.destination + - if call_forward.call_forwardable_type + %br + = call_forward.call_forwardable_type + - if call_forward.call_forwardable + = ": #{call_forward.call_forwardable}" + %td= call_forward.source + - if GuiFunction.display?('depth_field_value_in_index_table', current_user) + %td= call_forward.depth + %td= call_forward.active + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => call_forward.phone_number, :child => call_forward} \ No newline at end of file diff --git a/app/views/call_histories/_index_core.html.haml b/app/views/call_histories/_index_core.html.haml index f9d2150..411c8c0 100644 --- a/app/views/call_histories/_index_core.html.haml +++ b/app/views/call_histories/_index_core.html.haml @@ -1,58 +1,59 @@ = render :partial => "call_histories/navigation" %table{:class => 'table table-striped'} - - for call_history in call_histories - - phone_number = call_history.display_number - - voicemail_message = call_history.voicemail_message - - if phone_number - - phone_book_entry = call_history.phone_book_entry_by_number(phone_number) - %tr.call-history-entry - %td.thumbnail - - image = call_history.display_image(:small, phone_book_entry) - - if image - = image_tag(image, :itemprop => 'image') - %td.time - - if voicemail_message - .voicemail-message - %a{:href => sip_account_voicemail_messages_path(@sip_account, :anchor => "message_#{voicemail_message.id}")} - = image_tag('icons/gs_envelope_16x.png', :class => 'display') + %tbody + - for call_history in call_histories + - phone_number = call_history.display_number + - voicemail_message = call_history.voicemail_message + - if phone_number + - phone_book_entry = call_history.phone_book_entry_by_number(phone_number) + %tr.call-history-entry + %td.thumbnail + - image = call_history.display_image(:small, phone_book_entry) + - if image + = image_tag(image, :itemprop => 'image') + %td.time + - if voicemail_message + .voicemail-message + %a{:href => sip_account_voicemail_messages_path(@sip_account, :anchor => "message_#{voicemail_message.id}")} + = image_tag('icons/gs_envelope_16x.png', :class => 'display') + = call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - elsif call_history.entry_type == 'forwarded' + .call-forwarded= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - if call_history.callee_account_type.to_s.downcase == 'voicemail' + = t("call_histories.index.voicemail") + - else + = call_history.destination_number + - elsif call_history.entry_type == 'dialed' + .call-placed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - elsif call_history.entry_type == 'received' + .call-received= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - elsif call_history.entry_type == 'missed' + .call-missed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) + - else + .call-unknown + = t("call_histories.index.#{call_history.entry_type}") = call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - elsif call_history.entry_type == 'forwarded' - .call-forwarded= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - if call_history.callee_account_type.to_s.downcase == 'voicemail' - = t("call_histories.index.voicemail") + - if call_history.forwarding_service && call_history.entry_type != 'forwarded' + = t("call_histories.index.forwarded_by") + = call_history.display_auth_account_name + %td.user + - display_name = call_history.display_name + - if display_name.blank? + - display_name = phone_book_entry.to_s + - if phone_book_entry + %a.name{:href => phone_book_phone_book_entry_path(phone_book_entry.phone_book, phone_book_entry), :itemprop => "name"}= display_name - else - = call_history.destination_number - - elsif call_history.entry_type == 'dialed' - .call-placed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - elsif call_history.entry_type == 'received' - .call-received= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - elsif call_history.entry_type == 'missed' - .call-missed= call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - else - .call-unknown - = t("call_histories.index.#{call_history.entry_type}") - = call_history.display_call_date(t("call_histories.index.date_format"), t("call_histories.index.date_today_format")) - - if call_history.forwarding_service && call_history.entry_type != 'forwarded' - = t("call_histories.index.forwarded_by") - = call_history.display_auth_account_name - %td.user - - display_name = call_history.display_name - - if display_name.blank? - - display_name = phone_book_entry.to_s - - if phone_book_entry - %a.name{:href => phone_book_phone_book_entry_path(phone_book_entry.phone_book, phone_book_entry), :itemprop => "name"}= display_name - - else - .name= display_name - .phone= phone_number - %td.status - - if call_history.display_duration - .duration= call_history.display_duration - - else - .disposition= t("call_histories.call_results.#{call_history.result}") - %td.actions - - if @sip_account.registration && can?(:call, call_history) - = link_to t('call_histories.index.actions.call'), call_sip_account_call_history_path(@sip_account, call_history), :method => :put - %td.actions - - if can? :destroy, call_history - = link_to t('call_histories.index.actions.destroy'), sip_account_call_history_path(@sip_account, call_history), :method => :delete + .name= display_name + .phone= phone_number + %td.status + - if call_history.display_duration + .duration= call_history.display_duration + - else + .disposition= t("call_histories.call_results.#{call_history.result}") + %td.actions + - if @sip_account.registration && can?(:call, call_history) + = link_to t('call_histories.index.actions.call'), call_sip_account_call_history_path(@sip_account, call_history), :method => :put + %td.actions + - if can? :destroy, call_history + = link_to t('call_histories.index.actions.destroy'), sip_account_call_history_path(@sip_account, call_history), :method => :delete diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml index 5dc7c21..a665b5d 100644 --- a/app/views/call_routes/_index_core.html.haml +++ b/app/views/call_routes/_index_core.html.haml @@ -1,21 +1,22 @@ - cache(['call_routes_table', call_routes.count, call_routes.reorder(:updated_at).last]) do %table{:class => 'table table-striped'} - %tr - %th= t('call_routes.index.name') - %th= t('route_elements.index.pattern') - %th= t('call_routes.index.endpoint_type') - %th{:colspan => '3'} - - - for call_route in call_routes - - cache(['call_route_single_table_row', call_route, call_routes.count]) do - %tr - %td= call_route.name - %td - - if call_route.route_elements.any? - = call_route.route_elements.first.pattern - - if call_route.route_elements.count > 1 - = ', ...' - - else - = '-' - %td= call_route.endpoint_type - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route} \ No newline at end of file + %thead + %tr + %th= t('call_routes.index.name') + %th= t('route_elements.index.pattern') + %th= t('call_routes.index.endpoint_type') + + %tbody + - for call_route in call_routes + - cache(['call_route_single_table_row', call_route, call_routes.count]) do + %tr + %td= call_route.name + %td + - if call_route.route_elements.any? + = call_route.route_elements.first.pattern + - if call_route.route_elements.count > 1 + = ', ...' + - else + = '-' + %td= call_route.endpoint_type + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route} \ No newline at end of file diff --git a/app/views/calls/_index_core.html.haml b/app/views/calls/_index_core.html.haml index 09b7da6..c152470 100644 --- a/app/views/calls/_index_core.html.haml +++ b/app/views/calls/_index_core.html.haml @@ -1,9 +1,10 @@ %table{:class => 'table table-striped'} - %tr - %th= t('calls.index.uuid') - - - - for call in @calls + %thead %tr - %td - = call.uuid + %th= t('calls.index.uuid') + + %tbody + - for call in @calls + %tr + %td + = call.uuid diff --git a/app/views/callthroughs/_index_core.html.haml b/app/views/callthroughs/_index_core.html.haml index d1c171b..1767f5b 100644 --- a/app/views/callthroughs/_index_core.html.haml +++ b/app/views/callthroughs/_index_core.html.haml @@ -1,17 +1,18 @@ %table{:class => 'table table-striped'} - %tr - %th= t('callthroughs.index.name') - %th= t('callthroughs.index.phone_numbers') - %th= t('callthroughs.index.access_authorized_phone_numbers') - - if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true - %th= t('callthroughs.index.whitelist_phone_numbers') - - - - for callthrough in callthroughs + %thead %tr - %td= callthrough.name - %td=render 'phone_numbers/listing', :phone_numbers => callthrough.phone_numbers - %td=render 'phone_numbers/listing', :phone_numbers => callthrough.access_authorization_phone_numbers + %th= t('callthroughs.index.name') + %th= t('callthroughs.index.phone_numbers') + %th= t('callthroughs.index.access_authorized_phone_numbers') - if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true - %td=render 'phone_numbers/listing', :phone_numbers => callthrough.whitelisted_phone_numbers - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => callthrough.tenant, :child => callthrough} \ No newline at end of file + %th= t('callthroughs.index.whitelist_phone_numbers') + + %tbody + - for callthrough in callthroughs + %tr + %td= callthrough.name + %td=render 'phone_numbers/listing', :phone_numbers => callthrough.phone_numbers + %td=render 'phone_numbers/listing', :phone_numbers => callthrough.access_authorization_phone_numbers + - if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true + %td=render 'phone_numbers/listing', :phone_numbers => callthrough.whitelisted_phone_numbers + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => callthrough.tenant, :child => callthrough} \ No newline at end of file diff --git a/app/views/conference_invitees/_index_core.html.haml b/app/views/conference_invitees/_index_core.html.haml index 1d6ab2e..5e9c283 100644 --- a/app/views/conference_invitees/_index_core.html.haml +++ b/app/views/conference_invitees/_index_core.html.haml @@ -1,17 +1,18 @@ %table{:class => 'table table-striped'} - %tr - %th= t('conference_invitees.index.phone_book_entry_id') - %th= t('conference_invitees.index.phone_number') - %th= t('conference_invitees.index.pin') - %th= t('conference_invitees.index.speaker') - %th= t('conference_invitees.index.moderator') - - - - for conference_invitee in conference_invitees + %thead %tr - %td= conference_invitee.phone_book_entry || '-' - %td= conference_invitee.phone_number - %td= conference_invitee.pin - %td= conference_invitee.speaker - %td= conference_invitee.moderator - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => conference_invitee.conference, :child => conference_invitee} \ No newline at end of file + %th= t('conference_invitees.index.phone_book_entry_id') + %th= t('conference_invitees.index.phone_number') + %th= t('conference_invitees.index.pin') + %th= t('conference_invitees.index.speaker') + %th= t('conference_invitees.index.moderator') + + %tbody + - for conference_invitee in conference_invitees + %tr + %td= conference_invitee.phone_book_entry || '-' + %td= conference_invitee.phone_number + %td= conference_invitee.pin + %td= conference_invitee.speaker + %td= conference_invitee.moderator + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => conference_invitee.conference, :child => conference_invitee} \ No newline at end of file diff --git a/app/views/conferences/_index_core.html.haml b/app/views/conferences/_index_core.html.haml index 50ea1c8..bd305df 100644 --- a/app/views/conferences/_index_core.html.haml +++ b/app/views/conferences/_index_core.html.haml @@ -1,53 +1,54 @@ %table{:class => 'table table-striped'} - %tr - %th= t('conferences.index.name') - - if !conferences.respond_to?('where') || conferences.where(:start => nil).where(:end => nil).count != conferences.count - %th= t('conferences.index.start') - %th= t('conferences.index.end') - %th= t('conferences.index.phone_numbers') - - if !conferences.respond_to?('where') || conferences.where(:pin => '').count != conferences.count - %th= t('conferences.index.pin') - %th= t('conferences.index.max_members') - %th= t('conferences.index.number_of_invitees') - %th= t('conferences.index.flags') - - - - for conference in conferences - - parent = conference.conferenceable + %thead %tr - %td= conference.name + %th= t('conferences.index.name') - if !conferences.respond_to?('where') || conferences.where(:start => nil).where(:end => nil).count != conferences.count + %th= t('conferences.index.start') + %th= t('conferences.index.end') + %th= t('conferences.index.phone_numbers') + - if !conferences.respond_to?('where') || conferences.where(:pin => '').count != conferences.count + %th= t('conferences.index.pin') + %th= t('conferences.index.max_members') + %th= t('conferences.index.number_of_invitees') + %th= t('conferences.index.flags') + + %tbody + - for conference in conferences + - parent = conference.conferenceable + %tr + %td= conference.name + - if !conferences.respond_to?('where') || conferences.where(:start => nil).where(:end => nil).count != conferences.count + %td + - if conference.start + = l conference.start, :format => :long + - else + = '-' + %td + - if conference.end + = l conference.end, :format => :long + - else + = '-' %td - - if conference.start - = l conference.start, :format => :long - - else - = '-' - %td - - if conference.end - = l conference.end, :format => :long - - else - = '-' - %td - - if conference.phone_numbers.count > 0 - = render 'phone_numbers/listing', :phone_numbers => conference.phone_numbers.order(:number) - %br - = render :partial => 'shared/create_link', :locals => {:parent => conference, :child_class => PhoneNumber, :short_link => true} + - if conference.phone_numbers.count > 0 + = render 'phone_numbers/listing', :phone_numbers => conference.phone_numbers.order(:number) + %br + = render :partial => 'shared/create_link', :locals => {:parent => conference, :child_class => PhoneNumber, :short_link => true} - - if !conferences.respond_to?('where') || conferences.where(:pin => '').count != conferences.count + - if !conferences.respond_to?('where') || conferences.where(:pin => '').count != conferences.count + %td + - if !conference.pin.blank? + = conference.pin + - else + = '-' + %td= conference.max_members + %td= conference.conference_invitees.count %td - - if !conference.pin.blank? - = conference.pin - - else - = '-' - %td= conference.max_members - %td= conference.conference_invitees.count - %td - %ul - - if conference.open_for_anybody - %li= t('conferences.index.open_for_anybody') - - if conference.announce_new_member_by_name - %li= t('conferences.index.announce_new_member_by_name') - - if conference.announce_left_member_by_name - %li= t('conferences.index.announce_left_member_by_name') + %ul + - if conference.open_for_anybody + %li= t('conferences.index.open_for_anybody') + - if conference.announce_new_member_by_name + %li= t('conferences.index.announce_new_member_by_name') + - if conference.announce_left_member_by_name + %li= t('conferences.index.announce_left_member_by_name') - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => parent, :child => conference} \ No newline at end of file + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => parent, :child => conference} \ No newline at end of file diff --git a/app/views/fax_accounts/_index_core.html.haml b/app/views/fax_accounts/_index_core.html.haml index 5a04bf0..f3e391e 100644 --- a/app/views/fax_accounts/_index_core.html.haml +++ b/app/views/fax_accounts/_index_core.html.haml @@ -1,35 +1,36 @@ %table{:class => 'table table-striped'} - %tr - %th= t('fax_accounts.index.name') - %th - = t('fax_accounts.index.phone_numbers') - %br - = t('fax_accounts.index.station_id') - %th - = t('fax_accounts.index.received') - = '/' - = t('fax_accounts.index.sent') - %br - %small - = t('fax_accounts.index.last_update') - - - - for fax_account in fax_accounts + %thead %tr - %td= truncate(fax_account.name, :length => 15) - %td - =render 'phone_numbers/listing', :phone_numbers => fax_account.phone_numbers.order(:number) + %th= t('fax_accounts.index.name') + %th + = t('fax_accounts.index.phone_numbers') %br - = truncate(fax_account.station_id, :length => 20) - %td - = link_to fax_account.fax_documents.inbound.count, fax_account_fax_documents_path(fax_account, :anchor => "fax_document_#{fax_account.fax_documents.inbound.first.try(:id)}") + = t('fax_accounts.index.station_id') + %th + = t('fax_accounts.index.received') = '/' - = link_to fax_account.fax_documents.outbound.count, fax_account_fax_documents_path(fax_account, :anchor => "fax_document_#{fax_account.fax_documents.outbound.first.try(:id)}") - - if fax_account.fax_documents.count > 0 + = t('fax_accounts.index.sent') + %br + %small + = t('fax_accounts.index.last_update') + + %tbody + - for fax_account in fax_accounts + %tr + %td= truncate(fax_account.name, :length => 15) + %td + =render 'phone_numbers/listing', :phone_numbers => fax_account.phone_numbers.order(:number) %br - %small - = time_ago_in_words(fax_account.fax_documents.order(:updated_at).last.updated_at) - %td - - if can?(:new, FaxDocument, :fax_account_id => fax_account.id) - = link_to t('fax_accounts.index.send_a_fax'), new_fax_account_fax_document_path(fax_account) - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => fax_account.fax_accountable, :child => fax_account} \ No newline at end of file + = truncate(fax_account.station_id, :length => 20) + %td + = link_to fax_account.fax_documents.inbound.count, fax_account_fax_documents_path(fax_account, :anchor => "fax_document_#{fax_account.fax_documents.inbound.first.try(:id)}") + = '/' + = link_to fax_account.fax_documents.outbound.count, fax_account_fax_documents_path(fax_account, :anchor => "fax_document_#{fax_account.fax_documents.outbound.first.try(:id)}") + - if fax_account.fax_documents.count > 0 + %br + %small + = time_ago_in_words(fax_account.fax_documents.order(:updated_at).last.updated_at) + %td + - if can?(:new, FaxDocument, :fax_account_id => fax_account.id) + = link_to t('fax_accounts.index.send_a_fax'), new_fax_account_fax_document_path(fax_account) + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => fax_account.fax_accountable, :child => fax_account} \ No newline at end of file diff --git a/app/views/fax_documents/_index_core.html.haml b/app/views/fax_documents/_index_core.html.haml index 1265716..d3abafa 100644 --- a/app/views/fax_documents/_index_core.html.haml +++ b/app/views/fax_documents/_index_core.html.haml @@ -1,33 +1,34 @@ %table{:class => 'table table-striped'} - %tr - %th= t('fax_documents.index.sent_at') - %th= t('fax_documents.index.state') - %th= t('fax_documents.index.result') - %th - = t('fax_documents.index.phone_number') - %br - = t('fax_documents.index.remote_station_id') - %th= t('fax_documents.index.thumbnails') + %thead + %tr + %th= t('fax_documents.index.sent_at') + %th= t('fax_documents.index.state') + %th= t('fax_documents.index.result') + %th + = t('fax_documents.index.phone_number') + %br + = t('fax_documents.index.remote_station_id') + %th= t('fax_documents.index.thumbnails') - - - for fax_document in fax_documents - %tr{:id => "fax_document_#{fax_document.id}"} - - if fax_document.sent_at - %td= "#{fax_document.inbound ? '⇨' : '⇦'} #{fax_document.sent_at}".html_safe - %td= t("fax_documents.states.#{fax_document.state}") - %td= t("fax_documents.result_codes.code_#{fax_document.result_code}") + " (#{fax_document.result_code})" - - else - %td{ :colspan => 3 }= t("fax_documents.states.#{fax_document.state}") - %td - - if fax_document.inbound - = "#{fax_document.caller_id_number} #{fax_document.caller_id_name}" + %tbody + - for fax_document in fax_documents + %tr{:id => "fax_document_#{fax_document.id}"} + - if fax_document.sent_at + %td= "#{fax_document.inbound ? '⇨' : '⇦'} #{fax_document.sent_at}".html_safe + %td= t("fax_documents.states.#{fax_document.state}") + %td= t("fax_documents.result_codes.code_#{fax_document.result_code}") + " (#{fax_document.result_code})" - else - = fax_document.destination_phone_number - %br - = fax_document.remote_station_id - %td - - fax_document.fax_thumbnails.limit(5).each do |fax_thumbnail| - =image_tag fax_thumbnail.thumbnail_url(:mini), :class => 'FaxThumbnail', :alt => "Thumbnail of page \##{fax_thumbnail.position}" - - if can?(:show, fax_document) && !fax_document.document.blank? && File.readable?(fax_document.document.path) - = link_to t('fax_documents.index.actions.download'), fax_account_fax_document_path(@fax_account, fax_document, :format => :pdf), :method => :get - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => fax_document.fax_account, :child => fax_document} + %td{ :colspan => 3 }= t("fax_documents.states.#{fax_document.state}") + %td + - if fax_document.inbound + = "#{fax_document.caller_id_number} #{fax_document.caller_id_name}" + - else + = fax_document.destination_phone_number + %br + = fax_document.remote_station_id + %td + - fax_document.fax_thumbnails.limit(5).each do |fax_thumbnail| + =image_tag fax_thumbnail.thumbnail_url(:mini), :class => 'FaxThumbnail', :alt => "Thumbnail of page \##{fax_thumbnail.position}" + - if can?(:show, fax_document) && !fax_document.document.blank? && File.readable?(fax_document.document.path) + = link_to t('fax_documents.index.actions.download'), fax_account_fax_document_path(@fax_account, fax_document, :format => :pdf), :method => :get + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => fax_document.fax_account, :child => fax_document} diff --git a/app/views/freeswitch_voicemail_msgs/_index_core.html.haml b/app/views/freeswitch_voicemail_msgs/_index_core.html.haml index 2ada034..d7b3b21 100644 --- a/app/views/freeswitch_voicemail_msgs/_index_core.html.haml +++ b/app/views/freeswitch_voicemail_msgs/_index_core.html.haml @@ -1,12 +1,13 @@ %table{:class => 'table table-striped'} - %tr - %th= t('freeswitch_voicemail_msgs.index.created_epoch') - %th= t('freeswitch_voicemail_msgs.index.message_len') - %th= t('freeswitch_voicemail_msgs.index.file_path') - - - - for freeswitch_voicemail_msg in freeswitch_voicemail_msgs + %thead %tr - %td= freeswitch_voicemail_msg.created_epoch - %td= freeswitch_voicemail_msg.message_len - %td= freeswitch_voicemail_msg.file_path \ No newline at end of file + %th= t('freeswitch_voicemail_msgs.index.created_epoch') + %th= t('freeswitch_voicemail_msgs.index.message_len') + %th= t('freeswitch_voicemail_msgs.index.file_path') + + %tbody + - for freeswitch_voicemail_msg in freeswitch_voicemail_msgs + %tr + %td= freeswitch_voicemail_msg.created_epoch + %td= freeswitch_voicemail_msg.message_len + %td= freeswitch_voicemail_msg.file_path \ No newline at end of file diff --git a/app/views/gateway_parameters/_index_core.html.haml b/app/views/gateway_parameters/_index_core.html.haml index 0d00aaf..355169e 100644 --- a/app/views/gateway_parameters/_index_core.html.haml +++ b/app/views/gateway_parameters/_index_core.html.haml @@ -1,13 +1,14 @@ %table{:class => 'table table-striped'} - %tr - %th= t('gateway_parameters.index.name') - %th= t('gateway_parameters.index.value') - %th= t('gateway_parameters.index.description') - - - - for gateway_parameter in gateway_parameters + %thead %tr - %td= gateway_parameter.name - %td= gateway_parameter.value - %td= gateway_parameter.description - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => gateway_parameter.gateway, :child => gateway_parameter} + %th= t('gateway_parameters.index.name') + %th= t('gateway_parameters.index.value') + %th= t('gateway_parameters.index.description') + + %tbody + - for gateway_parameter in gateway_parameters + %tr + %td= gateway_parameter.name + %td= gateway_parameter.value + %td= gateway_parameter.description + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => gateway_parameter.gateway, :child => gateway_parameter} diff --git a/app/views/gateway_settings/_index_core.html.haml b/app/views/gateway_settings/_index_core.html.haml index ded7eb8..f5faf33 100644 --- a/app/views/gateway_settings/_index_core.html.haml +++ b/app/views/gateway_settings/_index_core.html.haml @@ -1,13 +1,14 @@ %table{:class => 'table table-striped'} - %tr - %th= t('gateway_settings.index.name') - %th= t('gateway_settings.index.value') - %th= t('gateway_settings.index.description') - - - - for gateway_setting in gateway_settings + %thead %tr - %td= gateway_setting.name - %td= gateway_setting.value - %td= gateway_setting.description - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => gateway_setting.gateway, :child => gateway_setting} + %th= t('gateway_settings.index.name') + %th= t('gateway_settings.index.value') + %th= t('gateway_settings.index.description') + + %tbody + - for gateway_setting in gateway_settings + %tr + %td= gateway_setting.name + %td= gateway_setting.value + %td= gateway_setting.description + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => gateway_setting.gateway, :child => gateway_setting} diff --git a/app/views/gateways/_index_core.html.haml b/app/views/gateways/_index_core.html.haml index 0eec67f..faa381d 100644 --- a/app/views/gateways/_index_core.html.haml +++ b/app/views/gateways/_index_core.html.haml @@ -1,19 +1,20 @@ - cache(['gateways_table', gateways.count, gateways.first, gateways.last]) do %table{:class => 'table table-striped'} - %tr - %th= t('gateways.index.name') - %th= t('gateways.index.technology') - %th= t('gateways.index.inbound') - %th= t('gateways.index.outbound') - %th= t('gateways.index.description') - %th{:colspan => '3'} - - - for gateway in gateways + %thead %tr - - cache(['gateway_single_table_row_within_tr', gateway, gateways.count]) do - %td= gateway.name - %td= gateway.technology - %td= gateway.inbound - %td= gateway.outbound - %td= gateway.description - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gateway} \ No newline at end of file + %th= t('gateways.index.name') + %th= t('gateways.index.technology') + %th= t('gateways.index.inbound') + %th= t('gateways.index.outbound') + %th= t('gateways.index.description') + + %tbody + - for gateway in gateways + %tr + - cache(['gateway_single_table_row_within_tr', gateway, gateways.count]) do + %td= gateway.name + %td= gateway.technology + %td= gateway.inbound + %td= gateway.outbound + %td= gateway.description + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gateway} \ No newline at end of file diff --git a/app/views/gs_cluster_sync_log_entries/_index_core.html.haml b/app/views/gs_cluster_sync_log_entries/_index_core.html.haml index c9a3e50..d491f51 100644 --- a/app/views/gs_cluster_sync_log_entries/_index_core.html.haml +++ b/app/views/gs_cluster_sync_log_entries/_index_core.html.haml @@ -1,17 +1,18 @@ %table{:class => 'table table-striped'} - %tr - %th= t('gs_cluster_sync_log_entries.index.gs_node_id') - %th= t('gs_cluster_sync_log_entries.index.class_name') - %th= t('gs_cluster_sync_log_entries.index.action') - %th= t('gs_cluster_sync_log_entries.index.content') - %th= t('gs_cluster_sync_log_entries.index.status') - - - - for gs_cluster_sync_log_entry in gs_cluster_sync_log_entries + %thead %tr - %td= gs_cluster_sync_log_entry.gs_node_id - %td= gs_cluster_sync_log_entry.class_name - %td= gs_cluster_sync_log_entry.action - %td= gs_cluster_sync_log_entry.content - %td= gs_cluster_sync_log_entry.status - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gs_cluster_sync_log_entry} \ No newline at end of file + %th= t('gs_cluster_sync_log_entries.index.gs_node_id') + %th= t('gs_cluster_sync_log_entries.index.class_name') + %th= t('gs_cluster_sync_log_entries.index.action') + %th= t('gs_cluster_sync_log_entries.index.content') + %th= t('gs_cluster_sync_log_entries.index.status') + + %tbody + - for gs_cluster_sync_log_entry in gs_cluster_sync_log_entries + %tr + %td= gs_cluster_sync_log_entry.gs_node_id + %td= gs_cluster_sync_log_entry.class_name + %td= gs_cluster_sync_log_entry.action + %td= gs_cluster_sync_log_entry.content + %td= gs_cluster_sync_log_entry.status + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gs_cluster_sync_log_entry} \ No newline at end of file diff --git a/app/views/gs_nodes/_index_core.html.haml b/app/views/gs_nodes/_index_core.html.haml index 0f1a51c..863ab25 100644 --- a/app/views/gs_nodes/_index_core.html.haml +++ b/app/views/gs_nodes/_index_core.html.haml @@ -1,19 +1,20 @@ %table{:class => 'table table-striped'} - %tr - %th= t('gs_nodes.index.name') - %th= t('gs_nodes.index.ip_address') - %th= t('gs_nodes.index.site') - %th= t('gs_nodes.index.element_name') - %th= t('gs_nodes.index.push_updates_to') - %th= t('gs_nodes.index.accepts_updates_from') - - - - for gs_node in gs_nodes + %thead %tr - %td= gs_node.name - %td= gs_node.ip_address - %td= gs_node.site - %td= gs_node.element_name - %td= gs_node.push_updates_to - %td= gs_node.accepts_updates_from - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gs_node} \ No newline at end of file + %th= t('gs_nodes.index.name') + %th= t('gs_nodes.index.ip_address') + %th= t('gs_nodes.index.site') + %th= t('gs_nodes.index.element_name') + %th= t('gs_nodes.index.push_updates_to') + %th= t('gs_nodes.index.accepts_updates_from') + + %tbody + - for gs_node in gs_nodes + %tr + %td= gs_node.name + %td= gs_node.ip_address + %td= gs_node.site + %td= gs_node.element_name + %td= gs_node.push_updates_to + %td= gs_node.accepts_updates_from + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gs_node} \ No newline at end of file diff --git a/app/views/gs_parameters/_index_core.html.haml b/app/views/gs_parameters/_index_core.html.haml index 3d5f3cf..9628feb 100644 --- a/app/views/gs_parameters/_index_core.html.haml +++ b/app/views/gs_parameters/_index_core.html.haml @@ -1,16 +1,17 @@ - cache(['gs_parameters_table_section', gs_parameters.first.section, gs_parameters.reorder(:updated_at).last, gs_parameters.pluck(:id)]) do - %tr - %th= t('gs_parameters.index.name') - - if !@sections - %th= t('gs_parameters.index.section') - %th= t('gs_parameters.index.value') + %thead + %tr + %th= t('gs_parameters.index.name') + - if !@sections + %th= t('gs_parameters.index.section') + %th= t('gs_parameters.index.value') - - - for gs_parameter in gs_parameters - - cache(['gs_parameters_table_single_row', gs_parameter]) do - %tr - %td= gs_parameter.name - - if !@sections - %td= gs_parameter.section - %td= truncate(gs_parameter.value, :length => 50) - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gs_parameter} \ No newline at end of file + %tbody + - for gs_parameter in gs_parameters + - cache(['gs_parameters_table_single_row', gs_parameter]) do + %tr + %td= gs_parameter.name + - if !@sections + %td= gs_parameter.section + %td= truncate(gs_parameter.value, :length => 50) + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gs_parameter} \ No newline at end of file diff --git a/app/views/gui_functions/_index_core.html.haml b/app/views/gui_functions/_index_core.html.haml index 0d9454e..7224bbc 100644 --- a/app/views/gui_functions/_index_core.html.haml +++ b/app/views/gui_functions/_index_core.html.haml @@ -1,27 +1,28 @@ %table{:class => 'table table-striped'} - %tr - %th= t('gui_functions.index.category') - %th= t('gui_functions.index.name') - - @user_groups.each do |user_group| - %th= user_group - - - - for gui_function in gui_functions + %thead %tr - - cache(['gui_functions_table_row', I18n.locale, gui_function]) do - %td= gui_function.category - %td - = gui_function.name - - if !gui_function.description.blank? - %br - %i= gui_function.description - - @user_groups.each do |user_group| - - if gui_function.gui_function_memberships.find_by_user_group_id(user_group.id) - - if gui_function.gui_function_memberships.find_by_user_group_id(user_group.id).activated == true - %td= 'x' + %th= t('gui_functions.index.category') + %th= t('gui_functions.index.name') + - @user_groups.each do |user_group| + %th= user_group + + %tbody + - for gui_function in gui_functions + %tr + - cache(['gui_functions_table_row', I18n.locale, gui_function]) do + %td= gui_function.category + %td + = gui_function.name + - if !gui_function.description.blank? + %br + %i= gui_function.description + - @user_groups.each do |user_group| + - if gui_function.gui_function_memberships.find_by_user_group_id(user_group.id) + - if gui_function.gui_function_memberships.find_by_user_group_id(user_group.id).activated == true + %td= 'x' + - else + %td= '' - else - %td= '' - - else - %td= 'x' + %td= 'x' - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gui_function} \ No newline at end of file + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gui_function} \ No newline at end of file diff --git a/app/views/hunt_group_members/_index_core.html.haml b/app/views/hunt_group_members/_index_core.html.haml index c6b7e4a..611e74c 100644 --- a/app/views/hunt_group_members/_index_core.html.haml +++ b/app/views/hunt_group_members/_index_core.html.haml @@ -1,20 +1,21 @@ %table{:class => 'table table-striped'} - %tr - %th= t('hunt_group_members.index.name') - %th= t('hunt_group_members.index.active') - %th= t('hunt_group_members.index.can_switch_status_itself') - %th= t('hunt_group_members.index.phone_numbers') - - - - for hunt_group_member in hunt_group_members + %thead %tr - %td= hunt_group_member.name - %td= hunt_group_member.active - %td= hunt_group_member.can_switch_status_itself - %td - - if hunt_group_member.phone_numbers.count > 0 - =render 'phone_numbers/listing', :phone_numbers => hunt_group_member.phone_numbers - %br - = render :partial => 'shared/create_link', :locals => {:parent => hunt_group_member, :child_class => PhoneNumber, :short_link => true} + %th= t('hunt_group_members.index.name') + %th= t('hunt_group_members.index.active') + %th= t('hunt_group_members.index.can_switch_status_itself') + %th= t('hunt_group_members.index.phone_numbers') + + %tbody + - for hunt_group_member in hunt_group_members + %tr + %td= hunt_group_member.name + %td= hunt_group_member.active + %td= hunt_group_member.can_switch_status_itself + %td + - if hunt_group_member.phone_numbers.count > 0 + =render 'phone_numbers/listing', :phone_numbers => hunt_group_member.phone_numbers + %br + = render :partial => 'shared/create_link', :locals => {:parent => hunt_group_member, :child_class => PhoneNumber, :short_link => true} - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => hunt_group_member.hunt_group, :child => hunt_group_member} \ No newline at end of file + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => hunt_group_member.hunt_group, :child => hunt_group_member} \ No newline at end of file diff --git a/app/views/hunt_groups/_index_core.html.haml b/app/views/hunt_groups/_index_core.html.haml index 16b1b5d..5f6e797 100644 --- a/app/views/hunt_groups/_index_core.html.haml +++ b/app/views/hunt_groups/_index_core.html.haml @@ -1,34 +1,35 @@ - show_seconds = hunt_groups.map{|x| ! x.seconds_between_jumps.nil? }.include?(true) %table{:class => 'table table-striped'} - %tr - %th= t('hunt_groups.index.name') - %th= t('hunt_groups.index.strategy') - - if show_seconds - %th= t('hunt_groups.index.seconds_between_jumps') - %th= t('hunt_groups.index.phone_numbers') - %th= t('hunt_groups.index.hunt_group_members') - - - - for hunt_group in hunt_groups + %thead %tr - %td= hunt_group.name - %td= t("hunt_groups.strategies.#{hunt_group.strategy}") + %th= t('hunt_groups.index.name') + %th= t('hunt_groups.index.strategy') - if show_seconds - %td= hunt_group.seconds_between_jumps - %td - - if hunt_group.phone_numbers.count > 0 - =render 'phone_numbers/listing', :phone_numbers => hunt_group.phone_numbers - %br - = render :partial => 'shared/create_link', :locals => {:parent => hunt_group, :child_class => PhoneNumber, :short_link => true} + %th= t('hunt_groups.index.seconds_between_jumps') + %th= t('hunt_groups.index.phone_numbers') + %th= t('hunt_groups.index.hunt_group_members') + + %tbody + - for hunt_group in hunt_groups + %tr + %td= hunt_group.name + %td= t("hunt_groups.strategies.#{hunt_group.strategy}") + - if show_seconds + %td= hunt_group.seconds_between_jumps + %td + - if hunt_group.phone_numbers.count > 0 + =render 'phone_numbers/listing', :phone_numbers => hunt_group.phone_numbers + %br + = render :partial => 'shared/create_link', :locals => {:parent => hunt_group, :child_class => PhoneNumber, :short_link => true} - %td - - if hunt_group.hunt_group_members.count > 3 - = link_to hunt_group.hunt_group_members.count, hunt_group_hunt_group_members_path(hunt_group) - %br - - elsif hunt_group.hunt_group_members.count > 0 - =render 'hunt_group_members/listing', :hunt_group_members => hunt_group.hunt_group_members - %br - = render :partial => 'shared/create_link', :locals => {:parent => hunt_group, :child_class => HuntGroupMember, :short_link => true} + %td + - if hunt_group.hunt_group_members.count > 3 + = link_to hunt_group.hunt_group_members.count, hunt_group_hunt_group_members_path(hunt_group) + %br + - elsif hunt_group.hunt_group_members.count > 0 + =render 'hunt_group_members/listing', :hunt_group_members => hunt_group.hunt_group_members + %br + = render :partial => 'shared/create_link', :locals => {:parent => hunt_group, :child_class => HuntGroupMember, :short_link => true} - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => hunt_group.tenant, :child => hunt_group} \ No newline at end of file + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => hunt_group.tenant, :child => hunt_group} \ No newline at end of file diff --git a/app/views/manufacturers/_index_core.html.haml b/app/views/manufacturers/_index_core.html.haml index 5efa5d9..6b0acd2 100644 --- a/app/views/manufacturers/_index_core.html.haml +++ b/app/views/manufacturers/_index_core.html.haml @@ -1,18 +1,19 @@ %table{:class => 'table table-striped'} - %tr - %th= t('manufacturers.index.name') - %th= t('manufacturers.index.ieee_name') - %th= t('manufacturers.index.homepage_url') - %th= t('manufacturers.index.phone_models') - - - - for manufacturer in manufacturers + %thead %tr - %td= manufacturer.name - %td= manufacturer.ieee_name - %td - - if manufacturer.homepage_url - =link_to manufacturer.homepage_url, manufacturer.homepage_url - %td - = manufacturer.phone_models.map{|x| x.to_s }.join(', ') - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => manufacturer} \ No newline at end of file + %th= t('manufacturers.index.name') + %th= t('manufacturers.index.ieee_name') + %th= t('manufacturers.index.homepage_url') + %th= t('manufacturers.index.phone_models') + + %tbody + - for manufacturer in manufacturers + %tr + %td= manufacturer.name + %td= manufacturer.ieee_name + %td + - if manufacturer.homepage_url + =link_to manufacturer.homepage_url, manufacturer.homepage_url + %td + = manufacturer.phone_models.map{|x| x.to_s }.join(', ') + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => manufacturer} \ No newline at end of file diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml index accded6..df7a2ef 100644 --- a/app/views/phone_books/_index_core.html.haml +++ b/app/views/phone_books/_index_core.html.haml @@ -1,18 +1,19 @@ %table{:class => 'table table-striped'} - %tr - %th= t('phone_books.index.name') - %th= t('phone_books.index.count') - %th{:colspan => '3'} - - - for phone_book in phone_books + %thead %tr - %td - - if phone_book.description.blank? - = phone_book.name - - else - %a.brand{:rel => 'tooltip', :title => phone_book.description} + %th= t('phone_books.index.name') + %th= t('phone_books.index.count') + + %tbody + - for phone_book in phone_books + %tr + %td + - if phone_book.description.blank? = phone_book.name - %td - = number_with_delimiter( phone_book.phone_book_entries.count ) + - else + %a.brand{:rel => 'tooltip', :title => phone_book.description} + = phone_book.name + %td + = number_with_delimiter( phone_book.phone_book_entries.count ) - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_book.phone_bookable, :child => phone_book} \ No newline at end of file + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_book.phone_bookable, :child => phone_book} \ No newline at end of file diff --git a/app/views/phone_models/_index_core.html.haml b/app/views/phone_models/_index_core.html.haml index b899a5c..0155f25 100644 --- a/app/views/phone_models/_index_core.html.haml +++ b/app/views/phone_models/_index_core.html.haml @@ -1,19 +1,20 @@ %table{:class => 'table table-striped'} - %tr - %th= t('phone_models.index.name') - %th= t('phone_models.index.product_manual_homepage_url') - %th= t('phone_models.index.product_homepage_url') - %th= t('phone_models.index.number_of_phones') - - - - for phone_model in phone_models + %thead %tr - %td= phone_model.name - %td - - if phone_model.product_manual_homepage_url - =link_to truncate(phone_model.product_manual_homepage_url, :length => 40), phone_model.product_manual_homepage_url - %td - - if phone_model.product_homepage_url - =link_to truncate(phone_model.product_homepage_url, :length => 40), phone_model.product_homepage_url - %td= phone_model.phones.count - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => phone_model, :parent => phone_model.manufacturer} \ No newline at end of file + %th= t('phone_models.index.name') + %th= t('phone_models.index.product_manual_homepage_url') + %th= t('phone_models.index.product_homepage_url') + %th= t('phone_models.index.number_of_phones') + + %tbody + - for phone_model in phone_models + %tr + %td= phone_model.name + %td + - if phone_model.product_manual_homepage_url + =link_to truncate(phone_model.product_manual_homepage_url, :length => 40), phone_model.product_manual_homepage_url + %td + - if phone_model.product_homepage_url + =link_to truncate(phone_model.product_homepage_url, :length => 40), phone_model.product_homepage_url + %td= phone_model.phones.count + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => phone_model, :parent => phone_model.manufacturer} \ No newline at end of file diff --git a/app/views/phone_number_ranges/_index_core.html.haml b/app/views/phone_number_ranges/_index_core.html.haml index b378be8..2751bdd 100644 --- a/app/views/phone_number_ranges/_index_core.html.haml +++ b/app/views/phone_number_ranges/_index_core.html.haml @@ -1,21 +1,22 @@ %table{:class => 'table table-striped'} - %tr - %th= t('phone_number_ranges.index.name') - %th= t('phone_number_ranges.index.description') - %th= t('phone_number_ranges.index.numbers') - %th= t('phone_number_ranges.index.amount') - - - - for phone_number_range in phone_number_ranges + %thead %tr - %td= t("phone_number_ranges.ranges.#{phone_number_range}.label") - %td= t("phone_number_ranges.ranges.#{phone_number_range}.description") - %td - - if phone_number_range.phone_numbers.count > 0 - = render 'phone_numbers/listing', :phone_numbers => phone_number_range.phone_numbers.order(:number) - %br - = render :partial => 'shared/create_link', :locals => {:parent => phone_number_range, :child_class => PhoneNumber, :short_link => true} + %th= t('phone_number_ranges.index.name') + %th= t('phone_number_ranges.index.description') + %th= t('phone_number_ranges.index.numbers') + %th= t('phone_number_ranges.index.amount') + + %tbody + - for phone_number_range in phone_number_ranges + %tr + %td= t("phone_number_ranges.ranges.#{phone_number_range}.label") + %td= t("phone_number_ranges.ranges.#{phone_number_range}.description") + %td + - if phone_number_range.phone_numbers.count > 0 + = render 'phone_numbers/listing', :phone_numbers => phone_number_range.phone_numbers.order(:number) + %br + = render :partial => 'shared/create_link', :locals => {:parent => phone_number_range, :child_class => PhoneNumber, :short_link => true} - %td= phone_number_range.phone_numbers.count - - if phone_number_range.phone_number_rangeable.class != Country - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_number_range.phone_number_rangeable, :child => phone_number_range} \ No newline at end of file + %td= phone_number_range.phone_numbers.count + - if phone_number_range.phone_number_rangeable.class != Country + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_number_range.phone_number_rangeable, :child => phone_number_range} \ No newline at end of file diff --git a/app/views/phone_numbers/_index_core.html.haml b/app/views/phone_numbers/_index_core.html.haml index f41c949..e1a8602 100644 --- a/app/views/phone_numbers/_index_core.html.haml +++ b/app/views/phone_numbers/_index_core.html.haml @@ -1,14 +1,14 @@ %table{:class => 'table table-striped'} - %tr - - if phone_numbers.count > 1 && phone_numbers.first.phone_numberable_type == 'PhoneBookEntry' - %th= t('phone_numbers.index.name') - %th= t('phone_numbers.index.number') - %th{:colspan => '3'} - - - - for phone_number in phone_numbers.order(:position) + %thead %tr - - if phone_number.phone_numberable_type == 'PhoneBookEntry' - %td= phone_number.name - %td= phone_number - = render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_number.phone_numberable, :child => phone_number} + - if phone_numbers.count > 1 && phone_numbers.first.phone_numberable_type == 'PhoneBookEntry' + %th= t('phone_numbers.index.name') + %th= t('phone_numbers.index.number') + + %tbody + - for phone_number in phone_numbers.order(:position) + %tr + - if phone_number.phone_numberable_type == 'PhoneBookEntry' + %td= phone_number.name + %td= phone_number + = render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_number.phone_numberable, :child => phone_number} diff --git a/app/views/phone_sip_accounts/_index_core.html.haml b/app/views/phone_sip_accounts/_index_core.html.haml index 1e6d3ca..8178e6d 100644 --- a/app/views/phone_sip_accounts/_index_core.html.haml +++ b/app/views/phone_sip_accounts/_index_core.html.haml @@ -1,13 +1,14 @@ %table{:class => 'table table-striped'} - %tr - %th= t('phone_sip_accounts.index.phone_id') - %th= t('phone_sip_accounts.index.sip_account_id') - %th= t('phone_sip_accounts.index.position') - %th{:colspan => '3'} - - - for phone_sip_account in phone_sip_accounts + %thead %tr - %td= phone_sip_account.phone - %td= phone_sip_account.sip_account - %td= phone_sip_account.position - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_sip_account.phone, :child => phone_sip_account} \ No newline at end of file + %th= t('phone_sip_accounts.index.phone_id') + %th= t('phone_sip_accounts.index.sip_account_id') + %th= t('phone_sip_accounts.index.position') + + %tbody + - for phone_sip_account in phone_sip_accounts + %tr + %td= phone_sip_account.phone + %td= phone_sip_account.sip_account + %td= phone_sip_account.position + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_sip_account.phone, :child => phone_sip_account} \ No newline at end of file diff --git a/app/views/phones/_index_core.html.haml b/app/views/phones/_index_core.html.haml index fc1ad19..b8efbe3 100644 --- a/app/views/phones/_index_core.html.haml +++ b/app/views/phones/_index_core.html.haml @@ -1,15 +1,16 @@ %table{:class => 'table table-striped'} - %tr - %th= t('phones.index.mac_address') - %th= t('phones.index.phone_model_id') - %th= t('phones.index.hot_deskable') - %th= t('phones.index.ip_address') - - - - for phone in phones + %thead %tr - %td= phone.pretty_mac_address - %td= phone.phone_model - %td= phone.hot_deskable - %td= phone.ip_address - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone.phoneable, :child => phone} \ No newline at end of file + %th= t('phones.index.mac_address') + %th= t('phones.index.phone_model_id') + %th= t('phones.index.hot_deskable') + %th= t('phones.index.ip_address') + + %tbody + - for phone in phones + %tr + %td= phone.pretty_mac_address + %td= phone.phone_model + %td= phone.hot_deskable + %td= phone.ip_address + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone.phoneable, :child => phone} \ No newline at end of file diff --git a/app/views/phones/show.html.haml b/app/views/phones/show.html.haml index faf4061..18e990c 100644 --- a/app/views/phones/show.html.haml +++ b/app/views/phones/show.html.haml @@ -1,52 +1,74 @@ - content_for :title, t("phones.show.page_title") -%p - %strong= t('phones.show.mac_address') + ":" - = @phone.pretty_mac_address -%p - %strong= t('phones.show.phone_model_id') + ":" - = @phone.phone_model - - if !@phone.phone_model.product_manual_homepage_url.blank? - (#{link_to t('phones.show.manual'), @phone.phone_model.product_manual_homepage_url}) -- if @phone.hot_deskable == true - %p - %strong= t('phones.show.hot_deskable') + ":" - = @phone.hot_deskable - %p - %strong= t('phones.show.fallback_sip_account_id') + ":" - = @phone.fallback_sip_account - -- if defined? GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') && GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') == true - %p - %strong= t('phones.show.nightly_reboot') + ":" - = @phone.nightly_reboot - -- if !GsParameter.get('PROVISIONING_KEY_LENGTH').nil? && GsParameter.get('PROVISIONING_KEY_LENGTH') > 0 - %p - %strong= t('phones.show.provisioning_key_active') + ":" - = @phone.provisioning_key_active -%p - %strong= t('phones.show.ip_address') + ":" - = @phone.ip_address - -- if @phone.ip_address.blank? && @phone.phone_model.manufacturer.ieee_name == 'SNOM Technology AG' - %p - Sollten Sie Ihren DHCP-Server noch nicht für das automatische Konfigurieren der GS5 Provisionierungs-URL konfiguriert haben, können Sie manuell in Ihrem Telefon die folgende Provisionierungs-URL eingeben. - %p - Das entsprechende Eingabefeld finden Sie unter - %br - Advanced -> Update -> Setting URL - %p - Das "{mac}" bitte genau so eingeben, es wird vom Telefon automatisch mit der eigenen MAC-Adresse befüllt: - %pre - = "http://#{GemeinschaftSetup.first.sip_domain.host}/settings-{mac}" - %p - Danach müssen Sie die Konfiguration abspeichern und das Telefon booten. - -= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @phone.phoneable, :child => @phone } - -%h2= t("phones.sip_accounts.title") -- if @phone.phone_sip_accounts.count > 0 - = render "phone_sip_accounts/index_core", :phone_sip_accounts => @phone.phone_sip_accounts - -= render :partial => 'shared/create_link', :locals => {:parent => @phone, :child_class => PhoneSipAccount} +.row + .span6 + %table + %tr + %td + %strong= t('phones.show.mac_address') + ":" + %td + = @phone.pretty_mac_address + %tr + %td + %strong= t('phones.show.phone_model_id') + ":" + %td + = @phone.phone_model + - if !@phone.phone_model.product_manual_homepage_url.blank? + (#{link_to t('phones.show.manual'), @phone.phone_model.product_manual_homepage_url}) + - if @phone.hot_deskable == true + %tr + %td + %strong= t('phones.show.hot_deskable') + ":" + %td + = @phone.hot_deskable + %tr + %td + %strong= t('phones.show.fallback_sip_account_id') + ":" + %td + = @phone.fallback_sip_account + + - if defined? GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') && GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') == true + %tr + %td + %strong= t('phones.show.nightly_reboot') + ":" + %td + = @phone.nightly_reboot + + - if !GsParameter.get('PROVISIONING_KEY_LENGTH').nil? && GsParameter.get('PROVISIONING_KEY_LENGTH') > 0 + %tr + %td + %strong= t('phones.show.provisioning_key_active') + ":" + %td + = @phone.provisioning_key_active + + %tr + %td + %strong= t('phones.show.ip_address') + ":" + %td + = @phone.ip_address + + = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @phone.phoneable, :child => @phone } + + + .span6 + - if @phone.ip_address.blank? && @phone.phone_model.manufacturer.ieee_name == 'SNOM Technology AG' + %p + Sollten Sie Ihren DHCP-Server noch nicht für das automatische Konfigurieren der GS5 Provisionierungs-URL konfiguriert haben, können Sie manuell in Ihrem Telefon die folgende Provisionierungs-URL eingeben. + %p + Das entsprechende Eingabefeld finden Sie unter + %br + Advanced -> Update -> Setting URL + %p + Das "{mac}" bitte genau so eingeben, es wird vom Telefon automatisch mit der eigenen MAC-Adresse befüllt: + %pre + = "http://#{GemeinschaftSetup.first.sip_domain.host}/settings-{mac}" + %p + Danach müssen Sie die Konfiguration abspeichern und das Telefon booten. + +.row + .span12 + %h2= t("phones.sip_accounts.title") + - if @phone.phone_sip_accounts.count > 0 + = render "phone_sip_accounts/index_core", :phone_sip_accounts => @phone.phone_sip_accounts + + = render :partial => 'shared/create_link', :locals => {:parent => @phone, :child_class => PhoneSipAccount} diff --git a/app/views/ringtones/_index_core.html.haml b/app/views/ringtones/_index_core.html.haml index e3b9a32..6996fde 100644 --- a/app/views/ringtones/_index_core.html.haml +++ b/app/views/ringtones/_index_core.html.haml @@ -1,11 +1,12 @@ %table{:class => 'table table-striped'} - %tr - %th= t('ringtones.index.audio') - %th= t('ringtones.index.bellcore_id') - - - - for ringtone in ringtones + %thead %tr - %td= ringtone.audio - %td= ringtone.bellcore_id - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => ringtone.ringtoneable, :child => ringtone} \ No newline at end of file + %th= t('ringtones.index.audio') + %th= t('ringtones.index.bellcore_id') + + %tbody + - for ringtone in ringtones + %tr + %td= ringtone.audio + %td= ringtone.bellcore_id + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => ringtone.ringtoneable, :child => ringtone} \ No newline at end of file diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml index 5336057..9b7e8d7 100644 --- a/app/views/route_elements/_index_core.html.haml +++ b/app/views/route_elements/_index_core.html.haml @@ -1,19 +1,20 @@ %table{:class => 'table table-striped'} - %tr - %th= t('route_elements.index.var_in') - %th= t('route_elements.index.var_out') - %th= t('route_elements.index.pattern') - %th= t('route_elements.index.replacement') - %th= t('route_elements.index.action') - %th= t('route_elements.index.mandatory') - - - - for route_element in route_elements + %thead %tr - %td= route_element.var_in - %td= route_element.var_out - %td= route_element.pattern - %td= route_element.replacement - %td= route_element.action - %td= route_element.mandatory - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @call_route, :child => route_element} \ No newline at end of file + %th= t('route_elements.index.var_in') + %th= t('route_elements.index.var_out') + %th= t('route_elements.index.pattern') + %th= t('route_elements.index.replacement') + %th= t('route_elements.index.action') + %th= t('route_elements.index.mandatory') + + %tbody + - for route_element in route_elements + %tr + %td= route_element.var_in + %td= route_element.var_out + %td= route_element.pattern + %td= route_element.replacement + %td= route_element.action + %td= route_element.mandatory + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @call_route, :child => route_element} \ No newline at end of file diff --git a/app/views/shared/_show_edit_destroy_part.html.haml b/app/views/shared/_show_edit_destroy_part.html.haml index e82c667..a306bc3 100644 --- a/app/views/shared/_show_edit_destroy_part.html.haml +++ b/app/views/shared/_show_edit_destroy_part.html.haml @@ -1,20 +1,20 @@ %p - if !(defined? parent).nil? && !(defined? child).nil? - if can? :edit, child - %a.btn.btn-warning{:href => method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) } + %a.btn.btn-mini.btn-warning{:href => method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) } %i.icon-edit.icon-white =t("#{child.class.name.underscore.pluralize}.actions.edit") - if can? :destroy, child - %a.btn.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"} + %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"} %i.icon-trash.icon-white =t("#{child.class.name.underscore.pluralize}.actions.destroy") - elsif !(defined? child).nil? - if can? :edit, child - %a.btn.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) } + %a.btn.btn-mini.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) } %i.icon-edit.icon-white =t("#{child.class.name.underscore.pluralize}.actions.edit") - if can? :destroy, child - %a.btn.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"} + %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"} %i.icon-trash.icon-white =t("#{child.class.name.underscore.pluralize}.actions.destroy") \ No newline at end of file diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml index 8d9791d..ff09c37 100644 --- a/app/views/sip_accounts/_index_core.html.haml +++ b/app/views/sip_accounts/_index_core.html.haml @@ -1,26 +1,27 @@ %table{:class => 'table table-striped'} - %tr - %th= t('sip_accounts.index.online') - %th= t('sip_accounts.index.caller_name') - %th= t('sip_accounts.index.phone_numbers') - %th= t('phones.name') - %th{:colspan => '3'} - - - for sip_account in sip_accounts + %thead %tr - %td - - if sip_account.registration - %i.icon-ok - - else - %i.icon-thumbs-down - %td - = sip_account.caller_name - - phone_numbers = sip_account.phone_numbers - %td - - if sip_account.phone_numbers.count > 0 - = render 'phone_numbers/listing', :phone_numbers => sip_account.phone_numbers.order(:number) + %th= t('sip_accounts.index.online') + %th= t('sip_accounts.index.caller_name') + %th= t('sip_accounts.index.phone_numbers') + %th= t('phones.name') - %td - - sip_account.phones.each do |phone| - = link_to phone.to_s, method( :"#{phone.phoneable_type.underscore}_phone_path" ).( phone.phoneable_id, phone ) - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => sip_account.sip_accountable, :child => sip_account} \ No newline at end of file + %tbody + - for sip_account in sip_accounts + %tr + %td + - if sip_account.registration + %i.icon-ok + - else + %i.icon-thumbs-down + %td + = sip_account.caller_name + - phone_numbers = sip_account.phone_numbers + %td + - if sip_account.phone_numbers.count > 0 + = render 'phone_numbers/listing', :phone_numbers => sip_account.phone_numbers.order(:number) + + %td + - sip_account.phones.each do |phone| + = link_to phone.to_s, method( :"#{phone.phoneable_type.underscore}_phone_path" ).( phone.phoneable_id, phone ) + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => sip_account.sip_accountable, :child => sip_account} \ No newline at end of file diff --git a/app/views/sip_domains/_index_core.html.haml b/app/views/sip_domains/_index_core.html.haml index d26fd1b..44c03c7 100644 --- a/app/views/sip_domains/_index_core.html.haml +++ b/app/views/sip_domains/_index_core.html.haml @@ -1,11 +1,12 @@ %table{:class => 'table table-striped'} - %tr - %th= t('sip_domains.index.host') - %th= t('sip_domains.index.realm') - - - - for sip_domain in sip_domains + %thead %tr - %td= sip_domain.host - %td= sip_domain.realm - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => sip_domain} \ No newline at end of file + %th= t('sip_domains.index.host') + %th= t('sip_domains.index.realm') + + %tbody + - for sip_domain in sip_domains + %tr + %td= sip_domain.host + %td= sip_domain.realm + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => sip_domain} \ No newline at end of file diff --git a/app/views/softkeys/_index_core.html.haml b/app/views/softkeys/_index_core.html.haml index 7194379..6c30803 100644 --- a/app/views/softkeys/_index_core.html.haml +++ b/app/views/softkeys/_index_core.html.haml @@ -1,14 +1,15 @@ %table{:class => 'table table-striped'} - %tr - %th= t('softkeys.index.function') - %th= t('softkeys.index.number') - %th= t('softkeys.index.label') - - - - for softkey in softkeys.order(:position) + %thead %tr - %td - =softkey.to_s - %td= softkey.number - %td= softkey.label - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => softkey.sip_account, :child => softkey} \ No newline at end of file + %th= t('softkeys.index.function') + %th= t('softkeys.index.number') + %th= t('softkeys.index.label') + + %tbody + - for softkey in softkeys.order(:position) + %tr + %td + =softkey.to_s + %td= softkey.number + %td= softkey.label + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => softkey.sip_account, :child => softkey} \ No newline at end of file diff --git a/app/views/system_messages/_index_core.html.haml b/app/views/system_messages/_index_core.html.haml index 361eb5f..b40cd0c 100644 --- a/app/views/system_messages/_index_core.html.haml +++ b/app/views/system_messages/_index_core.html.haml @@ -1,11 +1,12 @@ %table{:class => 'table table-striped'} - %tr - %th= t('system_messages.index.created_at') - %th= t('system_messages.index.content') - - - - for system_message in system_messages + %thead %tr - %td= system_message.created_at - %td= system_message.content - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => system_message} \ No newline at end of file + %th= t('system_messages.index.created_at') + %th= t('system_messages.index.content') + + %tbody + - for system_message in system_messages + %tr + %td= system_message.created_at + %td= system_message.content + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => system_message} \ No newline at end of file diff --git a/app/views/tenants/_gs_parameter_table.html.haml b/app/views/tenants/_gs_parameter_table.html.haml index 8afdb0e..1bcb914 100644 --- a/app/views/tenants/_gs_parameter_table.html.haml +++ b/app/views/tenants/_gs_parameter_table.html.haml @@ -1,24 +1,20 @@ - cache(['gs_parameters_tenant_overview_table', I18n.locale, tenant, GuiFunction.count, GuiFunction.reorder(:updated_at).last, GsParameter.count, GsParameter.reorder(:updated_at).last]) do %table{:class => 'table table-striped'} - %tr - %th - Funktion - %th - Anzahl - %th - Letztes Update + %thead + %tr + %th + Funktion + %th + Anzahl - %tr - %td - = t("gui_functions.name") - %td - = link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + GuiFunction.count.to_s, gui_functions_path - %td - = l GuiFunction.reorder(:updated_at).last.updated_at, :format => :short - %tr - %td - = t("gs_parameters.name") - %td - = link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + GsParameter.count.to_s, gs_parameters_path - %td - = l GsParameter.reorder(:updated_at).last.updated_at, :format => :short + %tbody + %tr + %td + = t("gui_functions.name") + %td + = link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + GuiFunction.count.to_s, gui_functions_path + %tr + %td + = t("gs_parameters.name") + %td + = link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + GsParameter.count.to_s, gs_parameters_path diff --git a/app/views/tenants/_index_core.html.haml b/app/views/tenants/_index_core.html.haml index 721d624..fd7fabc 100644 --- a/app/views/tenants/_index_core.html.haml +++ b/app/views/tenants/_index_core.html.haml @@ -1,17 +1,18 @@ %table{:class => 'table table-striped'} - %tr - %th= t('tenants.index.name') - %th= t('tenants.index.description') - - - - for tenant in tenants + %thead %tr - %td= tenant.name - %td= tenant.description - %td - - if current_user && current_user.current_tenant != tenant && current_user.tenants.include?(tenant) - = simple_form_for([current_user.current_tenant, current_user]) do |f| - = f.hidden_field :current_tenant_id, :value => tenant.id - .actions - = f.button :submit, conditional_t('tenants.switch_to_tenant') - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => tenant} \ No newline at end of file + %th= t('tenants.index.name') + %th= t('tenants.index.description') + + %tbody + - for tenant in tenants + %tr + %td= tenant.name + %td= tenant.description + %td + - if current_user && current_user.current_tenant != tenant && current_user.tenants.include?(tenant) + = simple_form_for([current_user.current_tenant, current_user]) do |f| + = f.hidden_field :current_tenant_id, :value => tenant.id + .actions + = f.button :submit, conditional_t('tenants.switch_to_tenant') + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => tenant} \ No newline at end of file diff --git a/app/views/tenants/_table_of_functions.html.haml b/app/views/tenants/_table_of_functions.html.haml index d7af224..3587eb8 100644 --- a/app/views/tenants/_table_of_functions.html.haml +++ b/app/views/tenants/_table_of_functions.html.haml @@ -1,53 +1,56 @@ - cache(['table_of_pbx_features', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.reorder(:updated_at).last, tenant.conferences.count, tenant.conferences.reorder(:updated_at).last, tenant.hunt_groups.count, tenant.hunt_groups.reorder(:updated_at).last, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.reorder(:updated_at).last]) do %table{:class => 'table table-striped'} - %tr - %th - Funktion - %th - Anzahl - %th - - cache(['table_of_pbx_features_callthroughs_row', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.reorder(:updated_at).last]) do + %thead %tr - %td - = t("callthroughs.name") - %td - - if tenant.callthroughs.any? - = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.callthroughs.count.to_s, tenant_callthroughs_path(tenant) - - else - = '-' - %td - = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Callthrough} - - cache(['table_of_pbx_features_conferences_row', I18n.locale, tenant, tenant.conferences.count, tenant.conferences.reorder(:updated_at).last]) do - %tr - %td - = t("conferences.name") - %td - - if tenant.conferences.any? - - = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.conferences.count.to_s, tenant_conferences_path(tenant) - - else - = '-' - %td - = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Conference} - - cache(['table_of_pbx_features_hunt_groups_row', I18n.locale, tenant, tenant.hunt_groups.count, tenant.hunt_groups.reorder(:updated_at).last]) do - %tr - %td - = t("hunt_groups.name") - %td - - if tenant.hunt_groups.any? - = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.hunt_groups.count.to_s, tenant_hunt_groups_path(tenant) - - else - = '-' - %td - = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => HuntGroup} - - cache(['table_of_pbx_features_automatic_call_distributors_row', I18n.locale, tenant, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.reorder(:updated_at).last]) do - %tr - %td - = t("automatic_call_distributors.name") - %td - - if tenant.automatic_call_distributors.any? - = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.automatic_call_distributors.count.to_s, tenant_automatic_call_distributors_path(tenant) - - else - = '-' - %td - = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => AutomaticCallDistributor} \ No newline at end of file + %th + Funktion + %th + Anzahl + %th + + %tbody + - cache(['table_of_pbx_features_callthroughs_row', I18n.locale, tenant, tenant.callthroughs.count, tenant.callthroughs.reorder(:updated_at).last]) do + %tr + %td + = t("callthroughs.name") + %td + - if tenant.callthroughs.any? + = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.callthroughs.count.to_s, tenant_callthroughs_path(tenant) + - else + = '-' + %td + = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Callthrough} + - cache(['table_of_pbx_features_conferences_row', I18n.locale, tenant, tenant.conferences.count, tenant.conferences.reorder(:updated_at).last]) do + %tr + %td + = t("conferences.name") + %td + - if tenant.conferences.any? + + = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.conferences.count.to_s, tenant_conferences_path(tenant) + - else + = '-' + %td + = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Conference} + - cache(['table_of_pbx_features_hunt_groups_row', I18n.locale, tenant, tenant.hunt_groups.count, tenant.hunt_groups.reorder(:updated_at).last]) do + %tr + %td + = t("hunt_groups.name") + %td + - if tenant.hunt_groups.any? + = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.hunt_groups.count.to_s, tenant_hunt_groups_path(tenant) + - else + = '-' + %td + = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => HuntGroup} + - cache(['table_of_pbx_features_automatic_call_distributors_row', I18n.locale, tenant, tenant.automatic_call_distributors.count, tenant.automatic_call_distributors.reorder(:updated_at).last]) do + %tr + %td + = t("automatic_call_distributors.name") + %td + - if tenant.automatic_call_distributors.any? + = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.automatic_call_distributors.count.to_s, tenant_automatic_call_distributors_path(tenant) + - else + = '-' + %td + = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => AutomaticCallDistributor} \ No newline at end of file diff --git a/app/views/user_group_memberships/_index_core.html.haml b/app/views/user_group_memberships/_index_core.html.haml index 5e6536b..c9674ba 100644 --- a/app/views/user_group_memberships/_index_core.html.haml +++ b/app/views/user_group_memberships/_index_core.html.haml @@ -1,13 +1,14 @@ %table{:class => 'table table-striped'} - %tr - %th= t('user_group_memberships.index.tenant') - %th= t('user_group_memberships.index.user_group') - %th= t('user_group_memberships.index.user') - - - - for user_group_membership in user_group_memberships + %thead %tr - %td= user_group_membership.user_group.tenant - %td= user_group_membership.user_group - %td= user_group_membership.user - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user_group_membership.user_group, :child => user_group_membership} \ No newline at end of file + %th= t('user_group_memberships.index.tenant') + %th= t('user_group_memberships.index.user_group') + %th= t('user_group_memberships.index.user') + + %tbody + - for user_group_membership in user_group_memberships + %tr + %td= user_group_membership.user_group.tenant + %td= user_group_membership.user_group + %td= user_group_membership.user + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user_group_membership.user_group, :child => user_group_membership} \ No newline at end of file diff --git a/app/views/user_groups/_index_core.html.haml b/app/views/user_groups/_index_core.html.haml index 941f9fa..6c830e9 100644 --- a/app/views/user_groups/_index_core.html.haml +++ b/app/views/user_groups/_index_core.html.haml @@ -1,28 +1,29 @@ - cache(['user_groups_table', I18n.locale, current_user, @user, user_groups, User.order(:updated_at).last, User.count, UserGroupMembership.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do %table{:class => 'table table-striped'} - %tr - %th= t('user_groups.index.name') - - if user_groups.pluck(:description).uniq != [nil] - %th= t('user_groups.index.description') - - if @user - %th= t('user_groups.index.tenant_id') - - else - %th= t('user_groups.index.members') - %th{:colspan => '3'} - - - for user_group in user_groups + %thead %tr - %td= user_group.name + %th= t('user_groups.index.name') - if user_groups.pluck(:description).uniq != [nil] - %td= user_group.description + %th= t('user_groups.index.description') - if @user - %td= user_group.tenant + %th= t('user_groups.index.tenant_id') - else - %td - =render 'users/listing', :users => user_group.users - - if user_group.users.any? - %br - - if (user_group.tenant.user_ids - user_group.user_ids).any? - = render :partial => 'shared/create_link', :locals => {:parent => user_group, :child_class => UserGroupMembership} + %th= t('user_groups.index.members') - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user_group.tenant, :child => user_group} + %tbody + - for user_group in user_groups + %tr + %td= user_group.name + - if user_groups.pluck(:description).uniq != [nil] + %td= user_group.description + - if @user + %td= user_group.tenant + - else + %td + =render 'users/listing', :users => user_group.users + - if user_group.users.any? + %br + - if (user_group.tenant.user_ids - user_group.user_ids).any? + = render :partial => 'shared/create_link', :locals => {:parent => user_group, :child_class => UserGroupMembership} + + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user_group.tenant, :child => user_group} diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index 7f2251a..87d3c4c 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -1,28 +1,29 @@ - cache(['user_table_row_inner_td', I18n.locale, current_user, users.reorder(:updated_at).last, users.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do %table{:class => 'table table-striped'} - %tr - %th - %th= t('users.index.user_name') - %th= t('users.index.email') - %th= t('users.index.first_name') - %th= t('users.index.last_name') - %th{:colspan => '3'} - - - for user in users - - cache(['user_table_row', I18n.locale, current_user, user]) do - %tr - %td - - if user.image? - =image_tag(user.image_url(:mini).to_s, :class => 'img-rounded') - - else - - if user.male? - = image_tag 'icons/user-male-16x.png', :class => 'img-rounded' + %thead + %tr + %th + %th= t('users.index.user_name') + %th= t('users.index.email') + %th= t('users.index.first_name') + %th= t('users.index.last_name') + + %tbody + - for user in users + - cache(['user_table_row', I18n.locale, current_user, user]) do + %tr + %td + - if user.image? + =image_tag(user.image_url(:mini).to_s, :class => 'img-rounded') - else - = image_tag 'icons/user-female-16x.png', :class => 'img-rounded' - %td= user.user_name - %td - - if !user.email.blank? - = mail_to user.email, (Haml::Engine.new("%i.icon-envelope").render + ' ' + user.email) - %td= user.first_name - %td= user.last_name - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @tenant, :child => user} \ No newline at end of file + - if user.male? + = image_tag 'icons/user-male-16x.png', :class => 'img-rounded' + - else + = image_tag 'icons/user-female-16x.png', :class => 'img-rounded' + %td= user.user_name + %td + - if !user.email.blank? + = mail_to user.email, (Haml::Engine.new("%i.icon-envelope").render + ' ' + user.email) + %td= user.first_name + %td= user.last_name + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @tenant, :child => user} \ No newline at end of file diff --git a/app/views/whitelists/_index_core.html.haml b/app/views/whitelists/_index_core.html.haml index 3333169..b5af08d 100644 --- a/app/views/whitelists/_index_core.html.haml +++ b/app/views/whitelists/_index_core.html.haml @@ -1,15 +1,16 @@ %table{:class => 'table table-striped'} - %tr - %th= t('whitelists.index.name') - %th= t('whitelists.index.phone_numbers') - - - - for whitelist in whitelists + %thead %tr - %td= whitelist.name || '-' - %td - = render 'phone_numbers/listing', :phone_numbers => whitelist.phone_numbers - %br - = render :partial => 'shared/create_link', :locals => {:parent => whitelist, :child_class => PhoneNumber, :short_link => true} + %th= t('whitelists.index.name') + %th= t('whitelists.index.phone_numbers') + + %tbody + - for whitelist in whitelists + %tr + %td= whitelist.name || '-' + %td + = render 'phone_numbers/listing', :phone_numbers => whitelist.phone_numbers + %br + = render :partial => 'shared/create_link', :locals => {:parent => whitelist, :child_class => PhoneNumber, :short_link => true} - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => whitelist.whitelistable, :child => whitelist} \ No newline at end of file + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => whitelist.whitelistable, :child => whitelist} \ No newline at end of file -- cgit v1.2.3