diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 11:57:48 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 11:57:48 +0100 |
| commit | 45883189e5708d68fb41fdbd153c4875c41b02b1 (patch) | |
| tree | 8f08ae9b57a87a04c42680a36219af7b6b03a8f6 | |
| parent | e03b0b57f4c05210d198e2fab031cb4b7bdd5247 (diff) | |
| parent | e200751676f22dd9a83905eea0057beb57c9c9a7 (diff) | |
Merge branch 'show_phone_manual_link' into develop
| -rw-r--r-- | app/views/phones/show.html.haml | 2 | ||||
| -rw-r--r-- | config/locales/views/phones/de.yml | 1 | ||||
| -rw-r--r-- | config/locales/views/phones/en.yml | 1 |
3 files changed, 4 insertions, 0 deletions
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') + ":" diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index dafe279..814267c 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -34,6 +34,7 @@ de: http_password: 'http password' nightly_reboot: 'Nachts automatischer Reboot' fallback_sip_account_id: 'Fallback SIP Account' + manual: 'Handbuch' actions: confirm: 'Sind Sie sicher, dass Sie diese Telefon aus Gemeinschaft entfernen möchten?' destroy: 'Löschen' diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml index ecd5a91..15e212e 100644 --- a/config/locales/views/phones/en.yml +++ b/config/locales/views/phones/en.yml @@ -34,6 +34,7 @@ en: nightly_reboot: 'Nightly reboot' provisioning_key_active: 'Provisioning key active' fallback_sip_account_id: 'Fallback SIP Account' + manual: 'Manual' actions: confirm: 'Are you sure you want to delete this phone?' destroy: 'Delete phone' |