From b1d883e934c3b71e656984ac09cc8980f521ad8a Mon Sep 17 00:00:00 2001 From: Jean-Roch Maitre Date: Fri, 16 Sep 2016 16:09:40 -0700 Subject: [PATCH] UI-2399: changing colors around --- app.js | 12 ++++++++++++ submodules/groups/groups.js | 2 +- submodules/users/users.js | 2 +- views/callLogs-cdrsList.html | 2 +- views/myOffice-layout.html | 2 +- views/strategy-layout.html | 2 +- views/strategy-popupRemoveFeatures.html | 2 +- views/users-row.html | 2 +- 8 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app.js b/app.js index 5527469..5e18d99 100644 --- a/app.js +++ b/app.js @@ -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', diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js index 7bb6e6b..dd6b872 100644 --- a/submodules/groups/groups.js +++ b/submodules/groups/groups.js @@ -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: { diff --git a/submodules/users/users.js b/submodules/users/users.js index 641e857..275e653 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -442,7 +442,7 @@ define(function(require){ }); var popup = monster.ui.dialog(dialogTemplate, { - title: '', + title: '', position: ['center', 20], dialogClass: 'monster-alert' }); diff --git a/views/callLogs-cdrsList.html b/views/callLogs-cdrsList.html index b494265..8c21a4a 100644 --- a/views/callLogs-cdrsList.html +++ b/views/callLogs-cdrsList.html @@ -48,7 +48,7 @@
- {{@root.i18n.callLogs.loading}} + {{@root.i18n.callLogs.loading}}
diff --git a/views/myOffice-layout.html b/views/myOffice-layout.html index df984ef..52b1c5a 100644 --- a/views/myOffice-layout.html +++ b/views/myOffice-layout.html @@ -35,7 +35,7 @@
{{#times totalUsers}} -
+
{{/times}}
diff --git a/views/strategy-layout.html b/views/strategy-layout.html index 9dc9feb..f2c102f 100644 --- a/views/strategy-layout.html +++ b/views/strategy-layout.html @@ -92,7 +92,7 @@ - +
diff --git a/views/strategy-popupRemoveFeatures.html b/views/strategy-popupRemoveFeatures.html index 55c41fb..997a2fb 100644 --- a/views/strategy-popupRemoveFeatures.html +++ b/views/strategy-popupRemoveFeatures.html @@ -1,5 +1,5 @@
-

{{i18n.strategy.popupRemoveFeatures.questionPartOne}} {{formatPhoneNumber phoneNumber}} {{i18n.strategy.popupRemoveFeatures.questionPartTwo}}

+

{{i18n.strategy.popupRemoveFeatures.questionPartOne}} {{formatPhoneNumber phoneNumber}} {{i18n.strategy.popupRemoveFeatures.questionPartTwo}}

diff --git a/views/users-row.html b/views/users-row.html index de0d35c..f34dbc6 100644 --- a/views/users-row.html +++ b/views/users-row.html @@ -1,6 +1,6 @@
-
{{ first_name }} {{ last_name }}
+
{{ first_name }} {{ last_name }}
{{#if extra.extension}} {{ extra.extension }}