UI-1385: First part of commit for new helpBlock helper

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();

views/devices-ata.html

@@ -136,14 +136,7 @@
 						</div>
 					</div>
 				{{else}}
-					<div class="help-box red-box">
-						<div class="wrapper-icon">
-							<i class="icon-remove icon-red"></i>
-						</div>
-						<div class="text-wrapper">
-							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-						</div>
-					</div>
+					{{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}}
 				{{/if}}
 			</div>
 		</form>

views/devices-fax.html

@@ -147,14 +147,7 @@
 						</div>
 					</div>
 				{{else}}
-					<div class="help-box red-box">
-						<div class="wrapper-icon">
-							<i class="icon-remove icon-red"></i>
-						</div>
-						<div class="text-wrapper">
-							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-						</div>
-					</div>
+					{{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}}
 				{{/if}}
 			</div>
 		</form>

views/devices-mobile.html

@@ -158,14 +158,7 @@
 						</div>
 					</div>
 				{{else}}
-					<div class="help-box red-box">
-        				<div class="wrapper-icon">
-            				<i class="icon-remove icon-red"></i>
-        				</div>
-        				<div class="text-wrapper">
-							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-						</div>
-    				</div>
+					{{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}}
 				{{/if}}
 			</div>
 

views/devices-sip_device.html

@@ -201,14 +201,7 @@
 						</div>
 					</div>
 				{{else}}
-					<div class="help-box red-box">
-						<div class="wrapper-icon">
-							<i class="icon-remove icon-red"></i>
-						</div>
-						<div class="text-wrapper">
-							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-						</div>
-					</div>
+					{{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}}
 				{{/if}}
 			</div>
 

views/devices-smartphone.html

@@ -188,14 +188,7 @@
 						</div>
 					</div>
 				{{else}}
-					<div class="help-box red-box">
-						<div class="wrapper-icon">
-							<i class="icon-remove icon-red"></i>
-						</div>
-						<div class="text-wrapper">
-							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-						</div>
-					</div>
+					{{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}}
 				{{/if}}
 			</div>
 		</form>

views/devices-softphone.html

@@ -158,14 +158,7 @@
 						</div>
 					</div>
 				{{else}}
-					<div class="help-box red-box">
-						<div class="wrapper-icon">
-							<i class="icon-remove icon-red"></i>
-						</div>
-						<div class="text-wrapper">
-							{{ i18n.devices.popupSettings.callerId.noE911Numbers }}
-						</div>
-					</div>
+					{{helpBlock i18n.devices.popupSettings.callerId.noE911Numbers 'error'}}
 				{{/if}}
 			</div>
 

views/groups-feature-forward.html

@@ -11,16 +11,9 @@
 		</div>
 	</div>
 
-	<div class="help-box gray-box">
-		<div class="wrapper-icon">
-		<i class="icon-info-sign2"></i></div>
-		<div class="text-wrapper">
-			<p>{{ i18n.groups.forward.description }}</p>
-		</div>
-	</div>
-<!-- 
-	<div class="content{{#unless group.extra.mapFeatures.forward.active}} disabled{{/unless}}">
-	</div> -->
+	{{ helpBlock i18n.groups.forward.description }}
+
+	<!-- <div class="content{{#unless group.extra.mapFeatures.forward.active}} disabled{{/unless}}"></div> -->
 
 	<div class="actions clearfix">
 		<div class="pull-right">

views/myOffice-callerIdPopup.html

@@ -17,14 +17,7 @@
 			</select>
 		</div>
 
-		<div class="help-box gray-box">
-			<div class="wrapper-icon">
-				&nbsp;<i class="icon-info-sign2"></i>&nbsp;
-			</div>
-			<div class="text-wrapper">
-				<p>{{ i18n.myOffice.callerId.numberHelp }}</p>
-			</div>
-		</div>
+		{{helpBlock i18n.myOffice.callerId.numberHelp}}
 	</div>
 
 	<div class="content number-feature" {{#compare selectedMainNumber '===' 'none'}}style="display:none;"{{/compare}}>
@@ -33,14 +26,7 @@
 			<input type="text" class="caller-id-name">
 		</div>
 
-		<div class="help-box gray-box">
-			<div class="wrapper-icon">
-				&nbsp;<i class="icon-info-sign2"></i>&nbsp;
-			</div>
-			<div class="text-wrapper">
-				<p>{{ i18n.myOffice.callerId.nameHelp }}</p>
-			</div>
-		</div>
+		{{helpBlock i18n.myOffice.callerId.nameHelp}}
 	</div>
 
 	<div class="content number-feature" {{#compare selectedMainNumber '===' 'none'}}style="display:none;"{{/compare}}>

views/strategy-holidays.html

@@ -21,14 +21,8 @@
 	</div>
 	<div class="holidays-list"></div>
 
-	<div class="help-box gray-box">
-		<div class="wrapper-icon">
-			&nbsp;<i class="icon-info-sign2"></i>&nbsp;
-		</div>
-		<div class="text-wrapper">
-			<p>{{ i18n.strategy.holidays.helpHolidays }}</p>
-		</div>
-	</div>
+
+	{{helpBlock i18n.strategy.holidays.helpHolidays}}
 </div>
 
 <div class="holidays-actions basic-actions">

views/users-changePassword.html

@@ -15,14 +15,7 @@
 			</div>
 		</form>
 
-		<div class="help-box gray-box">
-        	<div class="wrapper-icon">
-            	&nbsp;<i class="icon-info-sign2"></i>&nbsp;
-        	</div>
-        	<div class="text-wrapper">
-            	<p>{{ i18n.users.dialogChangePassword.help }}</p>
-        	</div>
-    	</div>
+		{{helpBlock i18n.users.dialogChangePassword.help}}
     </div>
 
 	<div class="actions clearfix">

views/users-changePin.html

@@ -9,14 +9,7 @@
 			</div>
 		</form>
 
-		<div class="help-box gray-box">
-			<div class="wrapper-icon">
-				&nbsp;<i class="icon-info-sign2"></i>&nbsp;
-			</div>
-			<div class="text-wrapper">
-				<p>{{ i18n.users.dialogChangePin.help }}</p>
-			</div>
-		</div>
+		{{helpBlock i18n.users.dialogChangePin.help}}
 	</div>
 
 	<div class="actions clearfix">

views/users-feature-call_forward.html

@@ -53,14 +53,7 @@
 		</form>
 
 		{{#if extra.timeoutTooShort}}
-		<div class="help-box red-box timeout-warning">
-        	<div class="wrapper-icon">
-            	&nbsp;<i class="icon-warning-sign2"></i>&nbsp;
-        	</div>
-        	<div class="text-wrapper">
-            	<p>{{ i18n.users.call_forward.timeoutWarning }}</p>
-        	</div>
-    	</div>
+			{{helpBlock i18n.users.call_forward.timeoutWarning 'error'}}
 		{{/if}}
 
 		<!--<div class="help-box gray-box">

views/users-feature-caller_id.html

@@ -19,14 +19,7 @@
 			{{/each}}
 		</select>
 
-		<div class="help-box gray-box">
-        	<div class="wrapper-icon">
-            	&nbsp;<i class="icon-info-sign2"></i>&nbsp;
-        	</div>
-        	<div class="text-wrapper">
-            	<p>{{ i18n.users.caller_id.help }}</p>
-        	</div>
-    	</div>
+		{{helpBlock i18n.users.caller_id.help}}
 	</div>
 
 	<div class="actions clearfix">

views/users-feature-conferencing.html

@@ -28,15 +28,7 @@
 			</div>
 		</form>
 
-		<div class="help-box gray-box">
-			<div class="wrapper-icon">
-				&nbsp;<i class="icon-info-sign2"></i>&nbsp;
-			</div>
-
-			<div class="text-wrapper">
-				<p>{{i18n.users.conferencing.help}}</p>
-			</div>
-		</div>
+		{{helpBlock i18n.users.conferencing.help}}
 	</div>
 
 	<div class="actions clearfix">

views/users-feature-vm_to_email.html

@@ -24,14 +24,7 @@
 			</label>
 		</form>
 
-		<div class="help-box gray-box">
-			<div class="wrapper-icon">
-				&nbsp;<i class="icon-info-sign2"></i>&nbsp;
-			</div>
-			<div class="text-wrapper">
-				<p>{{ i18n.users.vm_to_email.help }}</p>
-			</div>
-		</div>
+		{{helpBlock i18n.users.vm_to_email.help}}
 	</div>
 
 	<div class="actions clearfix">