From 680073d4cf7619bddfb7f79ea9e538a33d9dcdee Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 26 Jan 2013 20:11:45 +0100 Subject: Refactoring --- app/views/access_authorizations/_index_core.html.haml | 2 +- app/views/acd_agents/_index_core.html.haml | 2 +- app/views/acd_callers/_index_core.html.haml | 2 +- app/views/addresses/_index_core.html.haml | 2 +- app/views/automatic_call_distributors/_index_core.html.haml | 2 +- app/views/automatic_call_distributors/show.html.haml | 2 +- app/views/call_forwards/_index_core.html.haml | 2 +- app/views/call_histories/_index_core.html.haml | 2 +- app/views/call_routes/_index_core.html.haml | 2 +- app/views/call_routes/index.html.haml | 2 +- app/views/calls/_index_core.html.haml | 2 +- app/views/callthroughs/_index_core.html.haml | 2 +- app/views/conference_invitees/_index_core.html.haml | 2 +- app/views/conferences/_index_core.html.haml | 2 +- app/views/config_polycom/_call_history.xml.haml | 2 +- app/views/config_polycom/_phone_book.xml.haml | 2 +- app/views/fax_accounts/_index_core.html.haml | 2 +- app/views/fax_documents/_index_core.html.haml | 2 +- app/views/freeswitch_voicemail_msgs/_index_core.html.haml | 2 +- app/views/gateway_parameters/_index_core.html.haml | 2 +- app/views/gateway_settings/_index_core.html.haml | 2 +- app/views/gateways/_index_core.html.haml | 2 +- app/views/gateways/show.html.haml | 2 +- app/views/gs_cluster_sync_log_entries/_index_core.html.haml | 2 +- app/views/gs_nodes/_index_core.html.haml | 2 +- app/views/gs_parameters/index.html.haml | 4 ++-- app/views/gs_parameters/show.html.haml | 2 +- app/views/gui_functions/_index_core.html.haml | 2 +- app/views/hunt_group_members/_index_core.html.haml | 2 +- app/views/hunt_groups/_index_core.html.haml | 2 +- app/views/manufacturers/_index_core.html.haml | 2 +- app/views/phone_book_entries/_index_core.html.haml | 2 +- app/views/phone_books/_index_core.html.haml | 2 +- app/views/phone_models/_index_core.html.haml | 2 +- app/views/phone_number_ranges/_index_core.html.haml | 2 +- app/views/phone_numbers/_index_core.html.haml | 2 +- app/views/phone_sip_accounts/_index_core.html.haml | 2 +- app/views/phones/_index_core.html.haml | 2 +- app/views/phones/show.html.haml | 2 +- app/views/ringtones/_index_core.html.haml | 2 +- app/views/route_elements/_index_core.html.haml | 2 +- app/views/sip_accounts/_index_core.html.haml | 2 +- app/views/sip_accounts/show.html.haml | 2 +- app/views/sip_domains/_index_core.html.haml | 2 +- app/views/softkeys/_index_core.html.haml | 2 +- app/views/system_messages/_index_core.html.haml | 2 +- app/views/tenants/_gs_parameter_table.html.haml | 2 +- app/views/tenants/_index_core.html.haml | 2 +- app/views/tenants/show.html.haml | 2 +- app/views/user_group_memberships/_index_core.html.haml | 2 +- app/views/user_groups/_index_core.html.haml | 2 +- app/views/user_groups/show.html.haml | 2 +- app/views/users/_index_core.html.haml | 2 +- app/views/users/show.html.haml | 2 +- app/views/voicemail_messages/_index_core.html.haml | 2 +- app/views/whitelists/_index_core.html.haml | 2 +- .../nifty/scaffold/templates/views/haml/_index_core.html.haml | 2 +- 57 files changed, 58 insertions(+), 58 deletions(-) diff --git a/app/views/access_authorizations/_index_core.html.haml b/app/views/access_authorizations/_index_core.html.haml index a36317a..69c3023 100644 --- a/app/views/access_authorizations/_index_core.html.haml +++ b/app/views/access_authorizations/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('access_authorizations.index.name') diff --git a/app/views/acd_agents/_index_core.html.haml b/app/views/acd_agents/_index_core.html.haml index e3d6f0a..c8967cd 100644 --- a/app/views/acd_agents/_index_core.html.haml +++ b/app/views/acd_agents/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('acd_agents.index.name') diff --git a/app/views/acd_callers/_index_core.html.haml b/app/views/acd_callers/_index_core.html.haml index 0a2e505..3b3327a 100644 --- a/app/views/acd_callers/_index_core.html.haml +++ b/app/views/acd_callers/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('acd_callers.index.channel_uuid') diff --git a/app/views/addresses/_index_core.html.haml b/app/views/addresses/_index_core.html.haml index 8b9e0c2..975fcee 100644 --- a/app/views/addresses/_index_core.html.haml +++ b/app/views/addresses/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('addresses.index.phone_book_entry_id') diff --git a/app/views/automatic_call_distributors/_index_core.html.haml b/app/views/automatic_call_distributors/_index_core.html.haml index 3634ec4..e264c29 100644 --- a/app/views/automatic_call_distributors/_index_core.html.haml +++ b/app/views/automatic_call_distributors/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('automatic_call_distributors.index.name') diff --git a/app/views/automatic_call_distributors/show.html.haml b/app/views/automatic_call_distributors/show.html.haml index b3eae2c..a461652 100644 --- a/app/views/automatic_call_distributors/show.html.haml +++ b/app/views/automatic_call_distributors/show.html.haml @@ -1,6 +1,6 @@ - content_for :title, t("automatic_call_distributors.show.page_title") -%table{:class => 'table table-striped'} +%table.table.table-striped %tbody %tr %td diff --git a/app/views/call_forwards/_index_core.html.haml b/app/views/call_forwards/_index_core.html.haml index 7a1672f..878e0e2 100644 --- a/app/views/call_forwards/_index_core.html.haml +++ b/app/views/call_forwards/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr - if !@phone_number diff --git a/app/views/call_histories/_index_core.html.haml b/app/views/call_histories/_index_core.html.haml index 550f055..f4e1565 100644 --- a/app/views/call_histories/_index_core.html.haml +++ b/app/views/call_histories/_index_core.html.haml @@ -1,6 +1,6 @@ = render :partial => "call_histories/navigation" -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml index a665b5d..2e9238e 100644 --- a/app/views/call_routes/_index_core.html.haml +++ b/app/views/call_routes/_index_core.html.haml @@ -1,5 +1,5 @@ - cache(['call_routes_table', call_routes.count, call_routes.reorder(:updated_at).last]) do - %table{:class => 'table table-striped'} + %table.table.table-striped %thead %tr %th= t('call_routes.index.name') diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml index bd4468c..488e1c7 100644 --- a/app/views/call_routes/index.html.haml +++ b/app/views/call_routes/index.html.haml @@ -1,7 +1,7 @@ - content_for :title, t("call_routes.index.page_title") - if @call_routes && @call_routes.count > 0 - %table{:class => 'table table-striped'} + %table.table.table-striped - @routing_tables.each do |routing_table| %tr %td{:colspan => 3} diff --git a/app/views/calls/_index_core.html.haml b/app/views/calls/_index_core.html.haml index c152470..10f79f1 100644 --- a/app/views/calls/_index_core.html.haml +++ b/app/views/calls/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('calls.index.uuid') diff --git a/app/views/callthroughs/_index_core.html.haml b/app/views/callthroughs/_index_core.html.haml index acb152e..d0d6ab6 100644 --- a/app/views/callthroughs/_index_core.html.haml +++ b/app/views/callthroughs/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('callthroughs.index.name') diff --git a/app/views/conference_invitees/_index_core.html.haml b/app/views/conference_invitees/_index_core.html.haml index 5e9c283..25eb4ec 100644 --- a/app/views/conference_invitees/_index_core.html.haml +++ b/app/views/conference_invitees/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('conference_invitees.index.phone_book_entry_id') diff --git a/app/views/conferences/_index_core.html.haml b/app/views/conferences/_index_core.html.haml index 6e82316..18ef6b0 100644 --- a/app/views/conferences/_index_core.html.haml +++ b/app/views/conferences/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('conferences.index.name') diff --git a/app/views/config_polycom/_call_history.xml.haml b/app/views/config_polycom/_call_history.xml.haml index 4ecb8fe..38ad844 100644 --- a/app/views/config_polycom/_call_history.xml.haml +++ b/app/views/config_polycom/_call_history.xml.haml @@ -3,7 +3,7 @@ %head %title= @phone_xml_object[:title] %body - %table{:class => 'table table-striped'}{ :border => 0 } + %table.table.table-striped{ :border => 0 } %tbody - @phone_xml_object[:entries].each do |entry| %tr diff --git a/app/views/config_polycom/_phone_book.xml.haml b/app/views/config_polycom/_phone_book.xml.haml index 3867f41..27110f5 100644 --- a/app/views/config_polycom/_phone_book.xml.haml +++ b/app/views/config_polycom/_phone_book.xml.haml @@ -3,7 +3,7 @@ %head %title= @phone_xml_object[:title] %body - %table{:class => 'table table-striped'}{ :border => 0 } + %table.table.table-striped{ :border => 0 } %tbody - @phone_xml_object[:entries].each do |entry| %tr diff --git a/app/views/fax_accounts/_index_core.html.haml b/app/views/fax_accounts/_index_core.html.haml index 2296d21..f86a4ac 100644 --- a/app/views/fax_accounts/_index_core.html.haml +++ b/app/views/fax_accounts/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th diff --git a/app/views/fax_documents/_index_core.html.haml b/app/views/fax_documents/_index_core.html.haml index d3abafa..1408eba 100644 --- a/app/views/fax_documents/_index_core.html.haml +++ b/app/views/fax_documents/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('fax_documents.index.sent_at') diff --git a/app/views/freeswitch_voicemail_msgs/_index_core.html.haml b/app/views/freeswitch_voicemail_msgs/_index_core.html.haml index d7b3b21..db0f7d7 100644 --- a/app/views/freeswitch_voicemail_msgs/_index_core.html.haml +++ b/app/views/freeswitch_voicemail_msgs/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('freeswitch_voicemail_msgs.index.created_epoch') diff --git a/app/views/gateway_parameters/_index_core.html.haml b/app/views/gateway_parameters/_index_core.html.haml index 355169e..5babd32 100644 --- a/app/views/gateway_parameters/_index_core.html.haml +++ b/app/views/gateway_parameters/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('gateway_parameters.index.name') diff --git a/app/views/gateway_settings/_index_core.html.haml b/app/views/gateway_settings/_index_core.html.haml index f5faf33..8098488 100644 --- a/app/views/gateway_settings/_index_core.html.haml +++ b/app/views/gateway_settings/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('gateway_settings.index.name') diff --git a/app/views/gateways/_index_core.html.haml b/app/views/gateways/_index_core.html.haml index bff25e0..1750212 100644 --- a/app/views/gateways/_index_core.html.haml +++ b/app/views/gateways/_index_core.html.haml @@ -1,5 +1,5 @@ - cache(['gateways_table', gateways.count, gateways.first, gateways.last]) do - %table{:class => 'table table-striped'} + %table.table.table-striped %thead %tr %th= t('gateways.index.name') diff --git a/app/views/gateways/show.html.haml b/app/views/gateways/show.html.haml index 25cca87..6cf09ec 100644 --- a/app/views/gateways/show.html.haml +++ b/app/views/gateways/show.html.haml @@ -1,6 +1,6 @@ - content_for :title, t("gateways.show.page_title") -%table{:class => 'table table-striped'} +%table.table.table-striped %tbody %tr %td 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 d491f51..4c088ff 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,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('gs_cluster_sync_log_entries.index.gs_node_id') diff --git a/app/views/gs_nodes/_index_core.html.haml b/app/views/gs_nodes/_index_core.html.haml index 863ab25..7da6881 100644 --- a/app/views/gs_nodes/_index_core.html.haml +++ b/app/views/gs_nodes/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('gs_nodes.index.name') diff --git a/app/views/gs_parameters/index.html.haml b/app/views/gs_parameters/index.html.haml index 9132cdd..1189a45 100644 --- a/app/views/gs_parameters/index.html.haml +++ b/app/views/gs_parameters/index.html.haml @@ -3,7 +3,7 @@ - if @gs_parameters && @gs_parameters.count > 0 - cache(['gs_parameters_table', I18n.locale, @gs_parameters_unordered.reorder(:updated_at).last, @gs_parameters_unordered.count]) do - if @sections - %table{:class => 'table table-striped'} + %table.table.table-striped - @sections.each do |section| %tr %td{:colspan => 3} @@ -11,5 +11,5 @@ -# Template Dependency: gs_parameters/_index_core = render "index_core", :gs_parameters => @gs_parameters.where(:section => section) - else - %table{:class => 'table table-striped'} + %table.table.table-striped = render "index_core", :gs_parameters => @gs_parameters diff --git a/app/views/gs_parameters/show.html.haml b/app/views/gs_parameters/show.html.haml index d04949b..706625f 100644 --- a/app/views/gs_parameters/show.html.haml +++ b/app/views/gs_parameters/show.html.haml @@ -1,7 +1,7 @@ - content_for :title, t("gs_parameters.show.page_title") - cache(@gs_parameter) do - %table{:class => 'table table-striped'} + %table.table.table-striped %tbody %tr %td diff --git a/app/views/gui_functions/_index_core.html.haml b/app/views/gui_functions/_index_core.html.haml index 7224bbc..00ae4d1 100644 --- a/app/views/gui_functions/_index_core.html.haml +++ b/app/views/gui_functions/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('gui_functions.index.category') diff --git a/app/views/hunt_group_members/_index_core.html.haml b/app/views/hunt_group_members/_index_core.html.haml index 611e74c..faef332 100644 --- a/app/views/hunt_group_members/_index_core.html.haml +++ b/app/views/hunt_group_members/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('hunt_group_members.index.name') diff --git a/app/views/hunt_groups/_index_core.html.haml b/app/views/hunt_groups/_index_core.html.haml index 9cc237b..6569829 100644 --- a/app/views/hunt_groups/_index_core.html.haml +++ b/app/views/hunt_groups/_index_core.html.haml @@ -1,6 +1,6 @@ - show_seconds = hunt_groups.map{|x| ! x.seconds_between_jumps.nil? }.include?(true) -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('hunt_groups.index.name') diff --git a/app/views/manufacturers/_index_core.html.haml b/app/views/manufacturers/_index_core.html.haml index 6b0acd2..16a168a 100644 --- a/app/views/manufacturers/_index_core.html.haml +++ b/app/views/manufacturers/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('manufacturers.index.name') diff --git a/app/views/phone_book_entries/_index_core.html.haml b/app/views/phone_book_entries/_index_core.html.haml index c7245a2..6669da6 100644 --- a/app/views/phone_book_entries/_index_core.html.haml +++ b/app/views/phone_book_entries/_index_core.html.haml @@ -1,7 +1,7 @@ = render :partial => "phone_book_entries/navigation" - cache(['phone_book_entries_table', I18n.locale, current_user, phone_book_entries]) do - %table{:class => 'table table-striped'} + %table.table.table-striped - for entry in phone_book_entries - cache(['phone_book_entries_table_tr', I18n.locale, current_user, entry]) do %tr diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml index a95ce7c..09ce3a3 100644 --- a/app/views/phone_books/_index_core.html.haml +++ b/app/views/phone_books/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('phone_books.index.name') diff --git a/app/views/phone_models/_index_core.html.haml b/app/views/phone_models/_index_core.html.haml index 0155f25..2e409ac 100644 --- a/app/views/phone_models/_index_core.html.haml +++ b/app/views/phone_models/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('phone_models.index.name') diff --git a/app/views/phone_number_ranges/_index_core.html.haml b/app/views/phone_number_ranges/_index_core.html.haml index 2751bdd..956f244 100644 --- a/app/views/phone_number_ranges/_index_core.html.haml +++ b/app/views/phone_number_ranges/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('phone_number_ranges.index.name') diff --git a/app/views/phone_numbers/_index_core.html.haml b/app/views/phone_numbers/_index_core.html.haml index e1a8602..80a1608 100644 --- a/app/views/phone_numbers/_index_core.html.haml +++ b/app/views/phone_numbers/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr - if phone_numbers.count > 1 && phone_numbers.first.phone_numberable_type == 'PhoneBookEntry' diff --git a/app/views/phone_sip_accounts/_index_core.html.haml b/app/views/phone_sip_accounts/_index_core.html.haml index 8178e6d..3656ad6 100644 --- a/app/views/phone_sip_accounts/_index_core.html.haml +++ b/app/views/phone_sip_accounts/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('phone_sip_accounts.index.phone_id') diff --git a/app/views/phones/_index_core.html.haml b/app/views/phones/_index_core.html.haml index af57792..90920dd 100644 --- a/app/views/phones/_index_core.html.haml +++ b/app/views/phones/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('phones.index.mac_address') diff --git a/app/views/phones/show.html.haml b/app/views/phones/show.html.haml index b34bdcd..6bb8996 100644 --- a/app/views/phones/show.html.haml +++ b/app/views/phones/show.html.haml @@ -2,7 +2,7 @@ .row .span5 - %table{:class => 'table table-striped'} + %table.table.table-striped %tr %td %strong= t('phones.show.mac_address') + ":" diff --git a/app/views/ringtones/_index_core.html.haml b/app/views/ringtones/_index_core.html.haml index 6996fde..715db3c 100644 --- a/app/views/ringtones/_index_core.html.haml +++ b/app/views/ringtones/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('ringtones.index.audio') diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml index 9b7e8d7..37c0656 100644 --- a/app/views/route_elements/_index_core.html.haml +++ b/app/views/route_elements/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('route_elements.index.var_in') diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml index c01d06e..34aac64 100644 --- a/app/views/sip_accounts/_index_core.html.haml +++ b/app/views/sip_accounts/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th diff --git a/app/views/sip_accounts/show.html.haml b/app/views/sip_accounts/show.html.haml index 65c0df4..8c4aa7e 100644 --- a/app/views/sip_accounts/show.html.haml +++ b/app/views/sip_accounts/show.html.haml @@ -1,6 +1,6 @@ - content_for :title, t("sip_accounts.show.page_title") -%table{:class => 'table table-striped'} +%table.table.table-striped %tbody %tr %td diff --git a/app/views/sip_domains/_index_core.html.haml b/app/views/sip_domains/_index_core.html.haml index 44c03c7..e280e9c 100644 --- a/app/views/sip_domains/_index_core.html.haml +++ b/app/views/sip_domains/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('sip_domains.index.host') diff --git a/app/views/softkeys/_index_core.html.haml b/app/views/softkeys/_index_core.html.haml index 6c30803..398ee51 100644 --- a/app/views/softkeys/_index_core.html.haml +++ b/app/views/softkeys/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('softkeys.index.function') diff --git a/app/views/system_messages/_index_core.html.haml b/app/views/system_messages/_index_core.html.haml index b40cd0c..7c9dab5 100644 --- a/app/views/system_messages/_index_core.html.haml +++ b/app/views/system_messages/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('system_messages.index.created_at') diff --git a/app/views/tenants/_gs_parameter_table.html.haml b/app/views/tenants/_gs_parameter_table.html.haml index 1bcb914..8b0d62c 100644 --- a/app/views/tenants/_gs_parameter_table.html.haml +++ b/app/views/tenants/_gs_parameter_table.html.haml @@ -1,5 +1,5 @@ - 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'} + %table.table.table-striped %thead %tr %th diff --git a/app/views/tenants/_index_core.html.haml b/app/views/tenants/_index_core.html.haml index fd7fabc..a220b1b 100644 --- a/app/views/tenants/_index_core.html.haml +++ b/app/views/tenants/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('tenants.index.name') diff --git a/app/views/tenants/show.html.haml b/app/views/tenants/show.html.haml index 532d5d5..818e584 100644 --- a/app/views/tenants/show.html.haml +++ b/app/views/tenants/show.html.haml @@ -1,6 +1,6 @@ - content_for :title, @tenant.name -%table{:class => 'table table-striped'} +%table.table.table-striped %tbody %tr %td diff --git a/app/views/user_group_memberships/_index_core.html.haml b/app/views/user_group_memberships/_index_core.html.haml index c9674ba..fd59faa 100644 --- a/app/views/user_group_memberships/_index_core.html.haml +++ b/app/views/user_group_memberships/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('user_group_memberships.index.tenant') diff --git a/app/views/user_groups/_index_core.html.haml b/app/views/user_groups/_index_core.html.haml index aa1497e..a85e8c4 100644 --- a/app/views/user_groups/_index_core.html.haml +++ b/app/views/user_groups/_index_core.html.haml @@ -1,5 +1,5 @@ - 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'} + %table.table.table-striped %thead %tr %th= t('user_groups.index.name') diff --git a/app/views/user_groups/show.html.haml b/app/views/user_groups/show.html.haml index 920f772..fd5414e 100644 --- a/app/views/user_groups/show.html.haml +++ b/app/views/user_groups/show.html.haml @@ -1,6 +1,6 @@ - content_for :title, t("user_groups.show.page_title") -%table{:class => 'table table-striped'} +%table.table.table-striped %tbody %tr %td diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml index 77b8c95..9d63afc 100644 --- a/app/views/users/_index_core.html.haml +++ b/app/views/users/_index_core.html.haml @@ -1,5 +1,5 @@ - 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'} + %table.table.table-striped %thead %tr %th diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 68fdc9d..0b9c06e 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -12,7 +12,7 @@ %a.thumbnail{:href => @user.image_url(:profile).to_s} =image_tag(@user.image_url(:profile), :alt => "Avatar #{@user}") - %table{:class => 'table table-striped'} + %table.table.table-striped %tbody %tr %td diff --git a/app/views/voicemail_messages/_index_core.html.haml b/app/views/voicemail_messages/_index_core.html.haml index ded7ea0..f03002d 100644 --- a/app/views/voicemail_messages/_index_core.html.haml +++ b/app/views/voicemail_messages/_index_core.html.haml @@ -1,7 +1,7 @@ = form_tag(destroy_multiple_sip_account_voicemail_messages_path(@sip_account), :method => :delete, :id => 'voicemail_message_form') do %header.entries-nav= render :partial => "voicemail_messages/navigation" .content - %table{:class => 'table table-striped'} + %table.table.table-striped - for voicemail_message in voicemail_messages %tr.voicemail-messages-entry{:id => "message_#{voicemail_message.uuid}"} diff --git a/app/views/whitelists/_index_core.html.haml b/app/views/whitelists/_index_core.html.haml index b5af08d..fb7246f 100644 --- a/app/views/whitelists/_index_core.html.haml +++ b/app/views/whitelists/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %thead %tr %th= t('whitelists.index.name') diff --git a/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml b/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml index a523d32..f142d15 100644 --- a/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml +++ b/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %tr <%- for attribute in model_attributes -%> %th= t('<%= plural_name %>.index.<%= attribute.name %>') -- cgit v1.2.3