ruhnet
/
monster-ui-voip
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

UI-1381: Fix icons' issues related to font-awesome upgrade

4.3
Joris Tirado 11 years ago
parent
b4ab56760e
commit
dec06f9922
24 changed files with 32 additions and 30 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      submodules/callLogs/callLogs.js
  2. +1
    -0
      submodules/devices/devices.css
  3. +4
    -4
      submodules/groups/groups.css
  4. +5
    -5
      submodules/users/users.css
  5. +1
    -0
      submodules/vmboxes/vmboxes.css
  6. +1
    -1
      views/devices-mobile.html
  7. +1
    -1
      views/devices-sip_device.html
  8. +1
    -1
      views/devices-smartphone.html
  9. +1
    -1
      views/devices-softphone.html
  10. +1
    -1
      views/groups-feature-call_recording.html
  11. +1
    -1
      views/groups-feature-forward.html
  12. +1
    -1
      views/groups-feature-next_action.html
  13. +1
    -1
      views/groups-feature-ringback.html
  14. +1
    -1
      views/myOffice-callerIdPopup.html
  15. +1
    -1
      views/myOffice-musicOnHoldPopup.html
  16. +1
    -1
      views/users-feature-call_forward.html
  17. +1
    -1
      views/users-feature-call_recording.html
  18. +1
    -1
      views/users-feature-caller_id.html
  19. +1
    -1
      views/users-feature-conferencing.html
  20. +1
    -1
      views/users-feature-faxing.html
  21. +1
    -1
      views/users-feature-find_me_follow_me.html
  22. +1
    -1
      views/users-feature-hotdesk.html
  23. +1
    -1
      views/users-feature-music_on_hold.html
  24. +1
    -1
      views/users-feature-vm_to_email.html

+ 2
- 2
submodules/callLogs/callLogs.js View File

@ -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-spinning');
loaderDiv.find('.loading-message > i').toggleClass('fa-spin');
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-spinning');
loaderDiv.find('.loading-message > i').toggleClass('fa-spin');
}, startKey);
} else {


+ 1
- 0
submodules/devices/devices.css View File

@ -51,6 +51,7 @@
}
#devices_container .devices-header .add-device i {
font-size: 16px;
display: block;
margin: 0;
color: #929799;


+ 4
- 4
submodules/groups/groups.css View File

@ -454,8 +454,8 @@
cursor: pointer;
}
#groups_container .detail-features .features-grid .feature .icon-wrapper,
.feature-popup-container .feature-icon-wrapper{
#groups_container .detail-features .features-grid .feature .fa-wrapper,
.feature-popup-container .feature-fa-wrapper{
display: inline-block;
margin: 20px;
width: 60px;
@ -476,8 +476,8 @@
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#dddddd',GradientType=0 ); /* IE6-9 */
}
#groups_container .detail-features .features-grid .feature .icon-wrapper.active,
.feature-popup-container .feature-icon-wrapper.active{
#groups_container .detail-features .features-grid .feature .fa-wrapper.active,
.feature-popup-container .feature-fa-wrapper.active{
background: #19d332; /* Old browsers */
background: -moz-radial-gradient(center, ellipse cover, hsl(128,79%,46%) 0%, hsl(132,46%,46%) 61%, hsl(0,0%,0%) 99%); /* FF3.6+ */
background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,hsl(128,79%,46%)), color-stop(61%,hsl(132,46%,46%)), color-stop(99%,hsl(0,0%,0%))); /* Chrome,Safari4+ */


+ 5
- 5
submodules/users/users.css View File

@ -351,7 +351,7 @@
margin: 10px 0 0 0;
}
#users_container .detail-user .icon-wrapper {
#users_container .detail-user .fa-wrapper {
display: inline-block;
width: 50px;
text-align: center;
@ -515,8 +515,8 @@
text-overflow: ellipsis;
}
#users_container .detail-features .features-grid .feature .icon-wrapper,
.feature-popup-container .feature-icon-wrapper{
#users_container .detail-features .features-grid .feature .fa-wrapper,
.feature-popup-container .feature-fa-wrapper{
display: inline-block;
margin: 20px;
width: 60px;
@ -537,8 +537,8 @@
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#dddddd',GradientType=0 ); /* IE6-9 */
}
#users_container .detail-features .features-grid .feature .icon-wrapper.active,
.feature-popup-container .feature-icon-wrapper.active{
#users_container .detail-features .features-grid .feature .fa-wrapper.active,
.feature-popup-container .feature-fa-wrapper.active{
background: #19d332; /* Old browsers */
background: -moz-radial-gradient(center, ellipse cover, hsl(128,79%,46%) 0%, hsl(132,46%,46%) 61%, hsl(0,0%,0%) 99%); /* FF3.6+ */
background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,hsl(128,79%,46%)), color-stop(61%,hsl(132,46%,46%)), color-stop(99%,hsl(0,0%,0%))); /* Chrome,Safari4+ */


+ 1
- 0
submodules/vmboxes/vmboxes.css View File

@ -50,6 +50,7 @@
}
#vmboxes_container .vmboxes-header .add-vmbox i {
font-size: 16px;
display: block;
margin: 0;
color: #929799;


+ 1
- 1
views/devices-mobile.html View File

@ -22,7 +22,7 @@
</a>
<ul class="dropdown-menu pull-right">
<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="fa fa-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-facetime-video"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-video-camera"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="miscellaneous" href="javascript:void(0)"><i class="fa fa-cogs"></i>{{ i18n.devices.popupSettings.miscellaneous.menuTitle }}</a></li>


+ 1
- 1
views/devices-sip_device.html View File

@ -30,7 +30,7 @@
<li><a class="tabs-selector change-section" data-section="sip" href="javascript:void(0)"><i class="fa fa-user"></i>{{ i18n.devices.popupSettings.sip.menuTitle }}</a></li>
{{/if}}
<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="fa fa-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-facetime-video"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-video-camera"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="miscellaneous" href="javascript:void(0)"><i class="fa fa-cogs"></i>{{ i18n.devices.popupSettings.miscellaneous.menuTitle }}</a></li>


+ 1
- 1
views/devices-smartphone.html View File

@ -23,7 +23,7 @@
<ul class="dropdown-menu pull-right">
<li><a class="tabs-selector change-section" data-section="options" href="javascript:void(0)"><i class="fa fa-cogs"></i>{{ i18n.devices.popupSettings.options.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="fa fa-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-facetime-video"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-video-camera"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
</ul>


+ 1
- 1
views/devices-softphone.html View File

@ -22,7 +22,7 @@
</a>
<ul class="dropdown-menu pull-right">
<li><a class="tabs-selector change-section" data-section="audio" href="javascript:void(0)"><i class="fa fa-music"></i>{{ i18n.devices.popupSettings.audio.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-facetime-video"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="video" href="javascript:void(0)"><i class="fa fa-video-camera"></i>{{ i18n.devices.popupSettings.video.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="restrictions" href="javascript:void(0)"><i class="fa fa-ban"></i>{{ i18n.devices.popupSettings.restrictions.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="callerId" href="javascript:void(0)"><i class="fa fa-ambulance"></i>{{ i18n.devices.popupSettings.callerId.menuTitle }}</a></li>
<li><a class="tabs-selector change-section" data-section="miscellaneous" href="javascript:void(0)"><i class="fa fa-cogs"></i>{{ i18n.devices.popupSettings.miscellaneous.menuTitle }}</a></li>


+ 1
- 1
views/groups-feature-call_recording.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="call_recording">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.call_recording.icon}}"></i>
</div>
{{ i18n.groups.callRecording.headline }}


+ 1
- 1
views/groups-feature-forward.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="forward">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.forward.icon}}"></i>
</div>
{{ i18n.groups.forward.headline }}


+ 1
- 1
views/groups-feature-next_action.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="next_action">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.next_action.icon}}"></i>
</div>
{{ i18n.groups.nextAction.headline }}


+ 1
- 1
views/groups-feature-ringback.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="ringback">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{group.extra.mapFeatures.ringback.icon}}"></i>
</div>
{{ i18n.groups.ringback.headline }}


+ 1
- 1
views/myOffice-callerIdPopup.html View File

@ -1,6 +1,6 @@
<div id="my_office_caller_id_popup" class="feature-popup-container">
<!-- <div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="fa fa-user"></i>
</div>
{{ i18n.myOffice.callerId.headline }}


+ 1
- 1
views/myOffice-musicOnHoldPopup.html View File

@ -1,6 +1,6 @@
<div id="my_office_music_on_hold_popup" class="feature-popup-container">
<div class="feature-popup-header">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="fa fa-music"></i>
</div>
{{ i18n.myOffice.musicOnHold.headline }}


+ 1
- 1
views/users-feature-call_forward.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="call_forward">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.call_forward.icon}}"></i>
</div>
{{ i18n.users.call_forward.headline }}


+ 1
- 1
views/users-feature-call_recording.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="call_recording">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.call_recording.icon}}"></i>
</div>
{{ i18n.users.callRecording.headline }}


+ 1
- 1
views/users-feature-caller_id.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="caller_id">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.caller_id.icon}}"></i>
</div>
{{ i18n.users.caller_id.headline }}


+ 1
- 1
views/users-feature-conferencing.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="conferencing">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.conferencing.icon}}"></i>
</div>
{{ i18n.users.conferencing.headline }}


+ 1
- 1
views/users-feature-faxing.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="faxing">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.faxing.icon}}"></i>
</div>
{{ i18n.users.faxing.headline }}


+ 1
- 1
views/users-feature-find_me_follow_me.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="find_me_follow_me">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{currentUser.extra.mapFeatures.find_me_follow_me.icon}}"></i>
</div>
{{ i18n.users.find_me_follow_me.headline }}


+ 1
- 1
views/users-feature-hotdesk.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="hotdesk">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.hotdesk.icon}}"></i>
</div>
{{ i18n.users.hotdesk.headline }}


+ 1
- 1
views/users-feature-music_on_hold.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="music_on_hold">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{user.extra.mapFeatures.music_on_hold.icon}}"></i>
</div>
{{ i18n.users.music_on_hold.headline }}


+ 1
- 1
views/users-feature-vm_to_email.html View File

@ -1,6 +1,6 @@
<div class="feature-popup-container" data-feature="vm_to_email">
<div class="feature-popup-title">
<div class="feature-fa fa-wrapper">
<div class="feature-fa-wrapper">
<i class="{{extra.mapFeatures.vm_to_email.icon}}"></i>
</div>
{{ i18n.users.vm_to_email.headline }}


Write Preview
Loading…
Cancel
Save