summaryrefslogtreecommitdiff
path: root/app/views/phones
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-30 21:03:48 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-30 21:03:48 +0100
commitf04aa92778dca7f71ca656235885095b13dd3535 (patch)
treeb0ac9cf3dfecbbdb0209c1204054adcac861f001 /app/views/phones
parentf3c3e77eaa2b82567f02601b6f66177208674181 (diff)
parent508871c01cbf02bf6d8d7056c2d5a70e4d67eebf (diff)
Merge branch 'develop'5.0.2
Diffstat (limited to 'app/views/phones')
-rw-r--r--app/views/phones/_form_core.html.haml3
-rw-r--r--app/views/phones/show.html.haml8
2 files changed, 11 insertions, 0 deletions
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')
diff --git a/app/views/phones/show.html.haml b/app/views/phones/show.html.haml
index 090323e..a7ee952 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') + ":"
@@ -27,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")