summaryrefslogtreecommitdiff
path: root/app/views/softkeys
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/softkeys')
-rw-r--r--app/views/softkeys/_form_core.html.haml2
-rw-r--r--app/views/softkeys/_index_core.html.haml34
-rw-r--r--app/views/softkeys/show.html.haml4
3 files changed, 23 insertions, 17 deletions
diff --git a/app/views/softkeys/_form_core.html.haml b/app/views/softkeys/_form_core.html.haml
index b833aad..2863d5c 100644
--- a/app/views/softkeys/_form_core.html.haml
+++ b/app/views/softkeys/_form_core.html.haml
@@ -7,6 +7,6 @@
.inputs
= f.input :softkey_function_id, :as => :select, :collection => @softkey_functions.map {|x| [I18n.t("softkeys.functions.#{x}"), x.id] }, :label => t('softkeys.form.function.label'), :hint => conditional_hint('softkeys.form.function.hint'), :include_blank => false
- if @available_call_forwards && @available_call_forwards.count > 0
- = f.association :call_forward, :collection => @available_call_forwards, :label => t('softkeys.form.call_forward.label'), :hint => conditional_hint('softkeys.form.call_forward.hint'), :include_blank => false
+ = f.association :softkeyable, :collection => @available_call_forwards, :label => t('softkeys.form.call_forward.label'), :hint => conditional_hint('softkeys.form.call_forward.hint'), :include_blank => false
= f.input :number, :label => t('softkeys.form.number.label'), :hint => conditional_hint('softkeys.form.number.hint')
= f.input :label, :label => t('softkeys.form.label.label'), :hint => conditional_hint('softkeys.form.label.hint')
diff --git a/app/views/softkeys/_index_core.html.haml b/app/views/softkeys/_index_core.html.haml
index 398ee51..4a06c72 100644
--- a/app/views/softkeys/_index_core.html.haml
+++ b/app/views/softkeys/_index_core.html.haml
@@ -1,15 +1,21 @@
-%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_table', I18n.locale, current_user, softkeys]) do
+ %table.table.table-striped
+ %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{ :id => "softkeys", :'data-update-url' => sort_softkeys_url}
+ - for softkey in softkeys
+ - cache(['softkeys_table_tr', I18n.locale, current_user, softkey]) do
+ = content_tag_for :tr, softkey do
+ %td
+ - if softkeys.count > 1
+ %span.handle
+ %i.icon-resize-vertical
+ %td= t("softkeys.functions.#{softkey.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
diff --git a/app/views/softkeys/show.html.haml b/app/views/softkeys/show.html.haml
index d0db111..7c068ae 100644
--- a/app/views/softkeys/show.html.haml
+++ b/app/views/softkeys/show.html.haml
@@ -1,7 +1,7 @@
- content_for :title, t("softkeys.show.page_title")
%p
- %strong= t('softkeys.show.function') + ":"
+ %strong= t("softkeys.functions.#{@softkey.softkey_function}") + ":"
=@softkey.to_s
-= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @softkey.sip_account, :child => @softkey } \ No newline at end of file
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @softkey.sip_account, :child => @softkey }