diff --git a/submodules/devices/devices.css b/submodules/devices/devices.css
index 5c37428..9f4f2c1 100644
--- a/submodules/devices/devices.css
+++ b/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;
}
diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 64a536c..c25fc59 100644
--- a/submodules/devices/devices.js
+++ b/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();
});
diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js
index 5c0074c..8e50fb1 100644
--- a/submodules/groups/groups.js
+++ b/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();
diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index a0166a5..e72c81e 100644
--- a/submodules/strategy/strategy.js
+++ b/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'));
diff --git a/submodules/users/users.css b/submodules/users/users.css
index 8a0df52..2410ea7 100644
--- a/submodules/users/users.css
+++ b/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 {
diff --git a/submodules/users/users.js b/submodules/users/users.js
index 7a84727..b5f3b2a 100644
--- a/submodules/users/users.js
+++ b/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);
diff --git a/views/devices-cellphone.html b/views/devices-cellphone.html
index 2299442..ad3340e 100644
--- a/views/devices-cellphone.html
+++ b/views/devices-cellphone.html
@@ -46,32 +46,29 @@
-
-
-
-
-
+
+
+ {{#monsterCheckbox i18n.devices.cellphone.requireKeypress }}
+
+ {{/monsterCheckbox}}
+
+
-
-
-
-
-
+ {{#monsterCheckbox i18n.devices.cellphone.keepCallerId }}
+
+ {{/monsterCheckbox}}
+
+
-
-
-
-
-
+ {{#monsterCheckbox i18n.devices.cellphone.hideContactList }}
+
+ {{/monsterCheckbox}}
+
+
diff --git a/views/devices-landline.html b/views/devices-landline.html
index 3da96a1..a79e165 100644
--- a/views/devices-landline.html
+++ b/views/devices-landline.html
@@ -46,32 +46,35 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
diff --git a/views/devices-mobile.html b/views/devices-mobile.html
index 6787768..ccaba76 100644
--- a/views/devices-mobile.html
+++ b/views/devices-mobile.html
@@ -174,21 +174,24 @@
diff --git a/views/devices-softphone.html b/views/devices-softphone.html
index 8933604..b238646 100644
--- a/views/devices-softphone.html
+++ b/views/devices-softphone.html
@@ -174,21 +174,24 @@
+
+
diff --git a/views/users-name.html b/views/users-name.html
index 46c642f..e03373b 100644
--- a/views/users-name.html
+++ b/views/users-name.html
@@ -24,9 +24,10 @@