From 01df9a41e7ded051429ba803fca397af916f0066 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 16 Jan 2015 23:22:59 -0500
Subject: [PATCH] Move md theming config to ui.js (SOGo.UI)

---
 UI/WebServerResources/js/Common/ui.js | 10 +++++++++-
 UI/WebServerResources/js/MailerUI.js  |  7 -------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/UI/WebServerResources/js/Common/ui.js b/UI/WebServerResources/js/Common/ui.js
index f6834c3c4..c5d052970 100644
--- a/UI/WebServerResources/js/Common/ui.js
+++ b/UI/WebServerResources/js/Common/ui.js
@@ -11,7 +11,15 @@
 (function() {
   'use strict';
   angular.module('SOGo.UI', ['ngMaterial' ])
-  .controller('toggleCtrl', ['$scope', '$timeout', '$mdSidenav', '$log', function($scope, $timeout, $mdSidenav, $log) {
+
+    .config(function($mdThemingProvider) {
+      $mdThemingProvider.theme('default')
+        .primaryColor('grey', {
+          'default': '800'
+        });
+    })
+
+    .controller('toggleCtrl', ['$scope', '$timeout', '$mdSidenav', '$log', function($scope, $timeout, $mdSidenav, $log) {
       $scope.toggleLeft = function() {
         $mdSidenav('left').toggle()
                           .then(function(){
diff --git a/UI/WebServerResources/js/MailerUI.js b/UI/WebServerResources/js/MailerUI.js
index 7361d6d3f..67f8483ec 100644
--- a/UI/WebServerResources/js/MailerUI.js
+++ b/UI/WebServerResources/js/MailerUI.js
@@ -164,13 +164,6 @@
         allowedTagsPattern: /([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)/i
       });
     }])
-    //todo : define complete custom themes (light and dark) with SOGo green as accent-color
-      .config(function($mdThemingProvider) {
-        $mdThemingProvider.theme('default')
-            .primaryColor('grey', {
-              'default': '800'
-            });
-      })
 
     .run(function($rootScope) {
       $rootScope.$on('$routeChangeError', function(event, current, previous, rejection) {