Merge remote-tracking branch 'origin/master'

submodules/devices/devices.css

@@ -372,10 +372,12 @@
 /* RTP Special CSS */
 .edit-device .content .rtp-line > * {
 	float: left;
+	font-size: 14px;
 	margin-right: 10px;
 }
 
 .edit-device .form-horizontal .control-label.checkbox {
 	width: inherit;
 	margin-left: 35px;
+	padding-top: 3px;
 }

submodules/devices/devices.js

@@ -246,7 +246,6 @@ define(function(require){
 			}
 
 			monster.ui.tabs(templateDevice);
-			monster.ui.prettyCheck.create(templateDevice);
 			monster.ui.protectField(templateDevice.find('#sip_password'), templateDevice);
 
 			templateDevice.find('[data-toggle="tooltip"]').tooltip();
@@ -257,7 +256,7 @@ define(function(require){
 				templateDevice.find('#rtp_method').hide();
 			}
 
-			templateDevice.find('#secure_rtp').on('ifChanged', function() {
+			templateDevice.find('#secure_rtp').on('change', function() {
 				templateDevice.find('#rtp_method').toggle();
 			});
 

submodules/groups/groups.js

@@ -202,9 +202,6 @@ define(function(require){
 					});
 
 					self.groupsGetTemplate(type, groupId, function(template, data) {
-						//FancyCheckboxes.
-						monster.ui.prettyCheck.create(template);
-
 						template.find('[data-toggle="tooltip"]').tooltip();
 
 						row.find('.edit-groups').append(template).slideDown();

submodules/strategy/strategy.js

@@ -305,7 +305,6 @@ define(function(require){
 						template.find('.timepicker').timepicker({
 							timeFormat: is12hMode ? 'g:ia' : 'G:i'
 						});
-						monster.ui.prettyCheck.create(template);
 						callback && callback();
 						break;
 					case "holidays":
@@ -347,7 +346,6 @@ define(function(require){
 							}
 						});
 
-						monster.ui.prettyCheck.create(template);
 						callback && callback();
 						break;
 					case "calls":
@@ -411,7 +409,6 @@ define(function(require){
 							$this.siblings('.title').text($this.find('option:selected').closest('optgroup').prop('label'));
 						});
 
-						monster.ui.prettyCheck.create(container, 'radio');
 						callback && callback();
 						break;
 					default:
@@ -562,11 +559,9 @@ define(function(require){
 							popupHtml = $(monster.template(self, 'strategy-popupRemoveFeatures', dataTemplate));
 
 							popup = monster.ui.dialog(popupHtml, {
-									title: self.i18n.active().strategy.popupRemoveFeatures.title,
-									width: '540px'
-								});
-
-							monster.ui.prettyCheck.create(popup);
+								title: self.i18n.active().strategy.popupRemoveFeatures.title,
+								width: '540px'
+							});
 
 							popup.find('.cancel-link').on('click', function() {
 								popup.dialog('close');
@@ -765,11 +760,11 @@ define(function(require){
 				}
 			});
 
-			container.on('ifToggled', '.custom-days input[type="checkbox"]', function(e) {
+			container.on('change', '.custom-days input[type="checkbox"]', function(e) {
 				var parent = $(this).parents('.custom-day'),
 					timepickers = parent.find('.timepickers'),
 					status = parent.find('.status');
-				if(this.checked) {
+				if($(this).prop('checked')) {
 					timepickers.fadeIn(200);
 					status.fadeOut(100, function() {
 						status.html(self.i18n.active().strategy.open);
@@ -784,8 +779,8 @@ define(function(require){
 				}
 			});
 
-			container.on('ifToggled', '.custom-hours-lunchbreak input[type="checkbox"]', function(e) {
-				if(this.checked) {
+			container.on('change', '.custom-hours-lunchbreak input[type="checkbox"]', function(e) {
+				if($(this).prop('checked')) {
 					$(this).parents('.custom-hours-lunchbreak').find('.timepickers').fadeIn(200);
 				} else {
 					$(this).parents('.custom-hours-lunchbreak').find('.timepickers').fadeOut(200);
@@ -879,8 +874,8 @@ define(function(require){
 		strategyHolidaysBindEvents: function(container, strategyData) {
 			var self = this;
 
-			container.on('ifToggled', '.holidays-toggler input[type="checkbox"]', function(e) {
-				if(this.checked) {
+			container.on('change', '.holidays-toggler input[type="checkbox"]', function(e) {
+				if($(this).prop('checked')) {
 					container.find('.holidays-div').slideDown();
 				} else {
 					container.find('.holidays-div').slideUp();
@@ -1065,8 +1060,23 @@ define(function(require){
 				$(this).tab('show');
 			});
 
+			function selectCallOption(container) {
+				container.siblings().removeClass('active');
+				container.addClass('active');
+			};
+
 			container.on('click', '.call-option', function(e) {
-				monster.ui.prettyCheck.action($(this).find('.radio-div input'), 'check');
+				var $this = $(this);
+
+				selectCallOption($this);
+
+				$this.find('.radio-div input[type="radio"]').prop('checked', true);
+			});
+
+			container.on('change', 'input[type="radio"]', function(e) {
+				if($(this).prop('checked')) {
+					selectCallOption($(this).parents('.call-option'));
+				}
 			});
 
 			container.on('click', '.menu-div a', function(e) {
@@ -1079,13 +1089,6 @@ define(function(require){
 				});
 			});
 
-			container.on('ifChecked', 'input[type="radio"]', function(e) {
-				var parentCallOption = $(this).parents('.call-option');
-
-				parentCallOption.siblings().removeClass('active');
-				parentCallOption.addClass('active');
-			});
-
 			container.on('change', '.user-select select', function(e) {
 				var $this = $(this);
 				$this.siblings('.title').text($this.find('option:selected').closest('optgroup').prop('label'));

submodules/users/users.css

@@ -278,7 +278,7 @@
 }
 
 #users_container .detail-user .fix-left {
-	margin-left: 12px;
+	margin-left: 16px;
 }
 
 #users_container .detail-user .row-fields {
@@ -585,10 +585,6 @@
 	width: 0px;
 }
 
-#creation_user_dialog .control-group.hack-left .icheckbox_flat {
-	margin-right: 12px;
-}
-
 #creation_user_dialog .control-group.hack-left .controls {
 	margin-left: 0;
 }
@@ -680,10 +676,6 @@
 }
 
 /* Hot Desking User Feature Popup */
-.feature-popup-container[data-feature="hotdesk"] form .main-line .icheckbox_flat {
-	margin-left: 10px;
-}
-
 .feature-popup-container[data-feature="hotdesk"] #pin {
 	margin-top: 10px;
 }

submodules/users/users.js

@@ -455,9 +455,6 @@ define(function(require){
 							currentUser = data;
 						}
 
-						//FancyCheckboxes.
-						monster.ui.prettyCheck.create(template);
-
 						row.find('.edit-user').append(template).slideDown(400, function() {
 							$('body').animate({ scrollTop: row.offset().top - (window.innerHeight - row.height() - 10) });
 						});
@@ -500,8 +497,6 @@ define(function(require){
 						var originalData = self.usersFormatAddUser(results),
 							userTemplate = $(monster.template(self, 'users-creation', originalData));
 
-						monster.ui.prettyCheck.create(userTemplate);
-
 						monster.ui.validate(userTemplate.find('#form_user_creation'), {
 							rules: {
 								'callflow.extension': {
@@ -537,7 +532,7 @@ define(function(require){
 							}
 						});
 
-						userTemplate.find('#notification_email').on('ifChanged', function() {
+						userTemplate.find('#notification_email').on('change', function() {
 							userTemplate.find('.email-group').toggleClass('hidden');
 						});
 
@@ -666,7 +661,7 @@ define(function(require){
 				});
 			});
 
-			template.on('ifChanged', '#notification_email', function() {
+			template.on('change', '#notification_email', function() {
 				if ( template.find('.email-border').hasClass('open') ) {
 					template.find('.email-border').removeClass('open', 400);
 					template.find('.email-group').slideUp();
@@ -1560,8 +1555,6 @@ define(function(require){
 				}
 			});
 
-			monster.ui.prettyCheck.create(featureTemplate.find('.content'));
-
 			var popup = monster.ui.dialog(featureTemplate, {
 				title: data.user.extra.mapFeatures.conferencing.title,
 				position: ['center', 20]
@@ -1578,8 +1571,6 @@ define(function(require){
 				featureTemplate = $(monster.template(self, 'users-feature-faxing', data)),
 				switchFeature = featureTemplate.find('.switch').bootstrapSwitch();
 
-			monster.ui.prettyCheck.create(featureTemplate.find('.content'));
-
 			if ( !_.isEmpty(data.extra.listNumbers) ) {
 				var popup = monster.ui.dialog(featureTemplate, {
 						title: data.user.extra.mapFeatures.faxing.title,
@@ -1639,7 +1630,7 @@ define(function(require){
 				data.value ? featureTemplate.find('.content').slideDown() : featureTemplate.find('.content').slideUp();
 			});
 
-			requirePin.on('ifChanged', function() {
+			requirePin.on('change', function() {
 				if(requirePin.is(':checked')) {
 					featureTemplate.find('#pin')
 						.removeAttr('disabled', 'disabled')
@@ -1677,8 +1668,6 @@ define(function(require){
 				}
 			});
 
-			monster.ui.prettyCheck.create(featureTemplate.find('.content'));
-
 			var popup = monster.ui.dialog(featureTemplate, {
 				title: currentUser.extra.mapFeatures.hotdesk.title,
 				position: ['center', 20]
@@ -1765,8 +1754,6 @@ define(function(require){
 				}
 			});
 
-			monster.ui.prettyCheck.create(featureTemplate.find('.content'));
-
 			var popup = monster.ui.dialog(featureTemplate, {
 				title: currentUser.extra.mapFeatures.vm_to_email.title,
 				position: ['center', 20]
@@ -1848,9 +1835,8 @@ define(function(require){
 			}
 
 			monster.ui.validate(featureForm);
-			monster.ui.prettyCheck.create(featureTemplate.find('.content'));
 
-			featureTemplate.find('input[name="require_keypress"]').on('ifToggled', function() {
+			featureTemplate.find('input[name="require_keypress"]').on('change', function() {
 				timeoutWarningBox.toggle();
 			});
 
@@ -2102,7 +2088,7 @@ define(function(require){
 			_.each(deviceList, function(device) {
 				createSlider(device);
 				if(!(device.id in ringGroup)) {
-					monster.ui.prettyCheck.action(template.find('.device-row[data-device_id="'+device.id+'"] .disable-device'), 'check');
+					template.find('.device-row[data-device_id="'+device.id+'"] .disable-device').prop('checked', true);
 				}
 			});
 			createSliderScale(template.find('.device-row.title'), true);

views/devices-cellphone.html

@@ -46,32 +46,29 @@
 
 			<div class="tabs-section" data-section="options">
 				<div class="control-group">
-            		<label class="control-label" for="require_keypress"></label>
-            		<div class="controls">
-                		<label>
-                    		<input id="require_keypress" type="checkbox" name="call_forward.require_keypress"{{#if call_forward.require_keypress}} checked="checked"{{/if}}></input>
-                    		{{ i18n.devices.cellphone.requireKeypress }}
-                		</label>
-            		</div>
-        		</div>
+					<label class="control-label" for="require_keypress"></label>
+					<div class="controls">
+						{{#monsterCheckbox i18n.devices.cellphone.requireKeypress }}
+							<input id="require_keypress" type="checkbox" name="call_forward.require_keypress"{{#if call_forward.require_keypress}} checked="checked"{{/if}}></input>
+						{{/monsterCheckbox}}
+					</div>
+				</div>
 				<div class="control-group">
-            		<label class="control-label" for="keep_caller_id"></label>
-            		<div class="controls">
-                		<label>
-                    		<input id="keep_caller_id" type="checkbox" name="call_forward.keep_caller_id"{{#if call_forward.keep_caller_id}} checked="checked"{{/if}}></input>
-                    		{{ i18n.devices.cellphone.keepCallerId }}
-                		</label>
-            		</div>
-        		</div>
+					<label class="control-label" for="keep_caller_id"></label>
+					<div class="controls">
+						{{#monsterCheckbox i18n.devices.cellphone.keepCallerId }}
+							<input id="keep_caller_id" type="checkbox" name="call_forward.keep_caller_id"{{#if call_forward.keep_caller_id}} checked="checked"{{/if}}></input>
+						{{/monsterCheckbox}}
+					</div>
+				</div>
 				<div class="control-group">
-            		<label class="control-label" for="hide_contact_list"></label>
-            		<div class="controls">
-                		<label>
-                    		<input id="hide_contact_list" type="checkbox" name="contact_list.exclude"{{#if contact_list.exclude}} checked="checked"{{/if}}></input>
-                    		{{ i18n.devices.cellphone.hideContactList }}
-                		</label>
-            		</div>
-        		</div>
+					<label class="control-label" for="hide_contact_list"></label>
+					<div class="controls">
+						{{#monsterCheckbox i18n.devices.cellphone.hideContactList }}
+							<input id="hide_contact_list" type="checkbox" name="contact_list.exclude"{{#if contact_list.exclude}} checked="checked"{{/if}}></input>
+						{{/monsterCheckbox}}
+					</div>
+				</div>
 			</div>
 		</form>
 	</div>

views/devices-landline.html

@@ -46,32 +46,35 @@
 
 			<div class="tabs-section" data-section="options">
 				<div class="control-group">
-            		<label class="control-label" for="require_keypress"></label>
-            		<div class="controls">
-                		<label>
-                    		<input id="require_keypress" type="checkbox" name="call_forward.require_keypress"{{#if call_forward.require_keypress}} checked="checked"{{/if}}></input>
-                    		{{ i18n.devices.landline.requireKeypress }}
-                		</label>
-            		</div>
-        		</div>
+					<label class="control-label" for="require_keypress"></label>
+					<div class="controls">
+						<label>
+							{{#monsterCheckbox i18n.devices.landline.requireKeypress }}
+								<input id="require_keypress" type="checkbox" name="call_forward.require_keypress"{{#if call_forward.require_keypress}} checked="checked"{{/if}}></input>
+							{{/monsterCheckbox}}
+						</label>
+					</div>
+				</div>
 				<div class="control-group">
-            		<label class="control-label" for="keep_caller_id"></label>
-            		<div class="controls">
-                		<label>
-                    		<input id="keep_caller_id" type="checkbox" name="call_forward.keep_caller_id"{{#if call_forward.keep_caller_id}} checked="checked"{{/if}}></input>
-                    		{{ i18n.devices.landline.keepCallerId }}
-                		</label>
-            		</div>
-        		</div>
+					<label class="control-label" for="keep_caller_id"></label>
+					<div class="controls">
+						<label>
+							{{#monsterCheckbox i18n.devices.landline.keepCallerId }}
+								<input id="keep_caller_id" type="checkbox" name="call_forward.keep_caller_id"{{#if call_forward.keep_caller_id}} checked="checked"{{/if}}></input>
+							{{/monsterCheckbox}}
+						</label>
+					</div>
+				</div>
 				<div class="control-group">
-            		<label class="control-label" for="hide_contact_list"></label>
-            		<div class="controls">
-                		<label>
-                    		<input id="hide_contact_list" type="checkbox" name="contact_list.exclude"{{#if contact_list.exclude}} checked="checked"{{/if}}></input>
-                    		{{ i18n.devices.landline.hideContactList }}
-                		</label>
-            		</div>
-        		</div>
+					<label class="control-label" for="hide_contact_list"></label>
+					<div class="controls">
+						<label>
+							{{#monsterCheckbox i18n.devices.landline.hideContactList }}
+								<input id="hide_contact_list" type="checkbox" name="contact_list.exclude"{{#if contact_list.exclude}} checked="checked"{{/if}}></input>
+							{{/monsterCheckbox}}
+						</label>
+					</div>
+				</div>
 			</div>
 		</form>
 	</div>

views/devices-mobile.html

@@ -174,21 +174,24 @@
 
 				<div class="control-group">
 					<label class="control-label checkbox">
-						<input type="checkbox" name="ignore_completed_elsewhere"{{#if ignore_completed_elsewhere}} checked="checked"{{/if}}></input>
-						{{ i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }} <i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
+						{{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }}
+							<input type="checkbox" name="ignore_completed_elsewhere" id="ignore_completed_elsewhere" {{#if ignore_completed_elsewhere }}checked{{/if}} />
+						{{/monsterCheckbox}}
+						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
 					</label>
 				</div>
 
 				<div class="rtp-line">
 					<div class="control-group">
 						<label class="control-label checkbox">
-							<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
-							{{ i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+							{{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+								<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
+							{{/monsterCheckbox}}
 						</label>
 					</div>
 
 					<div id="rtp_method">
-						{{ i18n.devices.popupSettings.miscellaneous.rtp.type }}
+						<span>{{ i18n.devices.popupSettings.miscellaneous.rtp.type }}</span>
 
 						<select class="input-small" name="extra.rtpMethod">
 							<option value="srtp"{{#compare extra.rtpMethod "===" "srtp"}} selected{{/compare}}>{{ i18n.devices.popupSettings.miscellaneous.rtp.srtp }}</option>

views/devices-sip_device.html

@@ -214,21 +214,24 @@
 
 				<div class="control-group">
 					<label class="control-label checkbox">
-						<input type="checkbox" name="ignore_completed_elsewhere"{{#if ignore_completed_elsewhere}} checked="checked"{{/if}}></input>
-						{{ i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }} <i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
+						{{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }}
+							<input type="checkbox" name="ignore_completed_elsewhere" id="ignore_completed_elsewhere" {{#if ignore_completed_elsewhere }}checked{{/if}} />
+						{{/monsterCheckbox}}
+						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
 					</label>
 				</div>
 
 				<div class="rtp-line">
 					<div class="control-group">
 						<label class="control-label checkbox">
-							<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
-							{{ i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+							{{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+								<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
+							{{/monsterCheckbox}}
 						</label>
 					</div>
 
 					<div id="rtp_method">
-						{{ i18n.devices.popupSettings.miscellaneous.rtp.type }}
+						<span>{{ i18n.devices.popupSettings.miscellaneous.rtp.type }}</span>
 
 						<select class="input-small" name="extra.rtpMethod">
 							<option value="srtp"{{#compare extra.rtpMethod "===" "srtp"}} selected{{/compare}}>{{ i18n.devices.popupSettings.miscellaneous.rtp.srtp }}</option>

views/devices-sip_uri.html

@@ -49,8 +49,9 @@
 					<label class="control-label" for="hide_contact_list"></label>
 					<div class="controls">
 						<label>
-							<input id="hide_contact_list" type="checkbox" name="contact_list.exclude"{{#if contact_list.exclude}} checked="checked"{{/if}}></input>
-							{{ i18n.devices.sip_uri.hideContactList }}
+							{{#monsterCheckbox i18n.devices.sip_uri.hideContactList}}
+								<input id="hide_contact_list" type="checkbox" name="contact_list.exclude"{{#if contact_list.exclude}} checked="checked"{{/if}}></input>
+							{{/monsterCheckbox}}
 						</label>
 					</div>
 				</div>

views/devices-smartphone.html

@@ -73,8 +73,9 @@
 					<label class="control-label" for="require_keypress"></label>
 					<div class="controls">
 						<label>
-							<input id="require_keypress" type="checkbox" name="call_forward.require_keypress"{{#if call_forward.require_keypress}} checked="checked"{{/if}}></input>
-							{{ i18n.devices.smartphone.requireKeypress }}
+							{{#monsterCheckbox i18n.devices.smartphone.requireKeypress }}
+								<input id="require_keypress" type="checkbox" name="call_forward.require_keypress"{{#if call_forward.require_keypress}} checked="checked"{{/if}}></input>
+							{{/monsterCheckbox}}
 						</label>
 					</div>
 				</div>
@@ -82,8 +83,9 @@
 					<label class="control-label" for="keep_caller_id"></label>
 					<div class="controls">
 						<label>
-							<input id="keep_caller_id" type="checkbox" name="call_forward.keep_caller_id"{{#if call_forward.keep_caller_id}} checked="checked"{{/if}}></input>
-							{{ i18n.devices.smartphone.keepCallerId }}
+							{{#monsterCheckbox i18n.devices.smartphone.keepCallerId }}
+								<input id="keep_caller_id" type="checkbox" name="call_forward.keep_caller_id"{{#if call_forward.keep_caller_id}} checked="checked"{{/if}}></input>
+							{{/monsterCheckbox}}
 						</label>
 					</div>
 				</div>
@@ -91,8 +93,9 @@
 					<label class="control-label" for="hide_contact_list"></label>
 					<div class="controls">
 						<label>
-							<input id="hide_contact_list" type="checkbox" name="contact_list.exclude"{{#if contact_list.exclude}} checked="checked"{{/if}}></input>
-							{{ i18n.devices.smartphone.hideContactList }}
+							{{#monsterCheckbox i18n.devices.smartphone.hideContactList }}
+								<input id="hide_contact_list" type="checkbox" name="contact_list.exclude"{{#if contact_list.exclude}} checked="checked"{{/if}}></input>
+							{{/monsterCheckbox}}
 						</label>
 					</div>
 				</div>

views/devices-softphone.html

@@ -174,21 +174,24 @@
 
 				<div class="control-group">
 					<label class="control-label checkbox">
-						<input type="checkbox" name="ignore_completed_elsewhere"{{#if ignore_completed_elsewhere}} checked="checked"{{/if}}></input>
-						{{ i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }} <i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
+						{{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }}
+							<input type="checkbox" name="ignore_completed_elsewhere" id="ignore_completed_elsewhere" {{#if ignore_completed_elsewhere }}checked{{/if}} />
+						{{/monsterCheckbox}}
+						<i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
 					</label>
 				</div>
 
 				<div class="rtp-line">
 					<div class="control-group">
 						<label class="control-label checkbox">
-							<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
-							{{ i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+							{{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+								<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
+							{{/monsterCheckbox}}
 						</label>
 					</div>
 
 					<div id="rtp_method">
-						{{ i18n.devices.popupSettings.miscellaneous.rtp.type }}
+						<span>{{ i18n.devices.popupSettings.miscellaneous.rtp.type }}</span>
 
 						<select class="input-small" name="extra.rtpMethod">
 							<option value="srtp"{{#compare extra.rtpMethod "===" "srtp"}} selected{{/compare}}>{{ i18n.devices.popupSettings.miscellaneous.rtp.srtp }}</option>

views/strategy-holidays.html

@@ -1,7 +1,8 @@
 <div class="holidays-toggler">
 	<label>
-		<input type="checkbox" name="holidays.enabled" {{#if enabled}}checked{{/if}}>
-		{{i18n.strategy.holidays.enableTitle}}
+		{{#monsterCheckbox i18n.strategy.holidays.enableTitle}}
+			<input type="checkbox" name="holidays.enabled" {{#if enabled}}checked{{/if}}>
+		{{/monsterCheckbox}}
 	</label>
 </div>
 

views/strategy-hours.html

@@ -35,8 +35,9 @@
 					<span class="status pull-right">{{#if this.open}}{{../../i18n.strategy.open}}{{else}}{{../../i18n.strategy.closed}}{{/if}}</span>
 					<div>
 						<label class="custom-day-label">
-							<input type="checkbox" name="opendays[]" value="{{this.name}}" {{#if this.open}}checked{{/if}}>
-							{{this.label}}
+							{{#monsterCheckbox this.label}}
+								<input type="checkbox" name="opendays[]" value="{{this.name}}" {{#if this.open}}checked{{/if}}>
+							{{/monsterCheckbox}}
 						</label>
 						<span class="timepickers" {{#unless this.open}}style="display:none;"{{/unless}}>
 							<input required class="from-hour timepicker" type="text" name="weekdays.{{this.name}}.from" value="{{this.from}}">
@@ -49,8 +50,9 @@
 			</div>
 			<div class="custom-hours-lunchbreak">
 				<label>
-					<input type="checkbox" name="lunchbreak.enabled" {{#if lunchbreak.enabled}}checked{{/if}}>
-					{{i18n.strategy.hours.lunchbreakTitle}}
+					{{#monsterCheckbox i18n.strategy.hours.lunchbreakTitle}}
+						<input type="checkbox" name="lunchbreak.enabled" {{#if lunchbreak.enabled}}checked{{/if}}>
+					{{/monsterCheckbox}}
 				</label>
 				<span class="timepickers" {{#unless lunchbreak.enabled}}style="display:none;"{{/unless}}>
 					<input required class="from-hour timepicker" type="text" name="lunchbreak.from" value="{{lunchbreak.from}}">

views/strategy-popupRemoveFeatures.html

@@ -12,8 +12,9 @@
 			<tr>
 				<td data-name="{{name}}">
 					<label class="checkbox" for="{{name}}">
-						<input type="checkbox" id="{{name}}">
-						{{friendlyName}}
+						{{#monsterCheckbox friendlyName}}
+							<input type="checkbox" id="{{name}}">
+						{{/monsterCheckbox}}
 					</label>
 				</td>
 			</tr>

views/users-creation.html

@@ -38,19 +38,17 @@
 		<div class="control-group hack-left">
 			<label class="control-label" for="include_directory"></label>
 			<div class="controls">
-				<label>
+				{{#monsterCheckbox i18n.users.includeInDirectory }}
 					<input id="include_directory" type="checkbox" name="extra.includeInDirectory"{{#if includeInDirectory}} checked="checked"{{/if}}></input>
-					{{ i18n.users.includeInDirectory }}
-				</label>
+				{{/monsterCheckbox}}
 			</div>
 		</div>
 		<div class="control-group hack-left">
 			<label class="control-label" for="notification_email"></label>
 			<div class="controls">
-				<label>
+				{{#monsterCheckbox i18n.users.dialogCreationUser.sendToDifferentEmail }}
 					<input id="notification_email" type="checkbox" name="extra.differentEmail"{{#if sendToDifferentEmail}} checked{{/if}}></input>
-					{{ i18n.users.dialogCreationUser.sendToDifferentEmail }}
-				</label>
+				{{/monsterCheckbox}}
 			</div>
 		</div>
 		<div class="control-group email-group{{#unless sendToDifferentEmail}} hidden{{/unless}}">
@@ -62,10 +60,9 @@
 		<div class="control-group hack-left">
 			<label class="control-label" for="send_email_on_creation"></label>
 			<div class="controls">
-				<label>
+				{{#monsterCheckbox i18n.users.dialogCreationUser.sendWelcomeEmail }}
 					<input id="send_email_on_creation" type="checkbox" name="user.send_email_on_creation"></input>
-					{{ i18n.users.dialogCreationUser.sendWelcomeEmail }}
-				</label>
+				{{/monsterCheckbox}}
 			</div>
 		</div>
 	</div>

views/users-feature-call_forward.html

@@ -34,16 +34,19 @@
 			</div> -->
 
 			<label class="fix-left">
-				<input type="checkbox" name="require_keypress"{{#unless call_forward.require_keypress}} checked{{/unless}}></input>
-				{{ i18n.users.call_forward.requireKeyPress }}
+				{{#monsterCheckbox i18n.users.call_forward.requireKeyPress}}
+					<input type="checkbox" name="require_keypress"{{#unless call_forward.require_keypress}} checked{{/unless}}></input>
+				{{/monsterCheckbox}}
 			</label>
 			<label class="fix-left">
-				<input type="checkbox" name="direct_calls_only"{{#if call_forward.direct_calls_only}} checked{{/if}}></input>
-				{{ i18n.users.call_forward.directCallsOnly }}
+				{{#monsterCheckbox i18n.users.call_forward.directCallsOnly}}
+					<input type="checkbox" name="direct_calls_only"{{#if call_forward.direct_calls_only}} checked{{/if}}></input>
+				{{/monsterCheckbox}}
 			</label>
 			<label class="fix-left">
-				<input type="checkbox" name="keep_caller_id"{{#if call_forward.keep_caller_id}} checked{{/if}}></input>
-				{{ i18n.users.call_forward.keepCallerId }}
+				{{#monsterCheckbox i18n.users.call_forward.keepCallerId}}
+					<input type="checkbox" name="keep_caller_id"{{#if call_forward.keep_caller_id}} checked{{/if}}></input>
+				{{/monsterCheckbox}}
 			</label>
 		</form>
 

views/users-feature-hotdesk.html

@@ -17,14 +17,18 @@
 			</div>
 
 			<div class="main-line">
-				{{ i18n.users.hotdesk.label }}
-				<input type="checkbox" name="require_pin"{{#if hotdesk.require_pin}} checked{{/if}}></input>
+
+				{{#monsterCheckbox i18n.users.hotdesk.label}}
+					<input type="checkbox" name="require_pin"{{#if hotdesk.require_pin}} checked{{/if}}></input>
+				{{/monsterCheckbox}}
+
 				<input required minlength="4" id="pin" type="text" name="pin" class="input-small" placeholder="{{ i18n.users.hotdesk.placeholder }}" value="{{hotdesk.pin}}"{{#unless hotdesk.require_pin}}disabled{{/unless}}></input>
 			</div>
 
 			<label class="fix-left">
-				<input type="checkbox" name="keep_logged_in_elsewhere"{{#if hotdesk.keep_logged_in_elsewhere}} checked{{/if}}></input>
-				{{ i18n.users.hotdesk.keep_logged_in_elsewhere }}
+				{{#monsterCheckbox i18n.users.hotdesk.keep_logged_in_elsewhere}}
+					<input type="checkbox" name="keep_logged_in_elsewhere"{{#if hotdesk.keep_logged_in_elsewhere}} checked{{/if}}></input>
+				{{/monsterCheckbox}}
 			</label>
 		</form>
 

views/users-feature-vm_to_email.html

@@ -1,12 +1,12 @@
 <div class="feature-popup-container" data-feature="vm_to_email">
 	<div class="feature-popup-title">
-        <div class="feature-icon-wrapper">
-            <i class="{{extra.mapFeatures.vm_to_email.icon}}"></i>
-        </div>
-        {{ i18n.users.vm_to_email.headline }}
-        <div class="switch" data-on="success" data-off="default" data-on-label="{{i18n.enabled}}" data-off-label="{{i18n.disabled}}">
+		<div class="feature-icon-wrapper">
+			<i class="{{extra.mapFeatures.vm_to_email.icon}}"></i>
+		</div>
+		{{ i18n.users.vm_to_email.headline }}
+		<div class="switch" data-on="success" data-off="default" data-on-label="{{i18n.enabled}}" data-off-label="{{i18n.disabled}}">
 			<input type="checkbox" id="checkbox_vm_to_email"{{#if extra.mapFeatures.vm_to_email.active}} checked="checked"{{/if}}></input>
-        </div>
+		</div>
 	</div>
 
 	<div class="content{{#unless extra.mapFeatures.vm_to_email.active}} disabled{{/unless}}">
@@ -16,25 +16,26 @@
 			</div>
 
 			<label class="fix-left">
-				<input type="checkbox" name="delete_after_notify"{{#if extra.deleteAfterNotify}} checked{{/if}}></input>
-				{{ i18n.users.vm_to_email.deleteAfterNotify }}
+				{{#monsterCheckbox i18n.users.vm_to_email.deleteAfterNotify}}
+					<input type="checkbox" name="delete_after_notify"{{#if extra.deleteAfterNotify}} checked{{/if}}></input>
+				{{/monsterCheckbox}}
 			</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>
+			<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>
 	</div>
 
 	<div class="actions clearfix">
-        <div class="pull-right">
-            <a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-            <button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
-        </div>
-    </div>
+		<div class="pull-right">
+			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
+			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+		</div>
+	</div>
 </div>

views/users-name.html

@@ -24,9 +24,10 @@
 
 			<div class="email-border{{#if extra.differentEmail }} open{{/if}}">
 				<div class="row-fields email-checkbox">
-					<label class="fix-left" for="notification_email">
-						<input id="notification_email" type="checkbox" name="extra.differentEmail"{{#if extra.differentEmail}} checked{{/if}}></input>
-						{{ i18n.users.dialogCreationUser.sendToDifferentEmail }}
+					<label class="fix-left">
+						{{#monsterCheckbox i18n.users.dialogCreationUser.sendToDifferentEmail }}
+							<input id="notification_email" type="checkbox" name="extra.differentEmail"{{#if extra.differentEmail}} checked{{/if}}></input>
+						{{/monsterCheckbox}}
 					</label>
 				</div>
 
@@ -39,8 +40,9 @@
 			{{#if extra.mainCallflowId}}
 			<div class="row-fields">
 				<label class="fix-left">
-					<input id="include_directory" type="checkbox" name="extra.includeInDirectory"{{#if extra.includeInDirectory}} checked="checked"{{/if}}></input>
-					{{ i18n.users.includeInDirectory }}
+					{{#monsterCheckbox i18n.users.includeInDirectory }}
+						<input id="include_directory" type="checkbox" name="extra.includeInDirectory"{{#if extra.includeInDirectory}} checked="checked"{{/if}}></input>
+					{{/monsterCheckbox}}
 				</label>
 			</div>
 			{{/if}}