diff --git a/submodules/devices/devices.css b/submodules/devices/devices.css index d7c589e..331da05 100644 --- a/submodules/devices/devices.css +++ b/submodules/devices/devices.css @@ -74,7 +74,7 @@ margin-top: 20px; } -#devices_container .devices-grid i.icon-plus { +#devices_container .devices-grid i.fa-plus { margin-left: 5px; } diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js index 528e2d9..1b61231 100644 --- a/submodules/devices/devices.js +++ b/submodules/devices/devices.js @@ -777,7 +777,7 @@ define(function(require){ mapUsers = {}, unassignedString = self.i18n.active().devices.unassignedDevice, mapIconClass = { - cellphone: 'icon-phone', + cellphone: 'fa fa-phone', smartphone: 'icon-telicon-mobile-phone', landline: 'icon-telicon-home-phone', mobile: 'icon-telicon-sprint-phone', diff --git a/submodules/groups/groups.css b/submodules/groups/groups.css index a9e5f8c..1c25c87 100644 --- a/submodules/groups/groups.css +++ b/submodules/groups/groups.css @@ -78,7 +78,7 @@ margin-top: 20px; } -#groups_container .groups-grid i.icon-plus { +#groups_container .groups-grid i.fa-plus { margin-left: 5px; } diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js index d0fe233..f62f3d6 100644 --- a/submodules/groups/groups.js +++ b/submodules/groups/groups.js @@ -126,22 +126,22 @@ define(function(require){ result = { mapFeatures: { call_recording: { - icon: 'icon-microphone', + icon: 'fa fa-microphone', iconColor: 'monster-blue', title: self.i18n.active().groups.callRecording.title }, ringback: { - icon: 'icon-music', + icon: 'fa fa-music', iconColor: 'monster-yellow', title: self.i18n.active().groups.ringback.title }, next_action: { - icon: 'icon-arrow-right', + icon: 'fa fa-arrow-right', iconColor: 'monster-green', title: self.i18n.active().groups.nextAction.title }, forward: { - icon: 'icon-mail-forward', + icon: 'fa fa-mail-forward', iconColor: 'monster-orange', title: self.i18n.active().groups.forward.title } diff --git a/submodules/strategy/strategy.css b/submodules/strategy/strategy.css index 6857667..32292a0 100644 --- a/submodules/strategy/strategy.css +++ b/submodules/strategy/strategy.css @@ -93,13 +93,13 @@ vertical-align: middle; } -#strategy_container .element-container:not(.strategy-confnum) .title .icon-phone { +#strategy_container .element-container:not(.strategy-confnum) .title .fa-phone { color: #22a5ff; } /************** Main Numbers **************/ -#strategy_container .element-container.main-number .title .icon-phone { +#strategy_container .element-container.main-number .title .fa-phone { position: relative; top: 3px; font-size: 28px; diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index 16d1986..dbf8226 100644 --- a/submodules/strategy/strategy.js +++ b/submodules/strategy/strategy.js @@ -1791,10 +1791,10 @@ define(function(require){ switch(group.groupType) { case 'directory': - group.groupIcon = 'icon-book'; + group.groupIcon = 'fa fa-book'; break; case 'user': - group.groupIcon = 'icon-user'; + group.groupIcon = 'fa fa-user'; break; case 'device': group.groupIcon = 'icon-telicon-voip-phone'; diff --git a/submodules/users/users.js b/submodules/users/users.js index 784fda1..b9e5eab 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -15,7 +15,7 @@ define(function(require){ }, deviceIcons: { - 'cellphone': 'icon-phone', + 'cellphone': 'fa fa-phone', 'smartphone': 'icon-telicon-mobile-phone', 'landline': 'icon-telicon-home-phone', 'mobile': 'icon-telicon-sprint-phone', @@ -100,17 +100,17 @@ define(function(require){ differentEmail: dataUser.email !== dataUser.username, mapFeatures: { caller_id: { - icon: 'icon-user', + icon: 'fa fa-user', iconColor: 'monster-blue', title: self.i18n.active().users.caller_id.title }, call_forward: { - icon: 'icon-mail-forward', + icon: 'fa fa-share', iconColor: 'monster-yellow', title: self.i18n.active().users.call_forward.title }, hotdesk: { - icon: 'icon-fire', + icon: 'fa fa-fire', iconColor: 'monster-orange', title: self.i18n.active().users.hotdesk.title }, @@ -125,22 +125,22 @@ define(function(require){ title: self.i18n.active().users.faxing.title }, conferencing: { - icon: 'icon-comments', - iconColor: 'icon-gray', + icon: 'fa fa-comments', + iconColor: 'monster-grey', title: self.i18n.active().users.conferencing.title }, find_me_follow_me: { - icon: 'icon-sitemap', + icon: 'fa fa-sitemap', iconColor: 'monster-purple', title: self.i18n.active().users.find_me_follow_me.title }, music_on_hold: { - icon: 'icon-music', + icon: 'fa fa-music', iconColor: 'monster-pink', title: self.i18n.active().users.music_on_hold.title }, call_recording: { - icon: 'icon-microphone', + icon: 'fa fa-microphone', iconColor: 'monster-blue', title: self.i18n.active().users.callRecording.title } diff --git a/submodules/vmboxes/vmboxes.css b/submodules/vmboxes/vmboxes.css index 4b0afe3..9d89643 100644 --- a/submodules/vmboxes/vmboxes.css +++ b/submodules/vmboxes/vmboxes.css @@ -69,7 +69,7 @@ margin-top: 20px; } -#vmboxes_container .vmboxes-grid i.icon-plus { +#vmboxes_container .vmboxes-grid i.fa-plus { margin-left: 5px; } diff --git a/views/app.html b/views/app.html index b91b3c5..54135f7 100644 --- a/views/app.html +++ b/views/app.html @@ -2,7 +2,7 @@
- + {{ i18n.menuTitles.myOffice }}
@@ -10,7 +10,7 @@
- + {{ i18n.menuTitles.numbers }}
@@ -61,7 +61,7 @@
- + {{ i18n.menuTitles.featureCodes }}
diff --git a/views/callLogs-cdrsList.html b/views/callLogs-cdrsList.html index 4cfc35e..ed4fc2e 100644 --- a/views/callLogs-cdrsList.html +++ b/views/callLogs-cdrsList.html @@ -4,9 +4,9 @@
{{#if this.isOutboundCall}} - + {{else}} - + {{/if}}
@@ -42,7 +42,7 @@
- +
@@ -88,7 +88,7 @@
- +
diff --git a/views/callLogs-layout.html b/views/callLogs-layout.html index 2398e5f..d9bc082 100644 --- a/views/callLogs-layout.html +++ b/views/callLogs-layout.html @@ -16,7 +16,7 @@
- +
@@ -47,10 +47,10 @@
- +
- +
@@ -95,6 +95,6 @@
{{i18n.callLogs.loaderMessage}}
-
{{i18n.callLogs.loadingMessage}}
+
{{i18n.callLogs.loadingMessage}}
diff --git a/views/devices-ata.html b/views/devices-ata.html index 330fb00..6679283 100644 --- a/views/devices-ata.html +++ b/views/devices-ata.html @@ -21,9 +21,9 @@ diff --git a/views/devices-cellphone.html b/views/devices-cellphone.html index 7148aeb..b1c64d3 100644 --- a/views/devices-cellphone.html +++ b/views/devices-cellphone.html @@ -2,7 +2,7 @@
- +
{{#if id}} @@ -21,7 +21,7 @@ diff --git a/views/devices-fax.html b/views/devices-fax.html index 33b07b6..e401199 100644 --- a/views/devices-fax.html +++ b/views/devices-fax.html @@ -21,9 +21,9 @@ diff --git a/views/devices-landline.html b/views/devices-landline.html index 5b5eb5e..d71c466 100644 --- a/views/devices-landline.html +++ b/views/devices-landline.html @@ -21,7 +21,7 @@ diff --git a/views/devices-layout.html b/views/devices-layout.html index 8f65f11..fc67647 100644 --- a/views/devices-layout.html +++ b/views/devices-layout.html @@ -12,7 +12,7 @@
- +
diff --git a/views/devices-mobile.html b/views/devices-mobile.html index 55fbbdd..8701ecd 100644 --- a/views/devices-mobile.html +++ b/views/devices-mobile.html @@ -21,11 +21,11 @@ diff --git a/views/devices-row.html b/views/devices-row.html index 083f1cf..41d1069 100644 --- a/views/devices-row.html +++ b/views/devices-row.html @@ -2,7 +2,7 @@
- +
{{friendlyType}} @@ -23,7 +23,7 @@
- +
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html index 6ed3a34..2db054d 100644 --- a/views/devices-sip_device.html +++ b/views/devices-sip_device.html @@ -27,13 +27,13 @@ diff --git a/views/devices-smartphone.html b/views/devices-smartphone.html index 40b827c..f6cea70 100644 --- a/views/devices-smartphone.html +++ b/views/devices-smartphone.html @@ -21,11 +21,11 @@ diff --git a/views/devices-softphone.html b/views/devices-softphone.html index 86dcee0..4bf1f9d 100644 --- a/views/devices-softphone.html +++ b/views/devices-softphone.html @@ -21,11 +21,11 @@ diff --git a/views/groups-extensions.html b/views/groups-extensions.html index 5625ba9..091187b 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-feature-call_recording.html b/views/groups-feature-call_recording.html index ede4c6e..5f2a286 100644 --- a/views/groups-feature-call_recording.html +++ b/views/groups-feature-call_recording.html @@ -1,6 +1,6 @@
-
+
{{ i18n.groups.callRecording.headline }} diff --git a/views/groups-feature-forward.html b/views/groups-feature-forward.html index ab4c574..a6e5103 100644 --- a/views/groups-feature-forward.html +++ b/views/groups-feature-forward.html @@ -1,6 +1,6 @@
-
+
{{ i18n.groups.forward.headline }} diff --git a/views/groups-feature-next_action.html b/views/groups-feature-next_action.html index a224b9a..bf2c1b3 100644 --- a/views/groups-feature-next_action.html +++ b/views/groups-feature-next_action.html @@ -1,6 +1,6 @@
-
+
{{ i18n.groups.nextAction.headline }} diff --git a/views/groups-feature-ringback.html b/views/groups-feature-ringback.html index bacf593..9f84c60 100644 --- a/views/groups-feature-ringback.html +++ b/views/groups-feature-ringback.html @@ -1,6 +1,6 @@
-
+
{{ i18n.groups.ringback.headline }} diff --git a/views/groups-features.html b/views/groups-features.html index e44960e..be938dd 100644 --- a/views/groups-features.html +++ b/views/groups-features.html @@ -2,7 +2,7 @@
{{#each extra.mapFeatures}}
-
+
diff --git a/views/groups-layout.html b/views/groups-layout.html index 000961a..0e1b159 100644 --- a/views/groups-layout.html +++ b/views/groups-layout.html @@ -11,7 +11,7 @@ - +
diff --git a/views/groups-numbers.html b/views/groups-numbers.html index 69806aa..c909ccd 100644 --- a/views/groups-numbers.html +++ b/views/groups-numbers.html @@ -11,11 +11,11 @@