Merge branch 'develop'5.1-beta1

6 files changed, 20 insertions, 12 deletions

diff --git a/app/views/phones/_form_core.html.haml b/app/views/phones/_form_core.html.haml
index e0c664b..17b9ca8 100644
--- a/app/views/phones/_form_core.html.haml
+++ b/app/views/phones/_form_core.html.haml
@@ -9,7 +9,7 @@
       :javascript
         $(".fallback_sip_account_dropdown").hide()  
 
-  - if defined? NIGHTLY_REBOOT_OF_PHONES && NIGHTLY_REBOOT_OF_PHONES == true
+  - if defined? GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') && GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') == true
     = f.input :nightly_reboot, :label => t('phones.form.nightly_reboot.label'), :hint => conditional_hint('phones.form.nightly_reboot.hint')
-  - if defined? PROVISIONING_KEY_LENGTH && PROVISIONING_KEY_LENGTH > 0
+  - if !GsParameter.get('PROVISIONING_KEY_LENGTH').nil? && GsParameter.get('PROVISIONING_KEY_LENGTH') > 0
     = f.input :provisioning_key_active, :label => t('phones.form.provisioning_key_active.label'), :hint => conditional_hint('phones.form.provisioning_key_active.hint')
diff --git a/app/views/phones/_index_core.html.haml b/app/views/phones/_index_core.html.haml
index c442d7f..fc1ad19 100644
--- a/app/views/phones/_index_core.html.haml
+++ b/app/views/phones/_index_core.html.haml
@@ -1,13 +1,13 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('phones.index.mac_address')
     %th= t('phones.index.phone_model_id')
     %th= t('phones.index.hot_deskable')
     %th= t('phones.index.ip_address')
 
-  - reset_cycle
+  
   - for phone in phones
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= phone.pretty_mac_address
       %td= phone.phone_model
       %td= phone.hot_deskable
diff --git a/app/views/phones/edit.html.haml b/app/views/phones/edit.html.haml
index cdbacac..9452e2a 100644
--- a/app/views/phones/edit.html.haml
+++ b/app/views/phones/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("phones.edit.page_title", :resource => @phone.mac_address)
+- content_for :title, t("phones.edit.page_title", :resource => @phone.mac_address)
 
 = render "form"
diff --git a/app/views/phones/index.html.haml b/app/views/phones/index.html.haml
index 785adf9..4de7919 100644
--- a/app/views/phones/index.html.haml
+++ b/app/views/phones/index.html.haml
@@ -1,4 +1,4 @@
-- title t("phones.index.page_title")
+- content_for :title, t("phones.index.page_title")
 
 - if @phones.count > 0
   = render "index_core", :phones => @phones
diff --git a/app/views/phones/new.html.haml b/app/views/phones/new.html.haml
index ae0a539..95fbdf2 100644
--- a/app/views/phones/new.html.haml
+++ b/app/views/phones/new.html.haml
@@ -1,4 +1,4 @@
-- title t("phones.new.page_title")
+- content_for :title, t("phones.new.page_title")
 
 - if !@fallback_sip_accounts.any? && can?(:create, current_user.current_tenant.sip_accounts.build)
   %p
diff --git a/app/views/phones/show.html.haml b/app/views/phones/show.html.haml
index a7ee952..faf4061 100644
--- a/app/views/phones/show.html.haml
+++ b/app/views/phones/show.html.haml
@@ -1,4 +1,4 @@
-- title t("phones.show.page_title")
+- content_for :title, t("phones.show.page_title")
 
 %p
   %strong= t('phones.show.mac_address') + ":"
@@ -16,12 +16,12 @@
     %strong= t('phones.show.fallback_sip_account_id') + ":"
     = @phone.fallback_sip_account
 
-- if defined? NIGHTLY_REBOOT_OF_PHONES && NIGHTLY_REBOOT_OF_PHONES == true
+- if defined? GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') && GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') == true
   %p
     %strong= t('phones.show.nightly_reboot') + ":"
     = @phone.nightly_reboot
 
-- if defined? PROVISIONING_KEY_LENGTH && PROVISIONING_KEY_LENGTH > 0
+- if !GsParameter.get('PROVISIONING_KEY_LENGTH').nil? && GsParameter.get('PROVISIONING_KEY_LENGTH') > 0
   %p
     %strong= t('phones.show.provisioning_key_active') + ":"
     = @phone.provisioning_key_active
@@ -31,9 +31,17 @@
 
 - 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:
+    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.
+  %p
+    Das entsprechende Eingabefeld finden Sie unter
+    %br
+    Advanced -> Update -> Setting URL
+  %p
+    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}"
+  %p
+    Danach müssen Sie die Konfiguration abspeichern und das Telefon booten.
 
 = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @phone.phoneable, :child => @phone }