Twitter Bootstrap stuff.

50 files changed, 108 insertions, 106 deletions

diff --git a/app/views/access_authorizations/_index_core.html.haml b/app/views/access_authorizations/_index_core.html.haml
index e195171..7469a1d 100644
--- a/app/views/access_authorizations/_index_core.html.haml
+++ b/app/views/access_authorizations/_index_core.html.haml
@@ -5,11 +5,11 @@
     %th= t('access_authorizations.index.pin')
     %th= t('callthroughs.index.phone_numbers')
 
-  - reset_cycle
+  
   - 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{:class => cycle('odd', 'even')}
+    %tr
       %td= access_authorization.name
       %td= access_authorization.login
       %td= access_authorization.pin
diff --git a/app/views/acd_agents/_index_core.html.haml b/app/views/acd_agents/_index_core.html.haml
index cc1ca7f..c082fd1 100644
--- a/app/views/acd_agents/_index_core.html.haml
+++ b/app/views/acd_agents/_index_core.html.haml
@@ -6,9 +6,9 @@
     %th= t('acd_agents.index.calls_answered')
     %th= t('acd_agents.index.destination')
 
-  - reset_cycle
+  
   - for acd_agent in acd_agents
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= acd_agent.name
       %td= acd_agent.status
       %td= acd_agent.last_call
diff --git a/app/views/acd_callers/_index_core.html.haml b/app/views/acd_callers/_index_core.html.haml
index 6a5f1b0..79aa974 100644
--- a/app/views/acd_callers/_index_core.html.haml
+++ b/app/views/acd_callers/_index_core.html.haml
@@ -8,9 +8,9 @@
     %th= t('acd_callers.index.callback_number')
     %th= t('acd_callers.index.callback_attempts')
 
-  - reset_cycle
+  
   - for acd_caller in acd_callers
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= acd_caller.channel_uuid
       %td= acd_caller.automatic_call_distributor_id
       %td= acd_caller.status
diff --git a/app/views/addresses/_index_core.html.haml b/app/views/addresses/_index_core.html.haml
index ab272ab..3645009 100644
--- a/app/views/addresses/_index_core.html.haml
+++ b/app/views/addresses/_index_core.html.haml
@@ -9,9 +9,9 @@
     %th= t('addresses.index.country_id')
     %th= t('addresses.index.position')
 
-  - reset_cycle
+  
   - for address in addresses
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= address.phone_book_entry_id
       %td= address.line1
       %td= address.line2
diff --git a/app/views/automatic_call_distributors/_form_core.html.haml b/app/views/automatic_call_distributors/_form_core.html.haml
index 77a38a6..d315ff3 100644
--- a/app/views/automatic_call_distributors/_form_core.html.haml
+++ b/app/views/automatic_call_distributors/_form_core.html.haml
@@ -1,5 +1,5 @@
 .inputs
-  = f.input :name, :label => t('automatic_call_distributors.form.name.label'), :hint => conditional_hint('automatic_call_distributors.form.name.hint')
+  = f.input :name, :label => t('automatic_call_distributors.form.name.label'), :hint => conditional_hint('automatic_call_distributors.form.name.hint'), :autofocus => true
   = f.input :strategy, :label => t('automatic_call_distributors.form.strategy.label'), :hint => conditional_hint('automatic_call_distributors.form.strategy.hint'), :include_blank => false, :as => :select, :collection => strategies
   = f.input :max_callers, :label => t('automatic_call_distributors.form.max_callers.label'), :hint => conditional_hint('automatic_call_distributors.form.max_callers.hint')
   = f.input :agent_timeout, :label => t('automatic_call_distributors.form.agent_timeout.label'), :hint => conditional_hint('automatic_call_distributors.form.agent_timeout.hint')
diff --git a/app/views/automatic_call_distributors/_index_core.html.haml b/app/views/automatic_call_distributors/_index_core.html.haml
index 7f27908..50908f4 100644
--- a/app/views/automatic_call_distributors/_index_core.html.haml
+++ b/app/views/automatic_call_distributors/_index_core.html.haml
@@ -10,9 +10,9 @@
     %th= t('automatic_call_distributors.index.phone_numbers')
     %th= t('automatic_call_distributors.index.acd_agents')
 
-  - reset_cycle
+  
   - for automatic_call_distributor in automatic_call_distributors
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= automatic_call_distributor.name
       %td= t("automatic_call_distributors.strategies.#{automatic_call_distributor.strategy}")
       %td= automatic_call_distributor.max_callers
diff --git a/app/views/call_forwards/_index_core.html.haml b/app/views/call_forwards/_index_core.html.haml
index 286cdae..27ad86f 100644
--- a/app/views/call_forwards/_index_core.html.haml
+++ b/app/views/call_forwards/_index_core.html.haml
@@ -10,9 +10,9 @@
       %th= t('call_forwards.index.depth')
     %th= t('call_forwards.index.active')
 
-  - reset_cycle
+  
   - for call_forward in call_forwards
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       - if !@phone_number
         %td= call_forward.phone_number
       %td= t("call_forward_cases.#{call_forward.call_forward_case.value}")
diff --git a/app/views/call_histories/_index_core.html.haml b/app/views/call_histories/_index_core.html.haml
index f799ead..9a52148 100644
--- a/app/views/call_histories/_index_core.html.haml
+++ b/app/views/call_histories/_index_core.html.haml
@@ -3,7 +3,7 @@
   .content
     - cache(['call_history_table', I18n.locale, @sip_account, call_histories.first, call_histories.last, call_histories.count]) do
       %table{:class => 'table table-striped'}
-        - reset_cycle
+        
         - for call_history in call_histories
           - tr_background_colour = cycle('odd', 'even')
           - cache(['call_history_table_row', I18n.locale, call_history, tr_background_colour]) do
diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index e0ca39b..222303b 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -5,7 +5,7 @@
       %th= t('call_routes.index.endpoint_type')
       %th= t('call_routes.index.endpoint_id')
 
-    - reset_cycle
+    
     - for call_route in call_routes
       %tr
         - cache(['call_route_single_table_row_within_tr', call_route, call_routes.count]) do 
diff --git a/app/views/calls/_index_core.html.haml b/app/views/calls/_index_core.html.haml
index b7a25a4..09b7da6 100644
--- a/app/views/calls/_index_core.html.haml
+++ b/app/views/calls/_index_core.html.haml
@@ -2,8 +2,8 @@
   %tr
     %th= t('calls.index.uuid')
 
-  - reset_cycle
+  
   - for call in @calls
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td
         = call.uuid
diff --git a/app/views/callthroughs/_index_core.html.haml b/app/views/callthroughs/_index_core.html.haml
index 39c3719..d1c171b 100644
--- a/app/views/callthroughs/_index_core.html.haml
+++ b/app/views/callthroughs/_index_core.html.haml
@@ -6,9 +6,9 @@
     - if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
       %th= t('callthroughs.index.whitelist_phone_numbers')
 
-  - reset_cycle
+  
   - for callthrough in callthroughs
-    %tr{:class => cycle('odd', 'even')}
+    %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
diff --git a/app/views/conference_invitees/_index_core.html.haml b/app/views/conference_invitees/_index_core.html.haml
index 55d903d..1d6ab2e 100644
--- a/app/views/conference_invitees/_index_core.html.haml
+++ b/app/views/conference_invitees/_index_core.html.haml
@@ -6,9 +6,9 @@
     %th= t('conference_invitees.index.speaker')
     %th= t('conference_invitees.index.moderator')
 
-  - reset_cycle
+  
   - for conference_invitee in conference_invitees
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= conference_invitee.phone_book_entry || '-'
       %td= conference_invitee.phone_number
       %td= conference_invitee.pin
diff --git a/app/views/conferences/_index_core.html.haml b/app/views/conferences/_index_core.html.haml
index 2a83b29..50ea1c8 100644
--- a/app/views/conferences/_index_core.html.haml
+++ b/app/views/conferences/_index_core.html.haml
@@ -11,10 +11,10 @@
     %th= t('conferences.index.number_of_invitees')
     %th= t('conferences.index.flags')
 
-  - reset_cycle
+  
   - for conference in conferences
     - parent = conference.conferenceable
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= conference.name
       - if !conferences.respond_to?('where') || conferences.where(:start => nil).where(:end => nil).count != conferences.count
         %td
diff --git a/app/views/fax_accounts/_index_core.html.haml b/app/views/fax_accounts/_index_core.html.haml
index 48e4038..5a04bf0 100644
--- a/app/views/fax_accounts/_index_core.html.haml
+++ b/app/views/fax_accounts/_index_core.html.haml
@@ -13,9 +13,9 @@
       %small
         = t('fax_accounts.index.last_update')
 
-  - reset_cycle
+  
   - for fax_account in fax_accounts
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= truncate(fax_account.name, :length => 15)
       %td
         =render 'phone_numbers/listing', :phone_numbers => fax_account.phone_numbers.order(:number)
diff --git a/app/views/fax_documents/_index_core.html.haml b/app/views/fax_documents/_index_core.html.haml
index 747b67f..d75b80a 100644
--- a/app/views/fax_documents/_index_core.html.haml
+++ b/app/views/fax_documents/_index_core.html.haml
@@ -9,7 +9,7 @@
       = t('fax_documents.index.remote_station_id')
     %th= t('fax_documents.index.thumbnails')
 
-  - reset_cycle
+  
   - for fax_document in fax_documents
     %tr{:class => cycle('odd', 'even'), :id => "fax_document_#{fax_document.id}"}
       - if fax_document.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 9d3d554..2ada034 100644
--- a/app/views/freeswitch_voicemail_msgs/_index_core.html.haml
+++ b/app/views/freeswitch_voicemail_msgs/_index_core.html.haml
@@ -4,9 +4,9 @@
     %th= t('freeswitch_voicemail_msgs.index.message_len')
     %th= t('freeswitch_voicemail_msgs.index.file_path')
 
-  - reset_cycle
+  
   - for freeswitch_voicemail_msg in freeswitch_voicemail_msgs
-    %tr{:class => cycle('odd', 'even')}
+    %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 fda01b3..0d00aaf 100644
--- a/app/views/gateway_parameters/_index_core.html.haml
+++ b/app/views/gateway_parameters/_index_core.html.haml
@@ -4,9 +4,9 @@
     %th= t('gateway_parameters.index.value')
     %th= t('gateway_parameters.index.description')
 
-  - reset_cycle
+  
   - for gateway_parameter in gateway_parameters
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= gateway_parameter.name
       %td= gateway_parameter.value
       %td= gateway_parameter.description
diff --git a/app/views/gateway_settings/_index_core.html.haml b/app/views/gateway_settings/_index_core.html.haml
index 0743bcd..ded7eb8 100644
--- a/app/views/gateway_settings/_index_core.html.haml
+++ b/app/views/gateway_settings/_index_core.html.haml
@@ -4,9 +4,9 @@
     %th= t('gateway_settings.index.value')
     %th= t('gateway_settings.index.description')
 
-  - reset_cycle
+  
   - for gateway_setting in gateway_settings
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= gateway_setting.name
       %td= gateway_setting.value
       %td= gateway_setting.description
diff --git a/app/views/gateways/_index_core.html.haml b/app/views/gateways/_index_core.html.haml
index fc03eb1..3fcf064 100644
--- a/app/views/gateways/_index_core.html.haml
+++ b/app/views/gateways/_index_core.html.haml
@@ -7,9 +7,9 @@
       %th= t('gateways.index.outbound')
       %th= t('gateways.index.description')
 
-    - reset_cycle
+    
     - for gateway in gateways
-      %tr{:class => cycle('odd', 'even')}
+      %tr
         - cache(['gateway_single_table_row_within_tr', gateway, gateways.count]) do 
           %td= gateway.name
           %td= gateway.technology
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 b099b5f..c9a3e50 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
@@ -6,9 +6,9 @@
     %th= t('gs_cluster_sync_log_entries.index.content')
     %th= t('gs_cluster_sync_log_entries.index.status')
 
-  - reset_cycle
+  
   - for gs_cluster_sync_log_entry in gs_cluster_sync_log_entries
-    %tr{:class => cycle('odd', 'even')}
+    %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
diff --git a/app/views/gs_nodes/_index_core.html.haml b/app/views/gs_nodes/_index_core.html.haml
index 97dc9df..0f1a51c 100644
--- a/app/views/gs_nodes/_index_core.html.haml
+++ b/app/views/gs_nodes/_index_core.html.haml
@@ -7,9 +7,9 @@
     %th= t('gs_nodes.index.push_updates_to')
     %th= t('gs_nodes.index.accepts_updates_from')
 
-  - reset_cycle
+  
   - for gs_node in gs_nodes
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= gs_node.name
       %td= gs_node.ip_address
       %td= gs_node.site
diff --git a/app/views/gs_parameters/_index_core.html.haml b/app/views/gs_parameters/_index_core.html.haml
index a3f8e1c..3d5f3cf 100644
--- a/app/views/gs_parameters/_index_core.html.haml
+++ b/app/views/gs_parameters/_index_core.html.haml
@@ -5,10 +5,10 @@
       %th= t('gs_parameters.index.section')
     %th= t('gs_parameters.index.value')
 
-  - reset_cycle
+  
   - for gs_parameter in gs_parameters
     - cache(['gs_parameters_table_single_row', gs_parameter]) do 
-      %tr{:class => cycle('odd', 'even')}
+      %tr
         %td= gs_parameter.name
         - if !@sections
           %td= gs_parameter.section
diff --git a/app/views/gui_functions/_index_core.html.haml b/app/views/gui_functions/_index_core.html.haml
index cb53d4f..0d9454e 100644
--- a/app/views/gui_functions/_index_core.html.haml
+++ b/app/views/gui_functions/_index_core.html.haml
@@ -5,9 +5,9 @@
     - @user_groups.each do |user_group|
       %th= user_group
 
-  - reset_cycle
+  
   - for gui_function in gui_functions
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       - cache(['gui_functions_table_row', I18n.locale, gui_function]) do
         %td= gui_function.category
         %td
diff --git a/app/views/hunt_group_members/_index_core.html.haml b/app/views/hunt_group_members/_index_core.html.haml
index f9a3d28..c6b7e4a 100644
--- a/app/views/hunt_group_members/_index_core.html.haml
+++ b/app/views/hunt_group_members/_index_core.html.haml
@@ -5,9 +5,9 @@
     %th= t('hunt_group_members.index.can_switch_status_itself')
     %th= t('hunt_group_members.index.phone_numbers')
 
-  - reset_cycle
+  
   - for hunt_group_member in hunt_group_members
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= hunt_group_member.name
       %td= hunt_group_member.active
       %td= hunt_group_member.can_switch_status_itself
diff --git a/app/views/hunt_groups/_index_core.html.haml b/app/views/hunt_groups/_index_core.html.haml
index b820ad0..16b1b5d 100644
--- a/app/views/hunt_groups/_index_core.html.haml
+++ b/app/views/hunt_groups/_index_core.html.haml
@@ -9,9 +9,9 @@
     %th= t('hunt_groups.index.phone_numbers')
     %th= t('hunt_groups.index.hunt_group_members')
 
-  - reset_cycle
+  
   - for hunt_group in hunt_groups
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= hunt_group.name
       %td= t("hunt_groups.strategies.#{hunt_group.strategy}")
       - if show_seconds
diff --git a/app/views/manufacturers/_index_core.html.haml b/app/views/manufacturers/_index_core.html.haml
index 5c80ae9..5efa5d9 100644
--- a/app/views/manufacturers/_index_core.html.haml
+++ b/app/views/manufacturers/_index_core.html.haml
@@ -5,9 +5,9 @@
     %th= t('manufacturers.index.homepage_url')
     %th= t('manufacturers.index.phone_models')
 
-  - reset_cycle
+  
   - for manufacturer in manufacturers
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= manufacturer.name
       %td= manufacturer.ieee_name
       %td
diff --git a/app/views/phone_book_entries/_index_core.de.html.haml b/app/views/phone_book_entries/_index_core.de.html.haml
index bc8d118..fb1dd6f 100644
--- a/app/views/phone_book_entries/_index_core.de.html.haml
+++ b/app/views/phone_book_entries/_index_core.de.html.haml
@@ -3,7 +3,7 @@
   %header.entries-nav= render :partial => "phone_book_entries/navigation"
   .content
     - cache(['phone_book_entries_table', I18n.locale, current_user, phone_book_entries]) do
-      - reset_cycle
+      
       %table{:class => 'table table-striped'}
         - for entry in phone_book_entries
           - cache(['phone_book_entries_table_tr', I18n.locale, current_user, entry]) do
diff --git a/app/views/phone_book_entries/_index_core.html.haml b/app/views/phone_book_entries/_index_core.html.haml
index 0e687f9..1e24b5d 100644
--- a/app/views/phone_book_entries/_index_core.html.haml
+++ b/app/views/phone_book_entries/_index_core.html.haml
@@ -3,8 +3,8 @@
   %header.entries-nav= render :partial => "phone_book_entries/navigation"
   .content
     - cache(['phone_book_entries_table', I18n.locale, current_user, phone_book_entries]) do
-      - reset_cycle
-      - reset_cycle
+      
+      
       %table{:class => 'table table-striped'}
         - for entry in phone_book_entries
           - cache(['phone_book_entries_table_tr', I18n.locale, current_user, entry]) do
diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml
index beed729..fdbe864 100644
--- a/app/views/phone_books/_index_core.html.haml
+++ b/app/views/phone_books/_index_core.html.haml
@@ -4,9 +4,9 @@
     %th= t('phone_books.index.description')
     %th= t('phone_books.index.count')
 
-  - reset_cycle
+  
   - for phone_book in phone_books
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= phone_book.name
       %td= phone_book.description
       %td
diff --git a/app/views/phone_models/_index_core.html.haml b/app/views/phone_models/_index_core.html.haml
index 37cceb8..b899a5c 100644
--- a/app/views/phone_models/_index_core.html.haml
+++ b/app/views/phone_models/_index_core.html.haml
@@ -5,9 +5,9 @@
     %th= t('phone_models.index.product_homepage_url')
     %th= t('phone_models.index.number_of_phones')
 
-  - reset_cycle
+  
   - for phone_model in phone_models
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= phone_model.name
       %td
         - if phone_model.product_manual_homepage_url
diff --git a/app/views/phone_number_ranges/_index_core.html.haml b/app/views/phone_number_ranges/_index_core.html.haml
index fdd9f63..b378be8 100644
--- a/app/views/phone_number_ranges/_index_core.html.haml
+++ b/app/views/phone_number_ranges/_index_core.html.haml
@@ -5,9 +5,9 @@
     %th= t('phone_number_ranges.index.numbers')
     %th= t('phone_number_ranges.index.amount')
 
-  - reset_cycle
+  
   - for phone_number_range in phone_number_ranges
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= t("phone_number_ranges.ranges.#{phone_number_range}.label")
       %td= t("phone_number_ranges.ranges.#{phone_number_range}.description")
       %td
diff --git a/app/views/phone_numbers/_index_core.html.haml b/app/views/phone_numbers/_index_core.html.haml
index c29812b..b8540e7 100644
--- a/app/views/phone_numbers/_index_core.html.haml
+++ b/app/views/phone_numbers/_index_core.html.haml
@@ -4,9 +4,9 @@
       %th= t('phone_numbers.index.name')
     %th= t('phone_numbers.index.number')
 
-  - reset_cycle
+  
   - for phone_number in phone_numbers.order(:position)
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       - if phone_number.phone_numberable_type == 'PhoneBookEntry'
         %td= phone_number.name
       %td= 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 3fed147..5aee417 100644
--- a/app/views/phone_sip_accounts/_index_core.html.haml
+++ b/app/views/phone_sip_accounts/_index_core.html.haml
@@ -4,9 +4,9 @@
     %th= t('phone_sip_accounts.index.sip_account_id')
     %th= t('phone_sip_accounts.index.position')
 
-  - reset_cycle
+  
   - for phone_sip_account in phone_sip_accounts
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= phone_sip_account.phone
       %td= phone_sip_account.sip_account
       %td= phone_sip_account.position
diff --git a/app/views/phones/_index_core.html.haml b/app/views/phones/_index_core.html.haml
index 8dc875c..fc1ad19 100644
--- a/app/views/phones/_index_core.html.haml
+++ b/app/views/phones/_index_core.html.haml
@@ -5,9 +5,9 @@
     %th= t('phones.index.hot_deskable')
     %th= t('phones.index.ip_address')
 
-  - reset_cycle
+  
   - for phone in phones
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= phone.pretty_mac_address
       %td= phone.phone_model
       %td= phone.hot_deskable
diff --git a/app/views/ringtones/_index_core.html.haml b/app/views/ringtones/_index_core.html.haml
index e01914d..e3b9a32 100644
--- a/app/views/ringtones/_index_core.html.haml
+++ b/app/views/ringtones/_index_core.html.haml
@@ -3,9 +3,9 @@
     %th= t('ringtones.index.audio')
     %th= t('ringtones.index.bellcore_id')
 
-  - reset_cycle
+  
   - for ringtone in ringtones
-    %tr{:class => cycle('odd', 'even')}
+    %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 f769c01..5336057 100644
--- a/app/views/route_elements/_index_core.html.haml
+++ b/app/views/route_elements/_index_core.html.haml
@@ -7,9 +7,9 @@
     %th= t('route_elements.index.action')
     %th= t('route_elements.index.mandatory')
 
-  - reset_cycle
+  
   - for route_element in route_elements
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= route_element.var_in
       %td= route_element.var_out
       %td= route_element.pattern
diff --git a/app/views/shared/_create_link.html.haml b/app/views/shared/_create_link.html.haml
index e5bc840..0711ddf 100644
--- a/app/views/shared/_create_link.html.haml
+++ b/app/views/shared/_create_link.html.haml
@@ -8,7 +8,8 @@
       - else
         %a.btn.btn-mini.btn-primary{:href => method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) }
           %i.icon-plus.icon-white
-          =t("#{child_class.name.underscore.pluralize}.index.actions.create_for", :resource => parent)
+          / =t("#{child_class.name.underscore.pluralize}.index.actions.create_for", :resource => parent.to_s)
+          =t("#{child_class.name.underscore.pluralize}.index.actions.create")          
 
 - elsif !(defined? child_class).nil?
   - if can? :create, child_class
diff --git a/app/views/shared/_index_view_edit_destroy_part.html.haml b/app/views/shared/_index_view_edit_destroy_part.html.haml
index 5bc715b..00b9e8a 100644
--- a/app/views/shared/_index_view_edit_destroy_part.html.haml
+++ b/app/views/shared/_index_view_edit_destroy_part.html.haml
@@ -1,39 +1,40 @@
-- style = 'width:70px'
+- style = 'width:90px'
+- style = ''
 
 - if !(defined? parent).nil? && !(defined? child).nil?
   - if can? :show, child
     %td{ :style => style }
       %a.btn.btn-mini.btn-success{:href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) }
         %i.icon-info-sign.icon-white
-        =t("#{child.class.name.underscore.pluralize}.actions.show")
+        =t("#{child.class.name.underscore.pluralize}.index.actions.show")
 
   - if can? :edit, child
     %td{ :style => style }
       %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")
+        =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
 
   - if can? :destroy, child
     %td{ :style => style }
-      %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")
+      %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"}
+        %i.icon-remove.icon-white
+        =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
 
 - elsif !(defined? child).nil?
   - if can? :show, child
     %td{ :style => style }
       %a.btn.btn-mini.btn-success{:href => method( :"#{child.class.name.underscore}_path" ).(child) }
         %i.icon-info-sign.icon-white
-        =t("#{child.class.name.underscore.pluralize}.actions.show")
+        =t("#{child.class.name.underscore.pluralize}.index.actions.show")
 
   - if can? :edit, child
     %td{ :style => style }
       %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")
+        =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
         
   - if can? :destroy, child
     %td{ :style => style }
-      %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"}
+      %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.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
+        =t("#{child.class.name.underscore.pluralize}.index.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 f8dac6f..cac29d0 100644
--- a/app/views/sip_accounts/_index_core.html.haml
+++ b/app/views/sip_accounts/_index_core.html.haml
@@ -4,15 +4,14 @@
     %th= t('sip_accounts.index.caller_name')
     %th= t('sip_accounts.index.phone_numbers')
     %th= t('phones.name')
-
-  - reset_cycle
+  
   - for sip_account in sip_accounts
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td
         - if sip_account.registration
-          =image_tag 'icons/phone-down-green-32x.png'
+          %i.icon-ok
         - else
-          =image_tag 'icons/phone-down-grey-32x.png'
+          %i.icon-thumbs-down
       %td
         = sip_account.caller_name
       - phone_numbers = sip_account.phone_numbers
diff --git a/app/views/sip_domains/_index_core.html.haml b/app/views/sip_domains/_index_core.html.haml
index 873ffc0..d26fd1b 100644
--- a/app/views/sip_domains/_index_core.html.haml
+++ b/app/views/sip_domains/_index_core.html.haml
@@ -3,9 +3,9 @@
     %th= t('sip_domains.index.host')
     %th= t('sip_domains.index.realm')
 
-  - reset_cycle
+  
   - for sip_domain in sip_domains
-    %tr{:class => cycle('odd', 'even')}
+    %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 ba79d22..7194379 100644
--- a/app/views/softkeys/_index_core.html.haml
+++ b/app/views/softkeys/_index_core.html.haml
@@ -4,9 +4,9 @@
     %th= t('softkeys.index.number')
     %th= t('softkeys.index.label')
 
-  - reset_cycle
+  
   - for softkey in softkeys.order(:position)
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td
         =softkey.to_s
       %td= softkey.number
diff --git a/app/views/system_messages/_index_core.html.haml b/app/views/system_messages/_index_core.html.haml
index 7c4485f..361eb5f 100644
--- a/app/views/system_messages/_index_core.html.haml
+++ b/app/views/system_messages/_index_core.html.haml
@@ -3,9 +3,9 @@
     %th= t('system_messages.index.created_at')
     %th= t('system_messages.index.content')
 
-  - reset_cycle
+  
   - for system_message in system_messages
-    %tr{:class => cycle('odd', 'even')}
+    %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/_index_core.html.haml b/app/views/tenants/_index_core.html.haml
index 59d7e6d..721d624 100644
--- a/app/views/tenants/_index_core.html.haml
+++ b/app/views/tenants/_index_core.html.haml
@@ -3,9 +3,9 @@
     %th= t('tenants.index.name')
     %th= t('tenants.index.description')
 
-  - reset_cycle
+  
   - for tenant in tenants
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= tenant.name
       %td= tenant.description
       %td
diff --git a/app/views/tenants/_table_of_functions.html.haml b/app/views/tenants/_table_of_functions.html.haml
index 271bf1e..d7af224 100644
--- a/app/views/tenants/_table_of_functions.html.haml
+++ b/app/views/tenants/_table_of_functions.html.haml
@@ -12,7 +12,7 @@
           = t("callthroughs.name")
         %td
           - if tenant.callthroughs.any?
-            = link_to tenant.callthroughs.count.to_s, tenant_callthroughs_path(tenant)
+            = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.callthroughs.count.to_s, tenant_callthroughs_path(tenant)
           - else
             = '-'
         %td
@@ -23,7 +23,8 @@
           = t("conferences.name")
         %td
           - if tenant.conferences.any?
-            = link_to tenant.conferences.count.to_s, tenant_conferences_path(tenant)
+            
+            = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.conferences.count.to_s, tenant_conferences_path(tenant)
           - else
             = '-'
         %td
@@ -34,7 +35,7 @@
           = t("hunt_groups.name")
         %td
           - if tenant.hunt_groups.any?
-            = link_to tenant.hunt_groups.count.to_s, tenant_hunt_groups_path(tenant)
+            = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.hunt_groups.count.to_s, tenant_hunt_groups_path(tenant)
           - else
             = '-'
         %td
@@ -45,7 +46,7 @@
           = t("automatic_call_distributors.name")
         %td
           - if tenant.automatic_call_distributors.any?
-            = link_to tenant.automatic_call_distributors.count.to_s, tenant_automatic_call_distributors_path(tenant)
+            = link_to Haml::Engine.new("%i.icon-list").render + ' ' + tenant.automatic_call_distributors.count.to_s, tenant_automatic_call_distributors_path(tenant)
           - else
             = '-'
         %td
diff --git a/app/views/user_group_memberships/_index_core.html.haml b/app/views/user_group_memberships/_index_core.html.haml
index 801532a..5e6536b 100644
--- a/app/views/user_group_memberships/_index_core.html.haml
+++ b/app/views/user_group_memberships/_index_core.html.haml
@@ -4,9 +4,9 @@
     %th= t('user_group_memberships.index.user_group')
     %th= t('user_group_memberships.index.user')
 
-  - reset_cycle
+  
   - for user_group_membership in user_group_memberships
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= user_group_membership.user_group.tenant
       %td= user_group_membership.user_group
       %td= user_group_membership.user
diff --git a/app/views/user_groups/_index_core.html.haml b/app/views/user_groups/_index_core.html.haml
index a12cf96..49cd858 100644
--- a/app/views/user_groups/_index_core.html.haml
+++ b/app/views/user_groups/_index_core.html.haml
@@ -9,9 +9,9 @@
       - else
         %th= t('user_groups.index.members')
 
-    - reset_cycle
+    
     - for user_group in user_groups
-      %tr{:class => cycle('odd', 'even')}
+      %tr
         %td= user_group.name
         - if user_groups.pluck(:description).uniq != [nil]
           %td= user_group.description
diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml
index b364bd2..b492a1d 100644
--- a/app/views/users/_index_core.html.haml
+++ b/app/views/users/_index_core.html.haml
@@ -7,9 +7,9 @@
       %th= t('users.index.first_name')
       %th= t('users.index.last_name')
 
-    - reset_cycle
+    
     - for user in users
-      %tr{:class => cycle('odd', 'even')}
+      %tr
         - cache(['user_table_row_inner_td', I18n.locale, current_user, user]) do
           %td 
             = image_tag user.image_url(:mini).to_s if user.image_url(:mini)
diff --git a/app/views/voicemail_messages/_index_core.html.haml b/app/views/voicemail_messages/_index_core.html.haml
index 3f7680c..e6e6398 100644
--- a/app/views/voicemail_messages/_index_core.html.haml
+++ b/app/views/voicemail_messages/_index_core.html.haml
@@ -2,7 +2,7 @@
   %header.entries-nav= render :partial => "voicemail_messages/navigation"
   .content
     %table{:class => 'table table-striped'}
-      - reset_cycle
+      
       - for voicemail_message in voicemail_messages
         %tr.voicemail-messages-entry{:class => cycle('odd', 'even'), :id => "message_#{voicemail_message.uuid}"}
           %td.select_box= check_box_tag("selected_uuids[]", voicemail_message.uuid, false, :uuid => "select_item_#{voicemail_message.uuid}", :class => 'select_item')
diff --git a/app/views/whitelists/_index_core.html.haml b/app/views/whitelists/_index_core.html.haml
index 998a681..3333169 100644
--- a/app/views/whitelists/_index_core.html.haml
+++ b/app/views/whitelists/_index_core.html.haml
@@ -3,9 +3,9 @@
     %th= t('whitelists.index.name')
     %th= t('whitelists.index.phone_numbers')
 
-  - reset_cycle
+  
   - for whitelist in whitelists
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= whitelist.name || '-'
       %td
         = render 'phone_numbers/listing', :phone_numbers => whitelist.phone_numbers
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 46543b4..a523d32 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
@@ -4,9 +4,9 @@
     %th= t('<%= plural_name %>.index.<%= attribute.name %>')
     <%- end -%>
 
-  - reset_cycle
+  
   - for <%= instance_name %> in <%= instances_name %>
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       <%- for attribute in model_attributes -%>
       %td= <%= instance_name %>.<%= attribute.name %>
       <%- end -%>