From 1cc25574cf8674fa516cdfd5af49b8aee6d58264 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 16 Jan 2015 23:29:33 -0500
Subject: [PATCH] Add user identification in sgSettings constant

---
 UI/Templates/MailerUI/UIxMailMainFrame.wox |  2 +-
 UI/Templates/UIxPageFrame.wox              | 11 ++++++-----
 UI/WebServerResources/js/ContactsUI.js     |  4 +++-
 UI/WebServerResources/js/MailerUI.js       |  4 +++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 6cf5a5204..ee41f061a 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -242,7 +242,7 @@
     <md-sidenav class="md-sidenav-left md-whiteframe-z1" md-component-id="left" md-is-locked-open="$media('gt-md')" layout="column">
       <md-toolbar class="md-tall" layout-align="end start">
         <h2 class="md-toolbar-tools md-toolbar-tools-bottom">
-          <span class="md-flex">user@domain</span>
+          <span class="md-flex">{{activeUser.identification}}</span>
         </h2>
       </md-toolbar>
       <md-content md-scroll-y="md-scroll-y" class="md-padding" ng-controller="LeftCtrl">
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 501942050..f9c5a189b 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -115,11 +115,12 @@
 	    <var:if condition="usesCASAuthentication" const:negate="YES"
 	      >var usesCASAuthentication = false;
 	    </var:if>
-	    <var:if condition="shortUserNameForDisplay" const:value="anonymous"
-	      const:negate="YES"
-	      >var UserFolderURL = '<var:string value="userFolderPath" const:escapeHTML="NO"/>';
-	      var UserLogin = '<var:string value="shortUserNameForDisplay" const:escapeHTML="NO"/>';
-	      var UserLanguage = '<var:string value="userLanguage" const:escapeHTML="NO"/>';
+            <var:if condition="shortUserNameForDisplay" const:value="anonymous"
+              const:negate="YES"
+              >var UserFolderURL = '<var:string value="userFolderPath" const:escapeHTML="NO"/>';
+              var UserLogin = '<var:string value="shortUserNameForDisplay" const:escapeHTML="NO"/>';
+              var UserIdentification = '<var:string value="userIdentification" const:escapeHTML="NO"/>';
+              var UserLanguage = '<var:string value="userLanguage" const:escapeHTML="NO"/>';
             </var:if>
 	    <var:string value="commonLocalizableStrings" const:escapeHTML="NO"/>
 	    <var:string value="productLocalizableStrings" const:escapeHTML="NO"/>
diff --git a/UI/WebServerResources/js/ContactsUI.js b/UI/WebServerResources/js/ContactsUI.js
index b24f58c23..d71a9ef26 100644
--- a/UI/WebServerResources/js/ContactsUI.js
+++ b/UI/WebServerResources/js/ContactsUI.js
@@ -83,9 +83,11 @@
       $urlRouterProvider.otherwise('/personal');
     }])
 
-    .controller('AddressBookCtrl', ['$state', '$scope', '$rootScope', '$stateParams', '$timeout', '$modal', 'sgFocus', 'sgCard', 'sgAddressBook', 'sgDialog', 'stateAddressbooks', 'stateAddressbook', function($state, $scope, $rootScope, $stateParams, $timeout, $modal, focus, Card, AddressBook, Dialog, stateAddressbooks, stateAddressbook) {
+    .controller('AddressBookCtrl', ['$state', '$scope', '$rootScope', '$stateParams', '$timeout', '$modal', 'sgFocus', 'sgCard', 'sgAddressBook', 'sgDialog', 'sgSettings', 'stateAddressbooks', 'stateAddressbook', function($state, $scope, $rootScope, $stateParams, $timeout, $modal, focus, Card, AddressBook, Dialog, Settings, stateAddressbooks, stateAddressbook) {
       var currentAddressbook;
 
+      $scope.activeUser = Settings.activeUser;
+
       // Resolved objects
       $scope.addressbooks = stateAddressbooks;
       $rootScope.addressbook = stateAddressbook;
diff --git a/UI/WebServerResources/js/MailerUI.js b/UI/WebServerResources/js/MailerUI.js
index 67f8483ec..1189e2ade 100644
--- a/UI/WebServerResources/js/MailerUI.js
+++ b/UI/WebServerResources/js/MailerUI.js
@@ -13,6 +13,7 @@
       baseURL: ApplicationBaseURL,
       activeUser: {
         login: UserLogin,
+        identification: UserIdentification,
         language: UserLanguage,
         folderURL: UserFolderURL,
         isSuperUser: IsSuperUser
@@ -171,7 +172,8 @@
       })
     })
 
-    .controller('MailboxesCtrl', ['$scope', '$rootScope', '$stateParams', '$state', '$timeout', '$modal', 'sgFocus', 'encodeUriFilter', 'sgDialog', 'sgAccount', 'sgMailbox', 'stateAccounts', function($scope, $rootScope, $stateParams, $state, $timeout, $modal, focus, encodeUriFilter, Dialog, Account, Mailbox, stateAccounts) {
+    .controller('MailboxesCtrl', ['$scope', '$rootScope', '$stateParams', '$state', '$timeout', '$modal', 'sgFocus', 'encodeUriFilter', 'sgDialog', 'sgSettings', 'sgAccount', 'sgMailbox', 'stateAccounts', function($scope, $rootScope, $stateParams, $state, $timeout, $modal, focus, encodeUriFilter, Dialog, Settings, Account, Mailbox, stateAccounts) {
+      $scope.activeUser = Settings.activeUser;
       $scope.accounts = stateAccounts;
 
       $scope.newFolder = function(parentFolder) {