From e59c35892723c6c8b469c1ba016d9e62d3fe12b2 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 30 Dec 2012 10:31:35 +0100
Subject: Added :autofocus => true to :name

---
 app/views/tenants/_form_core.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/tenants/_form_core.html.haml b/app/views/tenants/_form_core.html.haml
index 4eb2ccc..e0b173d 100644
--- a/app/views/tenants/_form_core.html.haml
+++ b/app/views/tenants/_form_core.html.haml
@@ -1,3 +1,3 @@
 .inputs
-  = f.input :name, :label => t('tenants.form.name.label'), :hint => conditional_hint('tenants.form.name.hint')
+  = f.input :name, :label => t('tenants.form.name.label'), :hint => conditional_hint('tenants.form.name.hint'), :autofocus => true
   = f.input :description, :label => t('tenants.form.description.label'), :hint => conditional_hint('tenants.form.description.hint')
-- 
cgit v1.2.3


From 544ea50a66da81989d0320735724bd09786be8ea Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 30 Dec 2012 11:23:09 +0100
Subject: Fixed some logic bugs.

---
 app/assets/javascripts/phones.js.coffee | 2 --
 app/controllers/phones_controller.rb    | 7 +++++--
 app/views/phones/_form_core.html.haml   | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/phones.js.coffee b/app/assets/javascripts/phones.js.coffee
index ff54777..d917d09 100644
--- a/app/assets/javascripts/phones.js.coffee
+++ b/app/assets/javascripts/phones.js.coffee
@@ -1,5 +1,3 @@
 jQuery ->
-  $(".fallback_sip_account_dropdown").hide()  
-
   $("#phone_hot_deskable").change ->
     $(".fallback_sip_account_dropdown").show("slow")
diff --git a/app/controllers/phones_controller.rb b/app/controllers/phones_controller.rb
index f1dcd3e..2698465 100644
--- a/app/controllers/phones_controller.rb
+++ b/app/controllers/phones_controller.rb
@@ -13,9 +13,9 @@ class PhonesController < ApplicationController
   end
 
   def new
-    set_fallback_sip_accounts
-
     @phone = @phoneable.phones.build()
+
+    set_fallback_sip_accounts
     
     # Use the last phone.phone_model as the default.
     #
@@ -80,6 +80,9 @@ class PhonesController < ApplicationController
   def set_fallback_sip_accounts
     used_sip_account_ids = Phone.where(:fallback_sip_account_id => SipAccount.pluck(:id)).pluck(:fallback_sip_account_id) 
     @fallback_sip_accounts = SipAccount.where(:sip_accountable_type => 'Tenant').where(:hotdeskable => true) - SipAccount.where(:id => used_sip_account_ids)
+    if @phone && !@phone.fallback_sip_account_id.blank? && SipAccount.exists?(@phone.fallback_sip_account_id)
+      @fallback_sip_accounts << SipAccount.where(:id => @phone.fallback_sip_account_id).first
+    end
   end
   
 end
diff --git a/app/views/phones/_form_core.html.haml b/app/views/phones/_form_core.html.haml
index fd69690..e0c664b 100644
--- a/app/views/phones/_form_core.html.haml
+++ b/app/views/phones/_form_core.html.haml
@@ -5,6 +5,9 @@
     = f.input :hot_deskable, :label => t('phones.form.hot_deskable.label'), :hint => conditional_hint('phones.form.hot_deskable.hint')
     .fallback_sip_account_dropdown
       = f.association :fallback_sip_account, :collection => @fallback_sip_accounts, :label => t('phones.form.fallback_sip_account_id.label'), :hint => conditional_hint('phones.form.fallback_sip_account_id.hint'), :include_blank => false
+    - if !@phone.hot_deskable?
+      :javascript
+        $(".fallback_sip_account_dropdown").hide()  
 
   - if defined? NIGHTLY_REBOOT_OF_PHONES && NIGHTLY_REBOOT_OF_PHONES == true
     = f.input :nightly_reboot, :label => t('phones.form.nightly_reboot.label'), :hint => conditional_hint('phones.form.nightly_reboot.hint')
-- 
cgit v1.2.3


From e03b0b57f4c05210d198e2fab031cb4b7bdd5247 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 30 Dec 2012 11:34:36 +0100
Subject: Added destroy_fallback_sip_account_if_not_hot_deskable

---
 app/models/phone.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app')

diff --git a/app/models/phone.rb b/app/models/phone.rb
index 1f3c497..a606834 100644
--- a/app/models/phone.rb
+++ b/app/models/phone.rb
@@ -20,6 +20,7 @@ class Phone < ActiveRecord::Base
   # Validations
   #
   before_validation :sanitize_mac_address
+  before_validation :destroy_fallback_sip_account_if_not_hot_deskable
   
   validates_presence_of     :mac_address
   validate_mac_address      :mac_address
@@ -227,5 +228,11 @@ class Phone < ActiveRecord::Base
       self.last_ip_address = nil
     end
   end
+
+  def destroy_fallback_sip_account_if_not_hot_deskable
+    if !self.hot_deskable?
+      self.fallback_sip_account_id = nil
+    end
+  end
   
 end
-- 
cgit v1.2.3


From e200751676f22dd9a83905eea0057beb57c9c9a7 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 30 Dec 2012 11:57:15 +0100
Subject: Show a link to the phone's manual.

---
 app/views/phones/show.html.haml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app')

diff --git a/app/views/phones/show.html.haml b/app/views/phones/show.html.haml
index 090323e..268c469 100644
--- a/app/views/phones/show.html.haml
+++ b/app/views/phones/show.html.haml
@@ -6,6 +6,8 @@
 %p
   %strong= t('phones.show.phone_model_id') + ":"
   = @phone.phone_model
+  - if !@phone.phone_model.product_manual_homepage_url.blank?
+    (#{link_to t('phones.show.manual'), @phone.phone_model.product_manual_homepage_url})
 - if @phone.hot_deskable == true
   %p
     %strong= t('phones.show.hot_deskable') + ":"
-- 
cgit v1.2.3


From 131d204324062991c93cd5418d1dc7854347ffb6 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 30 Dec 2012 12:20:38 +0100
Subject: Added snom Meetingpoint (a conference phone).

---
 app/controllers/config_snom_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/controllers/config_snom_controller.rb b/app/controllers/config_snom_controller.rb
index 4d12082..7542415 100644
--- a/app/controllers/config_snom_controller.rb
+++ b/app/controllers/config_snom_controller.rb
@@ -80,6 +80,7 @@ class ConfigSnomController < ApplicationController
           '00041345' => 'Snom 821',
           '00041348' => 'Snom 821',
           '00041341' => 'Snom 870',
+          '00041332' => 'snom MeetingPoint',
         }
 
         @phone.phone_model = PhoneModel.where(:name => mac_address_to_model[@mac_address[0, 8]]).first
-- 
cgit v1.2.3


From caf624f11f7de44289b3c994fc72cc5e32ed799e Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 30 Dec 2012 15:48:03 +0100
Subject: Fixed a broken from.

---
 app/controllers/user_groups_controller.rb  | 2 +-
 app/views/user_groups/_form.html.haml      | 2 +-
 app/views/user_groups/_form_core.html.haml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/controllers/user_groups_controller.rb b/app/controllers/user_groups_controller.rb
index 158abaa..64e7136 100644
--- a/app/controllers/user_groups_controller.rb
+++ b/app/controllers/user_groups_controller.rb
@@ -19,7 +19,7 @@ class UserGroupsController < ApplicationController
   def create
     @user_group = @parent.user_groups.build(params[:user_group])
     if @user_group.save
-      redirect_to @user_group, :notice => t('user_groups.controller.successfuly_created')
+      redirect_to [@parent, @user_group], :notice => t('user_groups.controller.successfuly_created')
     else
       render :new
     end
diff --git a/app/views/user_groups/_form.html.haml b/app/views/user_groups/_form.html.haml
index cbe3cc4..3263fdd 100644
--- a/app/views/user_groups/_form.html.haml
+++ b/app/views/user_groups/_form.html.haml
@@ -1,4 +1,4 @@
-= simple_form_for(@user_group) do |f|
+= simple_form_for([@parent, @user_group]) do |f|
   = f.error_notification
 
   = render "form_core", :f => f
diff --git a/app/views/user_groups/_form_core.html.haml b/app/views/user_groups/_form_core.html.haml
index a45ba6f..edb0dbc 100644
--- a/app/views/user_groups/_form_core.html.haml
+++ b/app/views/user_groups/_form_core.html.haml
@@ -1,3 +1,3 @@
 .inputs
-  = f.input :name, :label => t('user_groups.form.name.label'), :hint => conditional_hint('user_groups.form.name.hint')
+  = f.input :name, :label => t('user_groups.form.name.label'), :hint => conditional_hint('user_groups.form.name.hint'), :autofocus => true
   = f.input :description, :label => t('user_groups.form.description.label'), :hint => conditional_hint('user_groups.form.description.hint')
-- 
cgit v1.2.3


From 3867ea2c1b7b839c1a1afc2a1abaa12f9dba74dd Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 30 Dec 2012 17:08:53 +0100
Subject: Fixed wrong redirect paths for update and destroy.

---
 app/controllers/user_groups_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/controllers/user_groups_controller.rb b/app/controllers/user_groups_controller.rb
index 64e7136..ff3292c 100644
--- a/app/controllers/user_groups_controller.rb
+++ b/app/controllers/user_groups_controller.rb
@@ -30,7 +30,7 @@ class UserGroupsController < ApplicationController
 
   def update
     if @user_group.update_attributes(params[:user_group])
-      redirect_to @user_group, :notice  => t('user_groups.controller.successfuly_updated')
+      redirect_to [@parent, @user_group], :notice  => t('user_groups.controller.successfuly_updated')
     else
       render :edit
     end
@@ -38,7 +38,7 @@ class UserGroupsController < ApplicationController
 
   def destroy
     @user_group.destroy
-    redirect_to user_groups_url, :notice => t('user_groups.controller.successfuly_destroyed')
+    redirect_to method( :"#{@parent.class.name.underscore}_user_groups_path" ).(@parent), :notice => t('user_groups.controller.successfuly_destroyed')
   end
   
   private
-- 
cgit v1.2.3


From ed8953f05638c43d9c1e62cf3d3ff7da158f4c20 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 30 Dec 2012 19:47:15 +0100
Subject: Added a First Steps page.

---
 app/controllers/page_controller.rb          |  1 +
 app/controllers/tenants_controller.rb       | 21 ++++++++++++++----
 app/helpers/application_helper.rb           | 20 +++++++++++++++++
 app/views/page/beginners_intro.de.html.haml | 33 +++++++++++++++++++++++++++++
 app/views/page/beginners_intro.html.haml    | 33 +++++++++++++++++++++++++++++
 5 files changed, 104 insertions(+), 4 deletions(-)
 create mode 100644 app/views/page/beginners_intro.de.html.haml
 create mode 100644 app/views/page/beginners_intro.html.haml

(limited to 'app')

diff --git a/app/controllers/page_controller.rb b/app/controllers/page_controller.rb
index 1f37449..4ea4d25 100644
--- a/app/controllers/page_controller.rb
+++ b/app/controllers/page_controller.rb
@@ -7,6 +7,7 @@ class PageController < ApplicationController
   
   def index;end
   def conference;end
+  def beginners_intro;end
   
   private
   def if_fresh_system_then_go_to_wizard
diff --git a/app/controllers/tenants_controller.rb b/app/controllers/tenants_controller.rb
index 724d179..7bb8ecd 100644
--- a/app/controllers/tenants_controller.rb
+++ b/app/controllers/tenants_controller.rb
@@ -58,14 +58,27 @@ class TenantsController < ApplicationController
       end
        
       if Delayed::Job.count > 0
-        redirect_to @tenant, :notice => t('tenants.controller.successfuly_created_plus_delayed_jobs', 
+        if SipAccount.any? || Phone.any?
+          redirect_to @tenant, :notice => t('tenants.controller.successfuly_created_plus_delayed_jobs', 
                                           :resource => @tenant, 
                                           :amount_of_numbers => @tenant.array_of_internal_extension_numbers.count + @tenant.array_of_dids.count
                                           )
-      else
-        redirect_to @tenant, :notice => t('tenants.controller.successfuly_created', 
-                                          :resource => @tenant
+        else
+          redirect_to page_beginners_intro_path, :notice => t('tenants.controller.successfuly_created_plus_delayed_jobs', 
+                                          :resource => @tenant, 
+                                          :amount_of_numbers => @tenant.array_of_internal_extension_numbers.count + @tenant.array_of_dids.count
                                           )
+        end
+      else
+        if SipAccount.any? || Phone.any?
+          redirect_to @tenant, :notice => t('tenants.controller.successfuly_created', 
+                                            :resource => @tenant
+                                            )
+        else
+          redirect_to page_beginners_intro_path, :notice => t('tenants.controller.successfuly_created', 
+                                            :resource => @tenant
+                                            )
+        end
       end
     else
       render :new
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de6be79..de4d677 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,2 +1,22 @@
 module ApplicationHelper
+
+  # nicely_joined_with_commata(['1', '2', '3', '4'])
+  # = '1, 2, 3 und 4'
+  #
+	def nicely_joined_with_commata(array_of_things)
+		if array_of_things.count == 1
+			array_of_things.first.to_s
+		else
+			if array_of_things.count > 1
+        output = array_of_things[0, array_of_things.count - 1].map{|item| item.to_s}.join(', ')
+        if I18n.locale == :de
+          output += ' und '
+        else
+        	output += ' and '
+        end
+        output += array_of_things.last.to_s
+      end
+    end
+	end
+
 end
diff --git a/app/views/page/beginners_intro.de.html.haml b/app/views/page/beginners_intro.de.html.haml
new file mode 100644
index 0000000..8d129db
--- /dev/null
+++ b/app/views/page/beginners_intro.de.html.haml
@@ -0,0 +1,33 @@
+- title "Erste Schritte mit Gemeinschaft #{GEMEINSCHAFT_VERSION}!"
+
+%p
+  Sie müssen als erstes mindestens zwei neue SIP-Accounts anlegen. Dabei haben Sie die Wahl zwischen folgenden Varianten:
+
+%ul
+  %li
+    %strong
+      Personalisierter SIP-Accounts 
+    %br
+    Dieser wird einer bestimmten Person zugeordnet. In einer normalen Gemeinschaft-Installation sind die meisten SIP-Accounts personalisiert.
+    %br
+    =link_to "SIP-Account für #{current_user} anlegen.", new_user_sip_account_path(current_user)
+  %li
+    %strong
+      Firmen SIP-Accounts
+    %br
+    Es gibt bestimmte SIP-Account, die keiner bestimmten Person zugeordnet werden können (z.B. für Telefone in einem Konferenzraum). Dafür gibt es Firmen SIP-Accounts.
+    %br
+    =link_to "SIP-Account für #{current_user.current_tenant} anlegen.", new_tenant_sip_account_path(current_user.current_tenant)
+
+%h2 Rufnummern
+
+%p
+  Mit denen von Ihnen angelegten SIP-Accounts können Sie schon intern telefonieren. Dazu müssen Sie den SIP-Accounts jeweils eine interne Telefonnummer zuweisen (z.B. 20 und 21) und ein SIP Soft- oder Hardphone mit den Account-Daten konfigurieren.
+
+%h2 Telefone
+
+%p
+  Komfortabler ist der Betrieb von im Provisioning unterstützen Telefone. Diese können Sie beim Anlegen direkt mit einem bestimmten SIP-Account verknüpfen. Danach müssen Sie nur noch die Provisioningdaten per Hand ins Telefon eintragen oder ein paar Einstellungen in Ihrem DHCP-Server vornehmen. Hilfe dazu finden Sie im #{link_to 'Wiki', 'https://github.com/amooma/GS5/wiki'} und der #{link_to 'Mailingliste', 'https://groups.google.com/group/gs5-users/'}.
+%p
+  Folgende Telefone werden in der Version #{GEMEINSCHAFT_VERSION} vom automatischen Provisioning unterstützt: 
+  = nicely_joined_with_commata(PhoneModel.order(:name).map{|phone_model| "#{phone_model.to_s}"})
\ No newline at end of file
diff --git a/app/views/page/beginners_intro.html.haml b/app/views/page/beginners_intro.html.haml
new file mode 100644
index 0000000..6227142
--- /dev/null
+++ b/app/views/page/beginners_intro.html.haml
@@ -0,0 +1,33 @@
+- title "First steps with Gemeinschaft #{GEMEINSCHAFT_VERSION}!"
+
+%p
+  You have to create at least two new SIP accounts. You have the choice of two different versions:
+
+%ul
+  %li
+    %strong
+      Personalized SIP accounts
+    %br
+    They are linked to a user. In a normal Gemeinschaft installation the majority of accounts are personlized.
+    %br
+    =link_to "Create a SIP account for #{current_user}.", new_user_sip_account_path(current_user)
+  %li
+    %strong
+      Company SIP accounts
+    %br
+    These are for phones which are not linked to a specific person (e.g. phones in conference rooms).
+    %br
+    =link_to "Create a SIP account for #{current_user.current_tenant}.", new_tenant_sip_account_path(current_user.current_tenant)
+
+%h2 Phone numbers
+
+%p
+  You can use your SIP accounts to make internal calls. But before that you have to add phone numbers to each SIP account (e.g. 20 and 21). After you did that you can configure any SIP phone with the SIP account configuration and start using your new PBX.
+
+%h2 Phones
+
+%p
+  More comfortable is the use of auto provisioned phones. They can be linked to SIP accounts. After creating them in the WebGUI you have to set the Provisioning URL in the phone or setup your DHCP server to give them this data. You'll find help in our #{link_to 'Wiki', 'https://github.com/amooma/GS5/wiki'} or in our #{link_to 'mailinglist', 'https://groups.google.com/group/gs5-users/'}.
+%p
+  In version #{GEMEINSCHAFT_VERSION} the following phones can be used for provisioning: 
+  = nicely_joined_with_commata(PhoneModel.order(:name).map{|phone_model| "#{phone_model.to_s}"})
\ No newline at end of file
-- 
cgit v1.2.3


From 1c84298030ece53b5915ccca3460c04889abaffe Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 30 Dec 2012 20:41:31 +0100
Subject: Added the provisioning URL for Snom phones in phone#view.

---
 app/views/phones/show.html.haml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app')

diff --git a/app/views/phones/show.html.haml b/app/views/phones/show.html.haml
index 268c469..a7ee952 100644
--- a/app/views/phones/show.html.haml
+++ b/app/views/phones/show.html.haml
@@ -29,6 +29,12 @@
   %strong= t('phones.show.ip_address') + ":"
   = @phone.ip_address
 
+- if @phone.ip_address.blank? && @phone.phone_model.manufacturer.ieee_name == 'SNOM Technology AG'
+  %p
+    Sollten Sie Ihren DHCP-Server noch nicht für das automatische Konfigurieren der GS5 Provisionierungs-URL konfiguriert haben, können Sie manuell in Ihrem Telefon die folgende Provisionierungs-URL eingeben. Das "{mac}" bitte genau so eingeben, es wird vom Telefon automatisch mit der eigenen MAC-Adresse befüllt:
+    %pre
+      = "http://#{GemeinschaftSetup.first.sip_domain.host}/settings-{mac}"
+
 = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @phone.phoneable, :child => @phone }
 
 %h2= t("phones.sip_accounts.title")
-- 
cgit v1.2.3


From f5a512fe34fff50bcc7e96b57120d56a79ea47cb Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 30 Dec 2012 22:25:52 +0100
Subject: Set a couple of :autofocus => true to make the UI better.

---
 app/views/call_forwards/_form_core.html.haml | 2 +-
 app/views/phone_numbers/_form_core.html.haml | 6 +++---
 app/views/sip_accounts/_form_core.html.haml  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/views/call_forwards/_form_core.html.haml b/app/views/call_forwards/_form_core.html.haml
index 3dadb68..f75181f 100644
--- a/app/views/call_forwards/_form_core.html.haml
+++ b/app/views/call_forwards/_form_core.html.haml
@@ -1,5 +1,5 @@
 .inputs
-  = f.input :call_forward_case_id, :as => :select, :collection => @available_call_forward_cases.map {|x| [I18n.t("call_forward_cases.#{x.value}"), x.id] }, :label => t('call_forwards.form.call_forward_case_id.label'), :hint => conditional_hint('call_forwards.form.call_forward_case_id.hint'), :include_blank => false
+  = f.input :call_forward_case_id, :as => :select, :collection => @available_call_forward_cases.map {|x| [I18n.t("call_forward_cases.#{x.value}"), x.id] }, :label => t('call_forwards.form.call_forward_case_id.label'), :hint => conditional_hint('call_forwards.form.call_forward_case_id.hint'), :include_blank => false, :autofocus => true
   = f.input :timeout, :label => t('call_forwards.form.timeout.label'), :hint => conditional_hint('call_forwards.form.timeout.hint')
   
   = f.input :call_forwarding_destination , :as => :select, :collection => @call_forwarding_destinations, :label => t('call_forwards.form.call_forwarding_destination.label'), :hint => conditional_hint('call_forwards.form.call_forwarding_destination.hint'), :include_blank => false
diff --git a/app/views/phone_numbers/_form_core.html.haml b/app/views/phone_numbers/_form_core.html.haml
index add3039..a1ce1f3 100644
--- a/app/views/phone_numbers/_form_core.html.haml
+++ b/app/views/phone_numbers/_form_core.html.haml
@@ -2,9 +2,9 @@
   
   - if @phone_book_entry
     = 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')
+    = 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
-      = f.input :number, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint')
+      = 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
+      = 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/sip_accounts/_form_core.html.haml b/app/views/sip_accounts/_form_core.html.haml
index dbd27fe..6a63da6 100644
--- a/app/views/sip_accounts/_form_core.html.haml
+++ b/app/views/sip_accounts/_form_core.html.haml
@@ -1,7 +1,7 @@
 .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')
-- 
cgit v1.2.3


From 12c8f4c82770ded6ea6b519e4451ed6757419ddf Mon Sep 17 00:00:00 2001
From: Sascha Daniels <sd@alternative-solution.de>
Date: Mon, 31 Dec 2012 02:09:05 +0100
Subject: Remove unused ontroller

---
 app/controllers/config_siemens_sort_controller.rb | 371 ----------------------
 1 file changed, 371 deletions(-)
 delete mode 100644 app/controllers/config_siemens_sort_controller.rb

(limited to 'app')

diff --git a/app/controllers/config_siemens_sort_controller.rb b/app/controllers/config_siemens_sort_controller.rb
deleted file mode 100644
index c0739e5..0000000
--- a/app/controllers/config_siemens_sort_controller.rb
+++ /dev/null
@@ -1,371 +0,0 @@
-require 'nokogiri'
-#doc.search('Message/ItemList').each do |a| puts a.children end
-class ConfigSiemensController < ApplicationController
-#TODO Authentication
-	# No access for admins though as this contains personal data.
-	
-	# We can't use load_and_authorize_resource() here because
-	# ConfigSiemensController isn't a resource.
-	# We can try client certificates
-
-	skip_authorization_check
-	
-	
-  def index
-    os40_keys=7
-    os60_keys=8
-    os80_keys=9
-    doc = Nokogiri::XML(request.body.read)
-    #logger.debug("#{params[:WorkpointMessage].to_xml}")
-    #logger.debug("#{params[:WorkpointMessage][:Message][:ItemList].to_xml}")
-    @phone_items=Hash.new
-    contact_reason = params[:WorkpointMessage][:Message][:ReasonForContact]
-    reply_status =  doc.search('Message/ReasonForContact').first[:status]
-    reply_action =  doc.search('Message/ReasonForContact').first[:action]
-    
-    doc.search('Message/ItemList/Item').each do |post_item|
-      @phone_items[post_item[:name]]=post_item.children.to_s
-    end
-    
-    mac_address = @phone_items['mac-addr']
-    phone_type = @phone_items['device-type']
-    if phone_type == "OpenStage 40"
-      max_keys = (os40_keys) * 2
-    elsif phone_type == "OpenStage 60"
-      max_keys = (os60_keys) * 2
-    elsif phone_type == "OpenStage 80"
-      max_keys = (os80_keys) * 2
-    else
-      max_keys = 0
-    end
-    
-    blf_keys_max = max_keys / 2
-    shift_key_position = blf_keys_max - 1
-    
-    #logger.debug(request.body.read)
-    @phone = Phone.find_by_mac_address(mac_address.gsub(':','').upcase)
-    if ! @phone.nil?
-      @phone.update_attributes(:ip_address => request.remote_ip)
-      sip_account = SipAccount.where(:sip_accountable_type == @phone.phoneable_type,
-                                     :sip_accountable_id == @phone.phoneable_id).first
-    end
-    
-    if ! @phone.nil? && ! sip_account.nil?
-      #logger.debug(@phone_items)
-      @my_nonce = params[:WorkpointMessage][:Message][:nonce]
-      @new_settings = Array.new
-      
-      @new_settings << ['dhcp', nil,  'true']
-      @new_settings << ['hostname', nil,  mac_address.gsub(':', '') ]
-      @new_settings << ['e164-hostname', nil,  'false']
-      @new_settings << ['mobility-enabled', nil,  'false']
-      @new_settings << ['mobility-password-on-logoff', nil,  'false']
-      @new_settings << ['e164', nil,  sip_account.try(:phone_numbers).first.number]
-      @new_settings << ['sip-user-id', nil,  sip_account.auth_name]
-      @new_settings << ['reg-id', nil,  sip_account.auth_name]
-      @new_settings << ['reg-number', nil,  sip_account.auth_name]
-      @new_settings << ['fully-qualified-phone-no', nil,  sip_account.auth_name]
-      @new_settings << ['sip-pwd', nil,  sip_account.password]
-      @new_settings << ['sip-name', nil,  sip_account.caller_name]
-      @new_settings << ['register-by-name', nil,  'false']
-      #OPTIMIZE Display ID ?
-      @new_settings << ['display-id', nil,  sip_account.try(:phone_numbers).first.number]
-      @new_settings << ['display-id-unicode', nil,  sip_account.caller_name]
-      @new_settings << ['use-display-id', nil,  'true']
-      @new_settings << ['reg-addr', nil,  sip_account.sip_domain.host]
-      @new_settings << ['reg-port', nil,  '5060']
-      @new_settings << ['registrar-addr', nil,  sip_account.sip_domain.host]
-      @new_settings << ['registrar-port', nil,  '5060']
-      @new_settings << ['outbound-proxy', nil,  sip_account.sip_domain.host]
-      @new_settings << ['outbound-proxy-user', nil,  sip_account.sip_domain.host]
-      @new_settings << ['sgnl-gateway-addr', nil,  sip_account.sip_domain.host]
-      @new_settings << ['sgnl-gateway-addr-user', nil,  sip_account.sip_domain.host]
-      @new_settings << ['sgnl-gateway-port', nil,  '5060' ]
-      @new_settings << ['sgnl-gateway-port-user', nil,  '5060'] 
-      @new_settings << ['sgnl-route', nil,  '0' ]
-      @new_settings << ['mwi-e164', nil,  '' ]
-      @new_settings << ['rtp-base-port', nil,  '5004'] 
-      @new_settings << ['default-domain', nil,  '' ]
-      @new_settings << ['sip-transport', nil,  '0' ]
-      @new_settings << ['sip-transport-user', nil,  '0' ]
-      @new_settings << ['server-type', nil,  '0' ]
-      @new_settings << ['session-timer', nil,  'true'] 
-      @new_settings << ['session-duration', nil,  '3600' ]
-      @new_settings << ['reg-ttl', nil,  '3600' ]
-      @new_settings << ['realm', nil,   sip_account.sip_domain.realm]
-      @new_settings << ['emergency-e164', nil,  '0110' ]
-      @new_settings << ['voice-mail-e164', nil,  'voicemail']
-      @new_settings << ['auto-answer', nil,  'false']
-      @new_settings << ['beep-on-auto-answer', nil,  'true']
-      @new_settings << ['auto-reconnect', nil,  'false' ]
-      @new_settings << ['beep-on-auto-reconnect', nil,  'true']
-      @new_settings << ['permit-decline-call', nil,  'true']
-      @new_settings << ['transfer-on-ring', nil,  'false' ]
-      @new_settings << ['join-allowed-in-conference', nil,  'true']
-      @new_settings << ['pickup-group-uri', nil,  '*8*']
-      @new_settings << ['pickup-group-uri', nil,  '' ]
-      @new_settings << ['hot-line-warm-line-digits', nil,  '' ]
-      @new_settings << ['initial-digit-timer', nil,  '30' ]
-      @new_settings << ['conference-factory-uri', nil,  '']
-      @new_settings << ['callback-busy-allow', nil,  'false']
-      @new_settings << ['callback-busy-code', nil,  '' ]
-      @new_settings << ['callback-ring-allow', nil,  'false']
-      @new_settings << ['callback-ring-code', nil,  '']
-      @new_settings << ['callback-cancel-code', nil,  '']
-      @new_settings << ['park-server', nil,  '']
-      #OPTIMIZE Callwaiting
-      @new_settings << ['call-waiting-enabled', nil,  'true']
-      @new_settings << ['qos-layer2', nil,  'true']
-      @new_settings << ['l2qos-voice', nil,  '5' ]
-      @new_settings << ['l2qos-signalling', nil,  '3' ]
-      @new_settings << ['l2qos-default', nil,  '0']
-      @new_settings << ['qos-layer3', nil,  'true']
-      @new_settings << ['l3qos-voice', nil,  '46']
-      @new_settings << ['l3qos-signalling', nil,  '26']
-      @new_settings << ['vlan-method', nil,  '1']
-      #OPTIMIZE Timezone
-      @new_settings << ['sntp-tz-offset', nil,  '']
-      @new_settings << ['daylight-save', nil,  '']
-      @new_settings << ['daylight-save-minutes', nil,  '']
-      #OPTIMIZE Use SNMP?
-      @new_settings << ['snmp-trap-addr', nil,  '']
-      @new_settings << ['snmp-trap-port', nil,  '']
-      @new_settings << ['snmp-trap-pwd', nil,  'snmp' ]
-      @new_settings << ['snmp-traps-active', nil,  'false' ]
-      @new_settings << ['diagnostic-trap-addr', nil,  '']
-      @new_settings << ['diagnostic-trap-port', nil,  '']
-      @new_settings << ['diagnostic-trap-pwd', nil,  'snmp' ]
-      @new_settings << ['diagnostic-traps-active', nil,  'false' ]
-      @new_settings << ['diagnostic-snmp-active', nil,  'false']
-      @new_settings << ['qdc-collection-unit-addr', nil,  '']
-      @new_settings << ['qdc-collection-unit-port', nil,  '12010']
-      
-      @new_settings << ['qdc-trap-pwd', nil,  'QOSDC']
-      @new_settings << ['qdc-snmp-active', nil,  'false']
-      @new_settings << ['qdc-qcu-active', nil,  'false']
-      @new_settings << ['snmp-queries-allowed', nil,  'false']
-      @new_settings << ['snmp-pwd', nil,  '']
-      @new_settings << ['disable-microphone', nil,  'false']
-      @new_settings << ['loudspeech-enabled', nil,  'true']
-      @new_settings << ['audio-silence-suppression', nil,  'false']
-      
-      @new_settings << ['port1', nil,  '0' ] # 0=Automatic (speed)
-      @new_settings << ['port2', nil,  '0'  ]
-      @new_settings << ['port2-mode', nil,  '1' ]
-      @new_settings << ['port2-auto-mdix-enabled', nil,  'true' ]
-      @new_settings << ['originating-line-preference', nil,  '0']
-      @new_settings << ['terminating-line-preference', nil,  '0']
-      @new_settings << ['line-key-operating-mode', nil,  '0']
-      @new_settings << ['line-rollover-type', nil,  '2']
-      @new_settings << ['line-rollover-volume', nil,  '5' ]# 1-5
-      @new_settings << ['line-registration-leds', nil,  'true']
-      @new_settings << ['keyset-use-focus', nil,  'true' ]
-      @new_settings << ['keyset-remote-forward-ind', nil,  'true']
-      @new_settings << ['keyset-reservation-timer', nil,  '60' ] # 0-300
-      @new_settings << ['dial-plan-enabled', nil,  '' ]
-      @new_settings << ['Canonical-dialing-international-prefix', nil,  '']
-      @new_settings << ['Canonical-dialing-local-country-code', nil,  '']
-      @new_settings << ['Canonical-dialing-national-prefix', nil,  '']
-      @new_settings << ['Canonical-dialing-local-area-code', nil,  '']
-      @new_settings << ['Canonical-dialing-local-node', nil,  '']
-      @new_settings << ['Canonical-dialing-external-access', nil,  '0']
-      @new_settings << ['Canonical-dialing-operator-code', nil,  '']
-      @new_settings << ['Canonical-dialing-emergency-number', nil,  '']
-      @new_settings << ['Canonical-dialing-dial-needs-access-code', nil,  '0']
-      @new_settings << ['Canonical-dialing-dial-needs-intGWcode', nil,  '0'] 
-      @new_settings << ['Canonical-dialing-min-local-number-length', nil,  '10']
-      @new_settings << ['Canonical-dialing-extension-initial-digits', nil,  '']
-      @new_settings << ['Canonical-dialing-dial-internal-form', nil,  '0' ]
-      @new_settings << ['Canonical-dialing-dial-external-form', nil,  '0' ]
-      @new_settings << ['Canonical-lookup-local-code', nil,  '' ]
-      @new_settings << ['Canonical-lookup-international-code', nil,  '']
-      @new_settings << ['hot-keypad-dialing', nil,  '']
-      @new_settings << ['ldap-transport', nil,  '0']
-      @new_settings << ['ldap-server-address', nil,  '' ]
-      @new_settings << ['ldap-server-port', nil,  '389' ]
-      @new_settings << ['ldap-authentication', nil,  '1']
-      @new_settings << ['ldap-user', nil,  '' ]
-      @new_settings << ['ldap-pwd', nil,  '' ]
-      @new_settings << ['ldap-max-responses', nil,  '25'] 
-      @new_settings << ['backup-addr', nil,  ''] 
-      @new_settings << ['backup-registration', nil,  'false']
-      @new_settings << ['qdc-qcu-active', nil,  'false' ] 
-      @new_settings << ['min-admin-passw-length', nil,  '6' ]
-      @new_settings << ['default-locked-config-menus', nil,  'true' ]
-      @new_settings << ['locked-config-menus', nil,  'true' ]
-      @new_settings << ['default-locked-local-function-menus', nil,  'true' ]
-      @new_settings << ['locked-local-function-menus', nil,  'true' ]
-      @new_settings << ['dls-mode-secure', nil,  '0' ]
-      @new_settings << ['dls-chunk-size', nil,  '9492']
-      @new_settings << ['default-passw-policy', nil,  'false']
-      @new_settings << ['deflect-destination', nil,  '']
-      @new_settings << ['display-skin', nil,  '']
-      @new_settings << ['enable-bluetooth-interface', nil,  'true']
-      @new_settings << ['usb-access-enabled', nil,  'false' ] 
-      @new_settings << ['usb-backup-enabled', nil,  'false' ]
-      @new_settings << ['line-button-mode', nil,  '0' ]
-      @new_settings << ['lock-forwarding', nil,  '' ]
-      @new_settings << ['loudspeaker-function-mode', nil,  '0' ]
-      @new_settings << ['max-pin-retries', nil,  '' ]
-      @new_settings << ['inactivity-timeout', nil,  '30' ] 
-      @new_settings << ['not-used-timeout', nil,  '2' ]
-      @new_settings << ['passw-char-set', nil,  '0' ]
-      @new_settings << ['refuse-call', nil,  'true' ]
-      @new_settings << ['restart-password', nil,  '']
-      #OPTIMIZE clock format
-      @new_settings << ['time-format', nil,  '0' ]# 1=12 h
-      @new_settings << ['uaCSTA-enabled', nil,  'false' ]
-      @new_settings << ['enable-test-interface', nil,  'false']
-      @new_settings << ['enable-WBM', nil,  'true']
-      @new_settings << ['pixelsaver-timeout', nil,  '2' ]# 2 hours?
-      @new_settings << ['voice-message-dial-tone', nil,  '' ]
-      @new_settings << ['call-pickup-allowed', nil,  'true' ]
-      @new_settings << ['group-pickup-tone-allowed', nil,  'true']
-      @new_settings << ['group-pickup-as-ringer', nil,  'false']
-      @new_settings << ['group-pickup-alert-type', nil,  '0' ]
-      @new_settings << ['default-profile', nil,  '' ]
-      @new_settings << ['count-medium-priority', nil,  '5'] 
-      @new_settings << ['timer-medium-priority', nil,  '60'] # 1 - 999
-      @new_settings << ['timer-high-priority', nil,  '5']  # 0 - 999
-      @new_settings << ['dss-sip-detect-timer', nil,  '10'] 
-      @new_settings << ['dss-sip-deflect', nil,  'false' ]
-      @new_settings << ['dss-sip-refuse', nil,  'false' ]
-      @new_settings << ['feature-availability', nil,  'false'] 
-      @new_settings << ['feature-availability', nil,  'true' ]
-      @new_settings << ['feature-availability', nil,  'true' ]
-      @new_settings << ['local-control-feature-availability', nil,  'false' ]
-      @new_settings << ['trace-level', nil,  '0' ] # Off
-      @new_settings << ['default-locked-function-keys', nil,  'true' ]# "unknown item"
-      #OPTIMIZE Put pickup prefix into database/global constant?
-      @new_settings << ['blf-code', nil,  'f_ia_']   # pickup prefix for softkey function 59 (BLF)
-      @new_settings << ['stimulus-feature-code', nil,  true] 
-      @new_settings << ['stimulus-led-control-uri', nil,  true] 
-      
-      
-      @new_settings << ['min-user-passw-length', nil,  '6' ]# 6 - 24
-      #OPTIMIZE language
-      @new_settings << ['country-iso', nil,  'DE' ]
-      @new_settings << ['language-iso', nil,  'de']
-      @new_settings << ['date-format', nil,  '0' ] # DD.MM.YYYY
-      #OPTIMIZE ringtones
-      @new_settings << ['ringer-melody', nil,  '1']
-      
-      @new_settings << ['ringer-melody', nil,  '2']
-      @new_settings << ['ringer-tone-sequence', nil,  '2']
-      
-      soft_keys = Array.new
-           # Getting BLF keys only for the first level 
-      blf_keys = sip_account.softkeys.find(
-                      :all,
-                      :conditions => {:function => ['blf', 'conference']},
-                      :limit => blf_keys_max)
-      #Getting other keys
-      non_blf_keys = sip_account.softkeys.find(
-                      :all,
-                      :conditions => {:function => ['speed_dial']})
- 
-      # Fill softkey array with BLF keys up to shift key
-      blf_keys.each do |k|    
-        soft_keys << k
-      end
-      # Fill sofkey with other keys up to end
-      non_blf_keys.each do |k| 
-        if soft_keys.length < max_keys      
-          soft_keys << k
-        end
-      end
-      # Delete unset softkeys
-      while soft_keys.length < max_keys
-        soft_keys << Softkey.new
-      end
-      
-      key_pos=1
-            
-      #soft_keys.each do |sk| 
-        
-        while key_pos < shift_key_position
-          
-          (1..shift_key_position-1).each do |key_idx|
-            sk = soft_keys.shift          
-            logger.debug(sk.function, key_idx)
-            if sk.function == "blf"
-              @new_settings << ['function-key-def', key_idx, '59']
-              @new_settings << ['select-dial', key_idx, sk.number ]
-            elsif sk.function == "log_out"
-              @new_settings << ['function-key-def', key_idx, '1']
-              @new_settings << ['select-dial', key_idx, 'f_lo' ]
-            elsif sk.function == "log_in"
-              @new_settings << ['function-key-def', key_idx, '1']
-              @new_settings << ['select-dial', key_idx, "f_li_#{sk.number}" ]
-            elsif sk.function == "dtmf"
-              @new_settings << ['function-key-def', key_idx, '54']
-              @new_settings << ['stimulus-DTMF-sequence', key_idx, sk.number ]
-            elsif sk.function.nil?
-              @new_settings << ['function-key-def', key_idx, '0']
-            else
-              @new_settings << ['function-key-def', key_idx, '1']
-              @new_settings << ['select-dial', key_idx, sk.number ]
-            end
-            @new_settings << ['key-label', key_idx, sk.label ]
-            @new_settings << ['key-label-unicode', key_idx, sk.label ]
-            key_pos = key_pos+1
-            
-          end
-        end
-        if key_pos == shift_key_position
-          @new_settings << ['function-key-def', shift_key_position, '18']
-          @new_settings << ['key-label', shift_key_position, 'Shift']
-          @new_settings << ['key-label-unicode', shift_key_position, 'Shift']
-          key_pos = key_pos+1
-        end
-       
-          (1001..1000+shift_key_position-1).each do |key_idx|
-            sk = soft_keys.shift
-            if sk.function == "log_out"
-              @new_settings << ['function-key-def', key_idx, '1']
-              @new_settings << ['select-dial', key_idx, 'f_lo' ]
-            elsif sk.function == "log_in"
-              @new_settings << ['function-key-def', key_idx, '1']
-              @new_settings << ['select-dial', key_idx, "f_li_#{sk.number}" ]
-            elsif sk.function == "dtmf"
-              @new_settings << ['function-key-def', key_idx, '54']
-              @new_settings << ['stimulus-DTMF-sequence', key_idx, sk.number ]
-            elsif sk.function.nil?
-              @new_settings << ['function-key-def', key_idx, '0']
-            else
-              @new_settings << ['function-key-def', key_idx, '1']
-              @new_settings << ['select-dial', key_idx, sk.number ]
-            end
-            @new_settings << ['key-label', key_idx, sk.label ]
-            @new_settings << ['key-label-unicode', key_idx, sk.label ]
-            key_pos = key_pos+1
- 
-          end
-        
-      #end
-      logger.debug(@new_settings)
-    end
-    
-    if @phone.nil? || sip_account.nil?
-      respond_to { |format|
-        format.xml { render :action => "clean-up" }
-      }
-        
-    elsif (reply_status == 'accepted' && contact_reason == 'reply-to' && reply_action == 'ReadAllItems')
-      respond_to { |format|
-        format.xml { render :action => "write" }
-      }
-      
-    elsif ["reply-to"].include? contact_reason 
-      respond_to { |format|
-        format.xml { render :action => "clean-up" }
-      }
-      
-    else
-      respond_to { |format|
-        format.xml { render :action => "index" }
-      }
-    end
-    
-  end
-end
-- 
cgit v1.2.3