Browse Source

UI-2399: changing colors around

4.3
Jean-Roch Maitre 9 years ago
parent
commit
b1d883e934
8 changed files with 19 additions and 7 deletions
  1. +12
    -0
      app.js
  2. +1
    -1
      submodules/groups/groups.js
  3. +1
    -1
      submodules/users/users.js
  4. +1
    -1
      views/callLogs-cdrsList.html
  5. +1
    -1
      views/myOffice-layout.html
  6. +1
    -1
      views/strategy-layout.html
  7. +1
    -1
      views/strategy-popupRemoveFeatures.html
  8. +1
    -1
      views/users-row.html

+ 12
- 0
app.js View File

@ -3,6 +3,18 @@ define(function(require){
_ = require('underscore'),
monster = require('monster');
require([
'./submodules/devices/devices',
'./submodules/groups/groups',
'./submodules/numbers/numbers',
'./submodules/strategy/strategy',
'./submodules/callLogs/callLogs',
'./submodules/users/users',
'./submodules/myOffice/myOffice',
'./submodules/featureCodes/featureCodes',
'./submodules/vmboxes/vmboxes'
]);
var app = {
name: 'voip',


+ 1
- 1
submodules/groups/groups.js View File

@ -132,7 +132,7 @@ define(function(require){
mapFeatures: {
call_recording: {
icon: 'fa fa-microphone',
iconColor: 'monster-blue',
iconColor: 'monster-primary-color',
title: self.i18n.active().groups.callRecording.title
},
ringback: {


+ 1
- 1
submodules/users/users.js View File

@ -442,7 +442,7 @@ define(function(require){
});
var popup = monster.ui.dialog(dialogTemplate, {
title: '<i class="fa fa-question-circle monster-blue"></i>',
title: '<i class="fa fa-question-circle monster-primary-color"></i>',
position: ['center', 20],
dialogClass: 'monster-alert'
});


+ 1
- 1
views/callLogs-cdrsList.html View File

@ -48,7 +48,7 @@
</div>
<div class="extra-legs">
<div class="loading-container">
{{@root.i18n.callLogs.loading}} <i class="fa fa-spinner fa-spin monster-blue fa-lg"></i>
{{@root.i18n.callLogs.loading}} <i class="fa fa-spinner fa-spin monster-primary-color fa-lg"></i>
</div>
</div>
</div>

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

@ -35,7 +35,7 @@
</div>
<div class="left-section-content users-section-content">
{{#times totalUsers}}
<div class="users-element"><i class="fa-2x fa fa-male{{#compare this '<' ../totalChannels}} monster-blue{{/compare}}"></i></div>
<div class="users-element"><i class="fa-2x fa fa-male{{#compare this '<' ../totalChannels}} monster-primary-color{{/compare}}"></i></div>
{{/times}}
</div>
</div>


+ 1
- 1
views/strategy-layout.html View File

@ -92,7 +92,7 @@
</span>
<i class="fa fa-play"></i>
</div>
<i class="fa fa-volume-up monster-blue custom-greeting-icon" data-original-title="{{i18n.strategy.customConferenceGreeting.tooltip}}" data-placement="top" data-toggle="tooltip" {{#unless customConfGreeting}}style="display:none"{{/unless}}></i>
<i class="fa fa-volume-up monster-primary-color custom-greeting-icon" data-original-title="{{i18n.strategy.customConferenceGreeting.tooltip}}" data-placement="top" data-toggle="tooltip" {{#unless customConfGreeting}}style="display:none"{{/unless}}></i>
</div>
</div>
<div class="element-content"></div>


+ 1
- 1
views/strategy-popupRemoveFeatures.html View File

@ -1,5 +1,5 @@
<div id="action_confirmation">
<h4>{{i18n.strategy.popupRemoveFeatures.questionPartOne}} <span class="monster-blue">{{formatPhoneNumber phoneNumber}}</span> {{i18n.strategy.popupRemoveFeatures.questionPartTwo}}</h4>
<h4>{{i18n.strategy.popupRemoveFeatures.questionPartOne}} <span class="monster-primary-color">{{formatPhoneNumber phoneNumber}}</span> {{i18n.strategy.popupRemoveFeatures.questionPartTwo}}</h4>
<div class="table-wrapper">
<table class="table">
<thead>


+ 1
- 1
views/users-row.html View File

@ -1,6 +1,6 @@
<div class="grid-row" data-id="{{id}}" data-priv_level="{{priv_level}}" data-name="{{first_name}} {{last_name}}" data-search="{{first_name}} {{last_name}}{{#each extra.listCallerId}} {{formatPhoneNumber this}} {{this}}{{/each}}">
<div class="user-cells">
<div class="name grid-cell" data-type="name"><i class="{{#if extra.isAdmin}}icon-telicon-moderator monster-blue{{else}}icon-telicon-user monster-lightgrey{{/if}}"></i> {{ first_name }} {{ last_name }}</div>
<div class="name grid-cell" data-type="name"><i class="{{#if extra.isAdmin}}icon-telicon-moderator monster-primary-color{{else}}icon-telicon-user monster-lightgrey{{/if}}"></i> {{ first_name }} {{ last_name }}</div>
<div class="extension grid-cell" data-type="extensions">
{{#if extra.extension}}
{{ extra.extension }}


Loading…
Cancel
Save