Display the user and password for the phone's WebGUI.

3 files changed, 20 insertions, 6 deletions

diff --git a/app/views/phones/show.html.haml b/app/views/phones/show.html.haml
index 2cf6f3c..f56ae65 100644
--- a/app/views/phones/show.html.haml
+++ b/app/views/phones/show.html.haml
@@ -32,14 +32,14 @@
           %td
             %strong= t('phones.show.nightly_reboot') + ":"
           %td
-            = @phone.nightly_reboot
+            = @phone.nightly_reboot == true ? t('simple_form.yes') : t('simple_form.no')          
 
       - if !GsParameter.get('PROVISIONING_KEY_LENGTH').nil? && GsParameter.get('PROVISIONING_KEY_LENGTH') > 0
         %tr
           %td
             %strong= t('phones.show.provisioning_key_active') + ":"
           %td
-            = @phone.provisioning_key_active
+            = @phone.provisioning_key_active == true ? t('simple_form.yes') : t('simple_form.no')
 
       %tr{:class => (@phone.ip_address.blank? ? 'warning' : '')}
         %td
@@ -51,6 +51,20 @@
           - else
             = @phone.ip_address
 
+      - if current_user.admin? && (!@phone.http_user.blank? || !@phone.http_password.blank?)
+        %tr
+          %td
+            %strong= t('phones.show.http_user') + ":"
+          %td
+            = @phone.http_user
+
+        %tr
+          %td
+            %strong= t('phones.show.http_password') + ":"
+          %td
+            = @phone.http_password
+
+
     = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @phone.phoneable, :child => @phone }
 
 
diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml
index 19fab87..8fe6ba8 100644
--- a/config/locales/views/phones/de.yml
+++ b/config/locales/views/phones/de.yml
@@ -12,8 +12,8 @@ de:
       hot_deskable: 'Hot-Desk fähig'
       ip_address: 'IP-Adresse'
       last_ip_address: 'Letzte IP-Adresse'
-      http_user: 'http user'
-      http_password: 'http password'
+      http_user: 'Phone WebGUI Username'
+      http_password: 'Phone WebGUI Passwort'
       nightly_reboot: 'Nachts automatischer Reboot'
       provisioning_key_active: 'Provisioning Schlüssel aktiv'
       actions:
diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml
index eb05229..1f39f04 100644
--- a/config/locales/views/phones/en.yml
+++ b/config/locales/views/phones/en.yml
@@ -12,8 +12,8 @@ en:
       hot_deskable: 'Hot-deskable'
       ip_address: 'IP address'
       last_ip_address: 'Last IP address'
-      http_user: 'http user'
-      http_password: 'http password'
+      http_user: 'Phone WebGUI username'
+      http_password: 'Phone WebGUI password'
       nightly_reboot: 'Nightly reboot'
       actions:
         confirm_destroy: 'Are you sure you want to delete this phone?'