6 files changed, 13 insertions, 14 deletions
diff --git a/app/views/sip_accounts/_form_core.html.haml b/app/views/sip_accounts/_form_core.html.haml
index dbd27fe..495ae84 100644
--- a/app/views/sip_accounts/_form_core.html.haml
+++ b/app/views/sip_accounts/_form_core.html.haml
@@ -1,12 +1,13 @@
 .inputs
   = f.input :auth_name, :as => :string, :label => t('sip_accounts.form.auth_name.label'), :hint => conditional_hint('sip_accounts.form.auth_name.hint')
   = f.input :password, :as => :string, :label => t('sip_accounts.form.password.label'), :hint => conditional_hint('sip_accounts.form.password.hint')
-  = f.input :caller_name, :as => :string, :label => t('sip_accounts.form.caller_name.label'), :hint => conditional_hint('sip_accounts.form.caller_name.hint')
+  = f.input :caller_name, :as => :string, :label => t('sip_accounts.form.caller_name.label'), :hint => conditional_hint('sip_accounts.form.caller_name.hint'), :autofocus => true
   = f.input :voicemail_pin, :as => :string, :label => t('sip_accounts.form.voicemail_pin.label'), :hint => conditional_hint('sip_accounts.form.voicemail_pin.hint')
   = f.input :call_waiting, :label => t('sip_accounts.form.call_waiting.label'), :hint => conditional_hint('sip_accounts.form.call_waiting.hint')
   = f.input :clir, :label => t('sip_accounts.form.clir.label'), :hint => conditional_hint('sip_accounts.form.clir.hint')
   = f.input :clip, :label => t('sip_accounts.form.clip.label'), :hint => conditional_hint('sip_accounts.form.clip.hint')
-  = f.input :hotdeskable, :label => t('sip_accounts.form.hotdeskable.label'), :hint => conditional_hint('sip_accounts.form.hotdeskable.hint')
+  - if @sip_account.sip_accountable_type == 'User'
+    = f.input :hotdeskable, :label => t('sip_accounts.form.hotdeskable.label'), :hint => conditional_hint('sip_accounts.form.hotdeskable.hint')
   = f.input :clip_no_screening, :label => t('sip_accounts.form.clip_no_screening.label'), :hint => conditional_hint('sip_accounts.form.clip_no_screening.hint')
   - if CallForward.where(:phone_number_id => @sip_account.phone_number_ids).count == 0 || @sip_account.callforward_rules_act_per_sip_account == true
     = f.input :callforward_rules_act_per_sip_account, :label => t('sip_accounts.form.callforward_rules_act_per_sip_account.label'), :hint => conditional_hint('sip_accounts.form.callforward_rules_act_per_sip_account.hint')
diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml
index 69c9302..8d9791d 100644
--- a/app/views/sip_accounts/_index_core.html.haml
+++ b/app/views/sip_accounts/_index_core.html.haml
@@ -1,26 +1,24 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('sip_accounts.index.online')
     %th= t('sip_accounts.index.caller_name')
     %th= t('sip_accounts.index.phone_numbers')
     %th= t('phones.name')
-
-  - reset_cycle
+    %th{:colspan => '3'}
+  
   - 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
       %td
         - if sip_account.phone_numbers.count > 0
           = render 'phone_numbers/listing', :phone_numbers => sip_account.phone_numbers.order(:number)
-          %br
-        = render :partial => 'shared/create_link', :locals => {:parent => sip_account, :child_class => PhoneNumber, :short_link => true}
 
       %td
         - sip_account.phones.each do |phone|
diff --git a/app/views/sip_accounts/edit.html.haml b/app/views/sip_accounts/edit.html.haml
index c070ff7..d26b245 100644
--- a/app/views/sip_accounts/edit.html.haml
+++ b/app/views/sip_accounts/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("sip_accounts.edit.page_title")
+- content_for :title, t("sip_accounts.edit.page_title")
 
 = render "form"
diff --git a/app/views/sip_accounts/index.html.haml b/app/views/sip_accounts/index.html.haml
index 1131770..fbdba48 100644
--- a/app/views/sip_accounts/index.html.haml
+++ b/app/views/sip_accounts/index.html.haml
@@ -1,4 +1,4 @@
-- title t("sip_accounts.index.page_title")
+- content_for :title, t("sip_accounts.index.page_title")
 
 - if @sip_accounts.count > 0
   = render "index_core", :sip_accounts => @sip_accounts
diff --git a/app/views/sip_accounts/new.html.haml b/app/views/sip_accounts/new.html.haml
index 9d44680..bc4e00b 100644
--- a/app/views/sip_accounts/new.html.haml
+++ b/app/views/sip_accounts/new.html.haml
@@ -1,3 +1,3 @@
-- title t("sip_accounts.new.page_title")
+- content_for :title, t("sip_accounts.new.page_title")
 
 = render "form"
diff --git a/app/views/sip_accounts/show.html.haml b/app/views/sip_accounts/show.html.haml
index c6344cd..4f6244f 100644
--- a/app/views/sip_accounts/show.html.haml
+++ b/app/views/sip_accounts/show.html.haml
@@ -1,4 +1,4 @@
-- title t("sip_accounts.show.page_title")
+- content_for :title, t("sip_accounts.show.page_title")
 
 %p
   %strong= t('sip_accounts.show.auth_name') + ":"