diff --git a/submodules/callLogs/callLogs.css b/submodules/callLogs/callLogs.css index 8a70edb..5b73499 100644 --- a/submodules/callLogs/callLogs.css +++ b/submodules/callLogs/callLogs.css @@ -221,9 +221,9 @@ body.colorblind #call_logs_container .grid-row:not(.header-row) .grid-cell.direction { background-color: #999; } -body.colorblind #call_logs_container .grid-cell.direction .icon-green { +body.colorblind #call_logs_container .grid-cell.direction .monster-green { color: #EEE !important; } -body.colorblind #call_logs_container .grid-cell.direction .icon-orange { +body.colorblind #call_logs_container .grid-cell.direction .monster-orange { color: #222 !important; } \ No newline at end of file diff --git a/submodules/callLogs/callLogs.js b/submodules/callLogs/callLogs.js index 5db8b88..728a0c1 100644 --- a/submodules/callLogs/callLogs.js +++ b/submodules/callLogs/callLogs.js @@ -198,7 +198,7 @@ define(function(require){ var loaderDiv = template.find('.call-logs-loader'); if(startKey) { loaderDiv.toggleClass('loading'); - loaderDiv.find('.loading-message > i').toggleClass('icon-spin'); + loaderDiv.find('.loading-message > i').toggleClass('icon-spinning'); self.callLogsGetCdrs(fromDate, toDate, function(newCdrs, nextStartKey) { newCdrs = self.callLogsFormatCdrs(newCdrs); cdrsTemplate = $(monster.template(self, 'callLogs-cdrsList', {cdrs: newCdrs})); @@ -217,7 +217,7 @@ define(function(require){ } loaderDiv.toggleClass('loading'); - loaderDiv.find('.loading-message > i').toggleClass('icon-spin'); + loaderDiv.find('.loading-message > i').toggleClass('icon-spinning'); }, startKey); } else { diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js index 82cf091..13f8083 100644 --- a/submodules/devices/devices.js +++ b/submodules/devices/devices.js @@ -442,8 +442,8 @@ define(function(require){ templateDevice.find('.restriction-matcher-sign').hide(); if(matchedLine.find('.restrictions-switch').prop('checked')) { - matchedSign.removeClass('icon-red icon-remove') - .addClass('icon-green icon-ok') + matchedSign.removeClass('monster-red icon-remove') + .addClass('monster-green icon-ok') .css('display', 'inline-block'); matchedMsg.removeClass('red-box') @@ -454,8 +454,8 @@ define(function(require){ monster.template(self, '!' + self.i18n.active().devices.popupSettings.restrictions.matcher.allowMessage, { phoneNumber: monster.util.formatPhoneNumber(number) }) ); } else { - matchedSign.removeClass('icon-green icon-ok') - .addClass('icon-red icon-remove') + matchedSign.removeClass('monster-green icon-ok') + .addClass('monster-red icon-remove') .css('display', 'inline-block'); matchedMsg.removeClass('green-box') diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js index ab3aa90..d0fe233 100644 --- a/submodules/groups/groups.js +++ b/submodules/groups/groups.js @@ -127,22 +127,22 @@ define(function(require){ mapFeatures: { call_recording: { icon: 'icon-microphone', - iconColor: 'icon-blue', + iconColor: 'monster-blue', title: self.i18n.active().groups.callRecording.title }, ringback: { icon: 'icon-music', - iconColor: 'icon-yellow', + iconColor: 'monster-yellow', title: self.i18n.active().groups.ringback.title }, next_action: { icon: 'icon-arrow-right', - iconColor: 'icon-green', + iconColor: 'monster-green', title: self.i18n.active().groups.nextAction.title }, forward: { icon: 'icon-mail-forward', - iconColor: 'icon-orange', + iconColor: 'monster-orange', title: self.i18n.active().groups.forward.title } }, diff --git a/submodules/users/users.js b/submodules/users/users.js index 1074640..784fda1 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -101,27 +101,27 @@ define(function(require){ mapFeatures: { caller_id: { icon: 'icon-user', - iconColor: 'icon-blue', + iconColor: 'monster-blue', title: self.i18n.active().users.caller_id.title }, call_forward: { icon: 'icon-mail-forward', - iconColor: 'icon-yellow', + iconColor: 'monster-yellow', title: self.i18n.active().users.call_forward.title }, hotdesk: { icon: 'icon-fire', - iconColor: 'icon-orange', + iconColor: 'monster-orange', title: self.i18n.active().users.hotdesk.title }, vm_to_email: { icon: 'icon-telicon-voicemail', - iconColor: 'icon-green', + iconColor: 'monster-green', title: self.i18n.active().users.vm_to_email.title }, faxing: { icon: 'icon-telicon-fax', - iconColor: 'icon-red', + iconColor: 'monster-red', title: self.i18n.active().users.faxing.title }, conferencing: { @@ -131,17 +131,17 @@ define(function(require){ }, find_me_follow_me: { icon: 'icon-sitemap', - iconColor: 'icon-purple', + iconColor: 'monster-purple', title: self.i18n.active().users.find_me_follow_me.title }, music_on_hold: { icon: 'icon-music', - iconColor: 'icon-pink', + iconColor: 'monster-pink', title: self.i18n.active().users.music_on_hold.title }, call_recording: { icon: 'icon-microphone', - iconColor: 'icon-blue', + iconColor: 'monster-blue', title: self.i18n.active().users.callRecording.title } } @@ -307,12 +307,12 @@ define(function(require){ if(mapUsers[userId].extra.devices.length == 2) { if(mapUsers[userId].extra.additionalDevices) { mapUsers[userId].extra.additionalDevices.count++; - mapUsers[userId].extra.additionalDevices.tooltip += '
' + mapUsers[userId].extra.additionalDevices.tooltip += '
' + device.name + ' (' + device.device_type.replace('_', ' ') + ')'; } else { mapUsers[userId].extra.additionalDevices = { count: 1, - tooltip: '' + tooltip: '' + device.name + ' (' + device.device_type.replace('_', ' ') + ')' }; } diff --git a/views/callLogs-cdrsList.html b/views/callLogs-cdrsList.html index 9b38500..2ad917b 100644 --- a/views/callLogs-cdrsList.html +++ b/views/callLogs-cdrsList.html @@ -4,9 +4,9 @@
{{#if this.isOutboundCall}} - + {{else}} - + {{/if}}
diff --git a/views/callLogs-layout.html b/views/callLogs-layout.html index efe4d1b..662ccd9 100644 --- a/views/callLogs-layout.html +++ b/views/callLogs-layout.html @@ -37,7 +37,7 @@ {{/if}} - {{i18n.download}} + {{i18n.download}} @@ -47,10 +47,10 @@
- +
- +
diff --git a/views/devices-ata.html b/views/devices-ata.html index 08ec9c7..cb35a6e 100644 --- a/views/devices-ata.html +++ b/views/devices-ata.html @@ -98,7 +98,7 @@ {{/monsterSwitch}}
- +
{{/each}} @@ -134,7 +134,7 @@
{{#if id}} - {{ i18n.devices.deleteDevice }} + {{ i18n.devices.deleteDevice }} {{/if}}
diff --git a/views/devices-cellphone.html b/views/devices-cellphone.html index ad3340e..c256aec 100644 --- a/views/devices-cellphone.html +++ b/views/devices-cellphone.html @@ -75,7 +75,7 @@
{{#if id}} - {{ i18n.devices.deleteDevice }} + {{ i18n.devices.deleteDevice }} {{/if}}
diff --git a/views/devices-fax.html b/views/devices-fax.html index 85e51af..e7b5f1d 100644 --- a/views/devices-fax.html +++ b/views/devices-fax.html @@ -109,7 +109,7 @@ {{/monsterSwitch}}
- +
{{/each}} @@ -145,7 +145,7 @@
{{#if id}} - {{ i18n.devices.deleteDevice }} + {{ i18n.devices.deleteDevice }} {{/if}}
diff --git a/views/devices-landline.html b/views/devices-landline.html index a79e165..586f3ed 100644 --- a/views/devices-landline.html +++ b/views/devices-landline.html @@ -81,7 +81,7 @@
{{#if id}} - {{ i18n.devices.deleteDevice }} + {{ i18n.devices.deleteDevice }} {{/if}}
diff --git a/views/devices-mobile.html b/views/devices-mobile.html index 7f2e868..51f68f4 100644 --- a/views/devices-mobile.html +++ b/views/devices-mobile.html @@ -120,7 +120,7 @@ {{/monsterSwitch}}
- +
{{/each}} @@ -190,7 +190,7 @@
{{#if id}} - {{ i18n.devices.deleteDevice }} + {{ i18n.devices.deleteDevice }} {{/if}}
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html index 2bf431e..a5ea034 100644 --- a/views/devices-sip_device.html +++ b/views/devices-sip_device.html @@ -157,7 +157,7 @@ {{/monsterSwitch}}
- +
{{/each}} @@ -293,7 +293,7 @@
{{#if id}} - {{ i18n.devices.deleteDevice }} + {{ i18n.devices.deleteDevice }} {{/if}}
diff --git a/views/devices-sip_uri.html b/views/devices-sip_uri.html index 8a99ab5..1c9b088 100644 --- a/views/devices-sip_uri.html +++ b/views/devices-sip_uri.html @@ -61,7 +61,7 @@
{{#if id}} - {{ i18n.devices.deleteDevice }} + {{ i18n.devices.deleteDevice }} {{/if}}
diff --git a/views/devices-smartphone.html b/views/devices-smartphone.html index ae0e136..be9c850 100644 --- a/views/devices-smartphone.html +++ b/views/devices-smartphone.html @@ -150,7 +150,7 @@ {{/monsterSwitch}}
- +
{{/each}} @@ -186,7 +186,7 @@
{{#if id}} - {{ i18n.devices.deleteDevice }} + {{ i18n.devices.deleteDevice }} {{/if}}
diff --git a/views/devices-softphone.html b/views/devices-softphone.html index 3fffb22..15d8798 100644 --- a/views/devices-softphone.html +++ b/views/devices-softphone.html @@ -114,7 +114,7 @@ {{/monsterSwitch}}
- +
{{/each}} @@ -190,7 +190,7 @@
{{#if id}} - {{ i18n.devices.deleteDevice }} + {{ i18n.devices.deleteDevice }} {{/if}}
diff --git a/views/groups-extensions.html b/views/groups-extensions.html index 4ab08f8..5625ba9 100644 --- a/views/groups-extensions.html +++ b/views/groups-extensions.html @@ -16,7 +16,7 @@
- {{ i18n.groups.addExtension }} + {{ i18n.groups.addExtension }}
{{ i18n.cancel }} diff --git a/views/groups-members.html b/views/groups-members.html index f1c80df..bb2b08e 100644 --- a/views/groups-members.html +++ b/views/groups-members.html @@ -6,7 +6,7 @@
  • - + {{ i18n.users.add }}
- {{ i18n.groups.delete }} + {{ i18n.groups.delete }}
{{ i18n.cancel }} diff --git a/views/groups-newExtension.html b/views/groups-newExtension.html index 3c2dfdd..84ff445 100644 --- a/views/groups-newExtension.html +++ b/views/groups-newExtension.html @@ -2,6 +2,6 @@
{{ i18n.groups.addNewExtension }} - +
diff --git a/views/groups-numbers.html b/views/groups-numbers.html index c185227..8d82d60 100644 --- a/views/groups-numbers.html +++ b/views/groups-numbers.html @@ -25,7 +25,7 @@
{{#compare this.state '===' 'port_in'}} - + {{/compare}} {{#each viewFeatures}} @@ -54,11 +54,11 @@
- {{ i18n.groups.addFromSpare }} + {{ i18n.groups.addFromSpare }}
{{#compare number.state '===' 'port_in'}} - + {{/compare}} {{#each number.viewFeatures}} diff --git a/views/myOffice-layout.html b/views/myOffice-layout.html index b5622e8..2b4b978 100644 --- a/views/myOffice-layout.html +++ b/views/myOffice-layout.html @@ -2,19 +2,19 @@
{{account.name}}
-
+
{{i18n.myOffice.topBarLinks.callerID}}
 -
+
{{i18n.myOffice.topBarLinks.musicOnHold}}
 -
+
{{i18n.myOffice.topBarLinks.hours}}
@@ -33,7 +33,7 @@
{{#times totalUsers}} -
+
{{/times}}
@@ -131,8 +131,8 @@