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

1 files changed, 18 insertions, 14 deletions

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