From 544ea50a66da81989d0320735724bd09786be8ea Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 30 Dec 2012 11:23:09 +0100 Subject: Fixed some logic bugs. --- app/views/phones/_form_core.html.haml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/views/phones') 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 e200751676f22dd9a83905eea0057beb57c9c9a7 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer 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/views/phones') 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 1c84298030ece53b5915ccca3460c04889abaffe Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer 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/views/phones') 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