From eb7f198624cad698456cd233e5c8fb5ece93fdc2 Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Wed, 20 May 2015 17:35:05 -0700 Subject: [PATCH] UI-1381: Upgrade font-awesome by updating the icons' name --- submodules/devices/devices.js | 8 ++++---- submodules/strategy/strategy.css | 2 +- submodules/strategy/strategy.js | 2 +- views/app.html | 2 +- views/callLogs-cdrsList.html | 4 ++-- views/callLogs-layout.html | 4 ++-- views/devices-ata.html | 12 ++++++------ views/devices-cellphone.html | 2 +- views/devices-fax.html | 12 ++++++------ views/devices-landline.html | 2 +- views/devices-layout.html | 2 +- views/devices-mobile.html | 16 ++++++++-------- views/devices-sip_device.html | 20 ++++++++++---------- views/devices-sip_uri.html | 2 +- views/devices-smartphone.html | 14 +++++++------- views/devices-softphone.html | 16 ++++++++-------- views/groups-feature-ringback.html | 4 ++-- views/groups-members.html | 2 +- views/groups-name.html | 2 +- views/groups-newExtension.html | 2 +- views/groups-numbers.html | 8 ++++---- views/groups-numbersItemRow.html | 4 ++-- views/myOffice-layout.html | 14 +++++++------- views/myOffice-musicOnHoldPopup.html | 4 ++-- views/strategy-calls.html | 6 +++--- views/strategy-callsTab.html | 14 +++++++------- views/strategy-confnum.html | 4 ++-- views/strategy-holidayLine.html | 2 +- views/strategy-layout.html | 2 +- views/strategy-menuLine.html | 2 +- views/strategy-menuPopup.html | 4 ++-- views/strategy-numbers.html | 6 +++--- views/users-devices.html | 2 +- views/users-feature-music_on_hold.html | 4 ++-- views/users-name.html | 6 +++--- views/users-newExtension.html | 2 +- views/users-numbers.html | 8 ++++---- views/users-numbersItemRow.html | 4 ++-- views/vmboxes-edit.html | 6 +++--- views/vmboxes-emailRow.html | 2 +- views/vmboxes-layout.html | 2 +- 41 files changed, 118 insertions(+), 118 deletions(-) diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js index 13f8083..528e2d9 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('monster-red icon-remove') - .addClass('monster-green icon-ok') + matchedSign.removeClass('monster-red fa-times') + .addClass('monster-green fa-check') .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('monster-green icon-ok') - .addClass('monster-red icon-remove') + matchedSign.removeClass('monster-green fa-check') + .addClass('monster-red fa-times') .css('display', 'inline-block'); matchedMsg.removeClass('green-box') diff --git a/submodules/strategy/strategy.css b/submodules/strategy/strategy.css index 5f97a73..6857667 100644 --- a/submodules/strategy/strategy.css +++ b/submodules/strategy/strategy.css @@ -503,7 +503,7 @@ /*display: none;*/ } -#strategy_container .element-container.helper .icon-info-sign { +#strategy_container .element-container.helper .fa-info-circle { float: left; margin-right: 10px; } diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index 00c0cfd..16d1986 100644 --- a/submodules/strategy/strategy.js +++ b/submodules/strategy/strategy.js @@ -1800,7 +1800,7 @@ define(function(require){ group.groupIcon = 'icon-telicon-voip-phone'; break; case 'ring_group': - group.groupIcon = 'icon-group'; + group.groupIcon = 'fa fa-users'; break; case 'voicemail': group.groupIcon = 'icon-telicon-voicemail'; diff --git a/views/app.html b/views/app.html index 26f27bf..b91b3c5 100644 --- a/views/app.html +++ b/views/app.html @@ -24,7 +24,7 @@
- + {{ i18n.menuTitles.groups }}
diff --git a/views/callLogs-cdrsList.html b/views/callLogs-cdrsList.html index 2ad917b..4cfc35e 100644 --- a/views/callLogs-cdrsList.html +++ b/views/callLogs-cdrsList.html @@ -42,7 +42,7 @@
- +
@@ -88,7 +88,7 @@
- +
diff --git a/views/callLogs-layout.html b/views/callLogs-layout.html index 662ccd9..2398e5f 100644 --- a/views/callLogs-layout.html +++ b/views/callLogs-layout.html @@ -37,7 +37,7 @@
{{/if}} - {{i18n.download}} + {{i18n.download}} @@ -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 cb35a6e..330fb00 100644 --- a/views/devices-ata.html +++ b/views/devices-ata.html @@ -22,7 +22,7 @@ @@ -67,7 +67,7 @@
- + {{ i18n.devices.popupSettings.dragAndDrop }}
@@ -77,7 +77,7 @@
- +
@@ -89,7 +89,7 @@
@@ -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 c256aec..7148aeb 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 e7b5f1d..33b07b6 100644 --- a/views/devices-fax.html +++ b/views/devices-fax.html @@ -22,7 +22,7 @@ @@ -78,7 +78,7 @@
- + {{ i18n.devices.popupSettings.dragAndDrop }}
@@ -88,7 +88,7 @@
- +
@@ -100,7 +100,7 @@
@@ -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 586f3ed..5b5eb5e 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-layout.html b/views/devices-layout.html index 6de3a51..8f65f11 100644 --- a/views/devices-layout.html +++ b/views/devices-layout.html @@ -7,7 +7,7 @@
- + {{i18n.devices.add }}
- + {{ i18n.devices.popupSettings.dragAndDrop }}
@@ -89,7 +89,7 @@ {{ i18n.devices.popupSettings.video.sectionTitle }}
- + {{ i18n.devices.popupSettings.dragAndDrop }}
@@ -99,7 +99,7 @@
- +
@@ -111,7 +111,7 @@
@@ -120,7 +120,7 @@ {{/monsterSwitch}}
- +
{{/each}} @@ -162,7 +162,7 @@ {{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }} {{/monsterCheckbox}} - +
@@ -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 a5ea034..6ed3a34 100644 --- a/views/devices-sip_device.html +++ b/views/devices-sip_device.html @@ -31,11 +31,11 @@ {{/if}}
  • {{ i18n.devices.popupSettings.audio.menuTitle }}
  • {{ i18n.devices.popupSettings.video.menuTitle }}
    • -
  • {{ i18n.devices.popupSettings.restrictions.menuTitle }}
    • +
  • {{ i18n.devices.popupSettings.restrictions.menuTitle }}
  • {{ i18n.devices.popupSettings.callerId.menuTitle }}
  • {{ i18n.devices.popupSettings.miscellaneous.menuTitle }}
    • {{#if provision.feature_keys}} -
  • {{ i18n.devices.popupSettings.featureKeys.menuTitle }}
    • +
  • {{ i18n.devices.popupSettings.featureKeys.menuTitle }}
    • {{/if}} @@ -115,7 +115,7 @@
    - + {{ i18n.devices.popupSettings.dragAndDrop }}
    @@ -127,7 +127,7 @@ {{ i18n.devices.popupSettings.video.sectionTitle }}
    - + {{ i18n.devices.popupSettings.dragAndDrop }}
    @@ -136,7 +136,7 @@
    - +
    @@ -148,7 +148,7 @@
    @@ -157,7 +157,7 @@ {{/monsterSwitch}}
    - +
    {{/each}} @@ -205,7 +205,7 @@ {{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }} {{/monsterCheckbox}} - +
    @@ -235,7 +235,7 @@ {{ i18n.devices.popupSettings.featureKeys.menuTitle }}
    - {{ i18n.devices.popupSettings.featureKeys.info.link.showInfo }} + {{ i18n.devices.popupSettings.featureKeys.info.link.showInfo }}
    {{#each extra.featureKeys.types}}

    {{#if info}}{{text}}: {{info}}{{/if}}

    @@ -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 1c9b088..a81ff35 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 be9c850..40b827c 100644 --- a/views/devices-smartphone.html +++ b/views/devices-smartphone.html @@ -24,7 +24,7 @@
  • {{ i18n.devices.popupSettings.options.menuTitle }}
  • {{ i18n.devices.popupSettings.audio.menuTitle }}
  • {{ i18n.devices.popupSettings.video.menuTitle }}
    • -
  • {{ i18n.devices.popupSettings.restrictions.menuTitle }}
    • +
  • {{ i18n.devices.popupSettings.restrictions.menuTitle }}
  • {{ i18n.devices.popupSettings.callerId.menuTitle }}
    • @@ -107,7 +107,7 @@
    - + {{ i18n.devices.popupSettings.dragAndDrop }}
    @@ -119,7 +119,7 @@ {{ i18n.devices.popupSettings.video.sectionTitle }}
    - + {{ i18n.devices.popupSettings.dragAndDrop }}
    @@ -129,7 +129,7 @@
    - +
    @@ -141,7 +141,7 @@
    @@ -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 15d8798..86dcee0 100644 --- a/views/devices-softphone.html +++ b/views/devices-softphone.html @@ -23,7 +23,7 @@ @@ -69,7 +69,7 @@
    - + {{ i18n.devices.popupSettings.dragAndDrop }}
    @@ -82,7 +82,7 @@ {{ i18n.devices.popupSettings.video.sectionTitle }}
    - + {{ i18n.devices.popupSettings.dragAndDrop }}
    @@ -93,7 +93,7 @@
    - +
    @@ -105,7 +105,7 @@
    @@ -114,7 +114,7 @@ {{/monsterSwitch}}
    - +
    {{/each}} @@ -162,7 +162,7 @@ {{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }} {{/monsterCheckbox}} - +
    @@ -190,7 +190,7 @@
    {{#if id}} - {{ i18n.devices.deleteDevice }} + {{ i18n.devices.deleteDevice }} {{/if}}
    diff --git a/views/groups-feature-ringback.html b/views/groups-feature-ringback.html index ac583d5..bacf593 100644 --- a/views/groups-feature-ringback.html +++ b/views/groups-feature-ringback.html @@ -26,8 +26,8 @@
    - - + +
    diff --git a/views/groups-members.html b/views/groups-members.html index bb2b08e..7e66cb9 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 84ff445..44bc581 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 8d82d60..69806aa 100644 --- a/views/groups-numbers.html +++ b/views/groups-numbers.html @@ -17,7 +17,7 @@
  • {{ ../../i18n.callerId }}
  • {{ ../../i18n.e911 }}
    • {{/unless}} -
  • {{ ../i18n.numberPrepend }}
    • +
  • {{ ../i18n.numberPrepend }}
    • @@ -25,7 +25,7 @@
    {{#compare this.state '===' 'port_in'}} - + {{/compare}} {{#each viewFeatures}} @@ -54,11 +54,11 @@
    - {{ i18n.groups.addFromSpare }} + {{ i18n.groups.addFromSpare }} @@ -18,7 +18,7 @@
    {{#compare number.state '===' 'port_in'}} - + {{/compare}} {{#each number.viewFeatures}} diff --git a/views/myOffice-layout.html b/views/myOffice-layout.html index 2b4b978..4e6e073 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}}
    @@ -22,7 +22,7 @@
    {{#if topMessage}}
    - {{topMessage.message}} + {{topMessage.message}}
    {{/if}}
    @@ -33,7 +33,7 @@
    {{#times totalUsers}} -
    +
    {{/times}}
    @@ -99,7 +99,7 @@
    {{else}}
    - {{../i18n.myOffice.missingMainNumberMessage}} + {{../i18n.myOffice.missingMainNumberMessage}}
    {{/if}}
    diff --git a/views/myOffice-musicOnHoldPopup.html b/views/myOffice-musicOnHoldPopup.html index d7befff..acc153d 100644 --- a/views/myOffice-musicOnHoldPopup.html +++ b/views/myOffice-musicOnHoldPopup.html @@ -26,8 +26,8 @@
    - - + +
    diff --git a/views/strategy-calls.html b/views/strategy-calls.html index a21f4de..cb0aa87 100644 --- a/views/strategy-calls.html +++ b/views/strategy-calls.html @@ -1,15 +1,15 @@ @@ -38,10 +38,10 @@
    {{ i18n.close }}
    - {{ i18n.strategy.numberLinks.spare }} + {{ i18n.strategy.numberLinks.spare }}
    -
    +
    @@ -79,7 +79,7 @@
    -
    +
    {{#unless extra.ringingTimeout}}
    {{else}} @@ -122,7 +122,7 @@
    {{#compare id "!==" extra.adminId}} - {{ i18n.users.delete }} + {{ i18n.users.delete }} {{/compare}}
    diff --git a/views/users-newExtension.html b/views/users-newExtension.html index 0d97bc6..43bd942 100644 --- a/views/users-newExtension.html +++ b/views/users-newExtension.html @@ -2,6 +2,6 @@
    {{ i18n.users.addNewExtension }} - +
    diff --git a/views/users-numbers.html b/views/users-numbers.html index 63a7d8e..8a162d0 100644 --- a/views/users-numbers.html +++ b/views/users-numbers.html @@ -17,7 +17,7 @@
  • {{ ../../i18n.callerId }}
  • {{ ../../i18n.e911 }}
    • {{/unless}} -
  • {{ ../i18n.numberPrepend }}
    • +
  • {{ ../i18n.numberPrepend }}
    • @@ -25,7 +25,7 @@
    {{#compare this.state '===' 'port_in'}} - + {{/compare}} {{#each this.viewFeatures}} @@ -54,11 +54,11 @@
    - {{ i18n.users.addFromSpare }} + {{ i18n.users.addFromSpare }} @@ -18,7 +18,7 @@
    {{#compare number.state '===' 'port_in'}} - + {{/compare}} {{#each number.viewFeatures}} diff --git a/views/vmboxes-edit.html b/views/vmboxes-edit.html index a502727..aa2fc0d 100644 --- a/views/vmboxes-edit.html +++ b/views/vmboxes-edit.html @@ -142,7 +142,7 @@
    - + {{ i18n.vmboxes.popupSettings.recipients.header }}
    @@ -150,7 +150,7 @@
    - + {{ i18n.vmboxes.popupSettings.recipients.create }}
    @@ -172,7 +172,7 @@
    {{#if id}} - {{ i18n.vmboxes.deleteVmbox }} + {{ i18n.vmboxes.deleteVmbox }} {{/if}}
    diff --git a/views/vmboxes-emailRow.html b/views/vmboxes-emailRow.html index 6a39a96..fb02025 100644 --- a/views/vmboxes-emailRow.html +++ b/views/vmboxes-emailRow.html @@ -1,4 +1,4 @@
    {{ name }} -
    +
    \ No newline at end of file diff --git a/views/vmboxes-layout.html b/views/vmboxes-layout.html index 49f7421..69d72b8 100644 --- a/views/vmboxes-layout.html +++ b/views/vmboxes-layout.html @@ -6,7 +6,7 @@
    - + {{i18n.vmboxes.add }}