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

2 files changed, 14 insertions, 8 deletions

diff --git a/app/views/phone_numbers/_form_core.html.haml b/app/views/phone_numbers/_form_core.html.haml
index a1ce1f3..a0a69db 100644
--- a/app/views/phone_numbers/_form_core.html.haml
+++ b/app/views/phone_numbers/_form_core.html.haml
@@ -4,7 +4,7 @@
     = f.input :name, :collection => ['Office', 'Home', 'Mobile', 'Fax'], :include_blank => false, :label => t('phone_numbers.form.name.label'), :hint => conditional_hint('phone_numbers.form.name.hint')
     = f.input :number, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint'), :autofocus => true
   - else
-    - if @callthrough || @hunt_group_member || @access_authorization || @current_user.current_tenant.array_of_available_internal_extensions_and_dids.count == 0 || @current_user.current_tenant.array_of_available_internal_extensions_and_dids.count > 250
+    - if @callthrough || @hunt_group_member || @access_authorization || current_user.current_tenant.array_of_available_internal_extensions_and_dids.count == 0 || current_user.current_tenant.array_of_available_internal_extensions_and_dids.count > 250
       = f.input :number, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint'), :autofocus => true
     - else
-      = f.input :number, :collection => @current_user.current_tenant.array_of_available_internal_extensions_and_dids, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint'), :include_blank => false, :autofocus => true
+      = f.input :number, :collection => current_user.current_tenant.array_of_available_internal_extensions_and_dids, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint'), :include_blank => false, :autofocus => true
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 6bb1e7b..d396460 100644
--- a/app/views/shared/_index_view_edit_destroy_part.html.haml
+++ b/app/views/shared/_index_view_edit_destroy_part.html.haml
@@ -4,17 +4,20 @@
       - if can? :show, child
         %a.btn.btn-small.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}.index.actions.show")
+          %span.hidden-phone
+            =t("#{child.class.name.underscore.pluralize}.index.actions.show")
 
       - if can? :edit, child
         %a.btn.btn-small.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}.index.actions.edit")
+          %span.hidden-phone
+            =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
 
       - if can? :destroy, child
         %a.btn.btn-small.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_destroy"), "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")
+          %span.hidden-phone
+            =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
 
 - elsif !(defined? child).nil?
   %td
@@ -22,15 +25,18 @@
       - if can? :show, child
         %a.btn.btn-small.btn-success{:href => method( :"#{child.class.name.underscore}_path" ).(child) }
           %i.icon-info-sign.icon-white
-          =t("#{child.class.name.underscore.pluralize}.index.actions.show")
+          %span.hidden-phone
+            =t("#{child.class.name.underscore.pluralize}.index.actions.show")
 
       - if can? :edit, child
         %a.btn.btn-small.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) }
           %i.icon-edit.icon-white
-          =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
+          %span.hidden-phone
+            =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
           
       - if can? :destroy, child
         %a.btn.btn-small.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_destroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"}
           %i.icon-trash.icon-white
-          =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
+          %span.hidden-phone
+            =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
             
\ No newline at end of file