Merge branch 'develop' of github.com:amooma/GS5 into develop

2 files changed, 22 insertions, 18 deletions

diff --git a/app/views/sip_accounts/show.html.haml b/app/views/sip_accounts/show.html.haml
index 72e10df..f48d927 100644
--- a/app/views/sip_accounts/show.html.haml
+++ b/app/views/sip_accounts/show.html.haml
@@ -65,16 +65,16 @@
 
 = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @sip_account.sip_accountable, :child => @sip_account }
 
-- if @sip_account.phone_numbers.count > 0 || can?(:create, @sip_account.phone_numbers.build)
+- if @sip_account.phone_numbers.any? || can?(:create, @sip_account.phone_numbers.build)
   %h2= t('phone_numbers.index.page_title')
-  - if @sip_account.phone_numbers.count > 0
+  - if @sip_account.phone_numbers.any?
     = render "phone_numbers/index_core", :phone_numbers => @sip_account.phone_numbers
     %br
   = render :partial => 'shared/create_link', :locals => { :parent => @sip_account, :child_class => PhoneNumber }
 
-- if @sip_account.softkeys.count > 0 || can?(:create, @sip_account.softkeys.build)
+- if @sip_account.softkeys.any? || can?(:create, @sip_account.softkeys.build)
   %h2= t("softkeys.index.page_title")
-  - if @sip_account.softkeys.count > 0
+  - if @sip_account.softkeys.any?
     = render "softkeys/index_core", :softkeys => @sip_account.softkeys
     %br
   = render :partial => 'shared/create_link', :locals => { :parent => @sip_account, :child_class => Softkey }
\ 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 398ee51..4ebb29c 100644
--- a/app/views/softkeys/_index_core.html.haml
+++ b/app/views/softkeys/_index_core.html.haml
@@ -1,15 +1,19 @@
-%table.table.table-striped
-  %thead
-    %tr
-      %th= t('softkeys.index.function')
-      %th= t('softkeys.index.number')
-      %th= t('softkeys.index.label')
-
-  %tbody
-    - for softkey in softkeys.order(:position)
+- cache(['softkeys', I18n.locale, current_user, softkeys]) do
+  %table.table.table-striped{ :id => "softkeys" }
+    %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
+        %th= t('softkeys.index.function')
+        %th= t('softkeys.index.number')
+        %th= t('softkeys.index.label')
+
+    %tbody
+      - for softkey in softkeys
+        = content_tag_for :tr, softkey do
+          %td
+            %span.handle
+              %i.icon-resize-vertical      
+          %td= softkey.function
+          %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