summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-26 21:01:23 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-26 21:01:23 +0100
commitd7777f71e78ae173e26af39c7c65243b4604d6e8 (patch)
treebc283db831e37a3383873490d953172d8610f21f
parent63d392f39b44e143501ca06178c2e9b59f5053f5 (diff)
Added a tooltip.
-rw-r--r--app/views/phones/_index_core.html.haml10
-rw-r--r--config/locales/views/phones/de.yml1
-rw-r--r--config/locales/views/phones/en.yml1
3 files changed, 10 insertions, 2 deletions
diff --git a/app/views/phones/_index_core.html.haml b/app/views/phones/_index_core.html.haml
index 347b260..9a865f0 100644
--- a/app/views/phones/_index_core.html.haml
+++ b/app/views/phones/_index_core.html.haml
@@ -22,6 +22,12 @@
%td
%span.hidden-phone
%a{:href => '#', :rel => "tooltip", :title => t('phones.tool_tips.hot_desk'), :'data-trigger' => 'hover'}
- = phone.hot_deskable
- %td= phone.ip_address
+ = phone.hot_deskable == true ? t('simple_form.yes') : t('simple_form.no')
+
+ %td
+ - if phone.ip_address.blank?
+ %a{:href => '#', :rel => "tooltip", :title => t('phones.tool_tips.missing_ip_address'), :'data-trigger' => 'hover'}
+ = '-'
+ - else
+ = phone.ip_address
=render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone.phoneable, :child => phone} \ No newline at end of file
diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml
index af2804a..b45bb59 100644
--- a/config/locales/views/phones/de.yml
+++ b/config/locales/views/phones/de.yml
@@ -83,3 +83,4 @@ de:
connect_to_sip_account: 'SIP-Account mit dem Telefon verknüpfen'
tool_tips:
hot_desk: 'Mit aktivierter Hot Desk Fähigkeit können sich User der Anlage an einem Telefon ein- und ausloggen.'
+ missing_ip_address: 'Das Telefon hat sich bis jetzt noch nicht bei Gemeinschaft gemeldet. Vielleicht müssen Sie das Telefon manuell rebooten.'
diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml
index 306537f..bac3e68 100644
--- a/config/locales/views/phones/en.yml
+++ b/config/locales/views/phones/en.yml
@@ -83,3 +83,4 @@ en:
connect_to_sip_account: 'Connect to an existing SIP account'
tool_tips:
hot_desk: 'Hot desk triggers the ability for a user to login and out of a given phone.'
+ missing_ip_address: "The phone hasn't contacted this system yet. Maybe you need to reboot the phone."