From 1168b9b5ba6458595e72809a98947fc66e3b2891 Mon Sep 17 00:00:00 2001 From: Jean-Roch Maitre Date: Fri, 17 Apr 2015 17:07:37 -0700 Subject: [PATCH] UI-1385: First part of commit for new helpBlock helper --- submodules/users/users.js | 2 +- views/devices-ata.html | 9 +-------- views/devices-fax.html | 9 +-------- views/devices-mobile.html | 9 +-------- views/devices-sip_device.html | 9 +-------- views/devices-smartphone.html | 9 +-------- views/devices-softphone.html | 9 +-------- views/groups-feature-forward.html | 13 +++---------- views/myOffice-callerIdPopup.html | 18 ++---------------- views/strategy-holidays.html | 10 ++-------- views/users-changePassword.html | 9 +-------- views/users-changePin.html | 9 +-------- views/users-feature-call_forward.html | 9 +-------- views/users-feature-caller_id.html | 9 +-------- views/users-feature-conferencing.html | 10 +--------- views/users-feature-vm_to_email.html | 9 +-------- 16 files changed, 20 insertions(+), 132 deletions(-) diff --git a/submodules/users/users.js b/submodules/users/users.js index 15938f3..da026a7 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -1839,7 +1839,7 @@ define(function(require){ }, openedTab: 'features' }, - timeoutWarningBox = featureTemplate.find('.timeout-warning'); + timeoutWarningBox = featureTemplate.find('.help-box.red-box'); if(currentUser.hasOwnProperty('call_forward') && currentUser.call_forward.require_keypress) { timeoutWarningBox.hide(); diff --git a/views/devices-ata.html b/views/devices-ata.html index 163a0a4..02037d8 100644 --- a/views/devices-ata.html +++ b/views/devices-ata.html @@ -136,14 +136,7 @@ {{else}} -
-
- -
-
- {{ i18n.devices.popupSettings.callerId.noE911Numbers }} -
-
+ {{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}} {{/if}} diff --git a/views/devices-fax.html b/views/devices-fax.html index 69a4661..20f6256 100644 --- a/views/devices-fax.html +++ b/views/devices-fax.html @@ -147,14 +147,7 @@ {{else}} -
-
- -
-
- {{ i18n.devices.popupSettings.callerId.noE911Numbers }} -
-
+ {{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}} {{/if}} diff --git a/views/devices-mobile.html b/views/devices-mobile.html index 58695b5..7207786 100644 --- a/views/devices-mobile.html +++ b/views/devices-mobile.html @@ -158,14 +158,7 @@ {{else}} -
-
- -
-
- {{ i18n.devices.popupSettings.callerId.noE911Numbers }} -
-
+ {{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}} {{/if}} diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html index ee127f6..7f311cd 100644 --- a/views/devices-sip_device.html +++ b/views/devices-sip_device.html @@ -201,14 +201,7 @@ {{else}} -
-
- -
-
- {{ i18n.devices.popupSettings.callerId.noE911Numbers }} -
-
+ {{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}} {{/if}} diff --git a/views/devices-smartphone.html b/views/devices-smartphone.html index 8b8bb56..d3ac6ed 100644 --- a/views/devices-smartphone.html +++ b/views/devices-smartphone.html @@ -188,14 +188,7 @@ {{else}} -
-
- -
-
- {{ i18n.devices.popupSettings.callerId.noE911Numbers }} -
-
+ {{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}} {{/if}} diff --git a/views/devices-softphone.html b/views/devices-softphone.html index 9055deb..3bb002f 100644 --- a/views/devices-softphone.html +++ b/views/devices-softphone.html @@ -158,14 +158,7 @@ {{else}} -
-
- -
-
- {{ i18n.devices.popupSettings.callerId.noE911Numbers }} -
-
+ {{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}} {{/if}} diff --git a/views/groups-feature-forward.html b/views/groups-feature-forward.html index 90f898d..d841ae4 100644 --- a/views/groups-feature-forward.html +++ b/views/groups-feature-forward.html @@ -11,16 +11,9 @@ -
-
-
-
-

{{ i18n.groups.forward.description }}

-
-
- + {{ helpBlock i18n.groups.forward.description }} + +
diff --git a/views/myOffice-callerIdPopup.html b/views/myOffice-callerIdPopup.html index 23ac981..5ff528f 100644 --- a/views/myOffice-callerIdPopup.html +++ b/views/myOffice-callerIdPopup.html @@ -17,14 +17,7 @@
-
-
-    -
-
-

{{ i18n.myOffice.callerId.numberHelp }}

-
-
+ {{helpBlock i18n.myOffice.callerId.numberHelp}}
@@ -33,14 +26,7 @@
-
-
-    -
-
-

{{ i18n.myOffice.callerId.nameHelp }}

-
-
+ {{helpBlock i18n.myOffice.callerId.nameHelp}}
diff --git a/views/strategy-holidays.html b/views/strategy-holidays.html index 5a2a331..4720c38 100644 --- a/views/strategy-holidays.html +++ b/views/strategy-holidays.html @@ -21,14 +21,8 @@
-
-
-    -
-
-

{{ i18n.strategy.holidays.helpHolidays }}

-
-
+ + {{helpBlock i18n.strategy.holidays.helpHolidays}}
diff --git a/views/users-changePassword.html b/views/users-changePassword.html index a79626a..5ae02fd 100644 --- a/views/users-changePassword.html +++ b/views/users-changePassword.html @@ -15,14 +15,7 @@
-
-
-    -
-
-

{{ i18n.users.dialogChangePassword.help }}

-
-
+ {{helpBlock i18n.users.dialogChangePassword.help}}
diff --git a/views/users-changePin.html b/views/users-changePin.html index fdac86d..dff66e0 100644 --- a/views/users-changePin.html +++ b/views/users-changePin.html @@ -9,14 +9,7 @@
-
-
-    -
-
-

{{ i18n.users.dialogChangePin.help }}

-
-
+ {{helpBlock i18n.users.dialogChangePin.help}}
diff --git a/views/users-feature-call_forward.html b/views/users-feature-call_forward.html index d3d4397..6e45681 100644 --- a/views/users-feature-call_forward.html +++ b/views/users-feature-call_forward.html @@ -53,14 +53,7 @@ {{#if extra.timeoutTooShort}} -
-
-    -
-
-

{{ i18n.users.call_forward.timeoutWarning }}

-
-
+ {{helpBlock i18n.users.call_forward.timeoutWarning 'error'}} {{/if}}