Merge branch 'master' into UI-706

app.css

@@ -1,15 +0,0 @@
-@import url('submodules/devices/devices.css');
-@import url('submodules/groups/groups.css');
-@import url('submodules/myOffice/myOffice.css');
-@import url('submodules/numbers/numbers.css');
-@import url('submodules/strategy/strategy.css');
-@import url('submodules/callLogs/callLogs.css');
-@import url('submodules/users/users.css');
-
-#voip_container .left-menu #my_office {
-	margin-bottom: 20px;
-}
-
-#voip_container .left-menu > div {
-	margin-top: 10px;
-}

app.js

@@ -4,10 +4,14 @@ define(function(require){
 		monster = require('monster');
 
 	var app = {
-
 		name: 'voip',
 
-		i18n: [ 'en-US', 'fr-FR' ],
+		css: [ 'app' ],
+
+		i18n: { 
+			'en-US': { customCss: false },
+			'fr-FR': { customCss: false }
+		},
 
 		requests: {
 			'voip.users.getUsers': {
@@ -52,7 +56,7 @@ define(function(require){
 
 		render: function(container){
 			var self = this,
-				parent = container || $('#ws-content'),
+				parent = container || $('#monster-content'),
 				template = $(monster.template(self, 'app'));
 
 			/* On first Load, load my office */

style/app.css

@@ -0,0 +1,15 @@
+@import url('../submodules/devices/devices.css');
+@import url('../submodules/groups/groups.css');
+@import url('../submodules/myOffice/myOffice.css');
+@import url('../submodules/numbers/numbers.css');
+@import url('../submodules/strategy/strategy.css');
+@import url('../submodules/callLogs/callLogs.css');
+@import url('../submodules/users/users.css');
+
+#voip_container .left-menu #my_office {
+	margin-bottom: 20px;
+}
+
+#voip_container .left-menu > div {
+	margin-top: 10px;
+}