From 56763e1aca2505e5b15daee7904cdd7376ba8d75 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 20 Mar 2015 10:35:15 -0400
Subject: [PATCH] Removed dead code, support for adding calendar categories,
 disabled unused tab

---
 UI/Templates/PreferencesUI/UIxPreferences.wox | 56 +++++--------------
 UI/WebServerResources/angular-material        |  2 +-
 UI/WebServerResources/js/PreferencesUI.js     |  6 ++
 3 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index cf192ac4e..6076eb8fe 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -11,39 +11,13 @@
     title="title"
     const:jsFiles="Common/resource.js,Mailer/mailbox-model.js,Mailer/message-model.js,Preferences/preferences-model.js">
 
-  <!-- <md-content md-scroll-y="true"> -->
-
-  <!--
-      <div id="mainMenu">
-      <ul>
-      <li ng-class="{_selected: $state.is('general')}" ui-sref="general">
-      <i class="icon-cog"> </i><var:string label:value="General" /></li>
-      <var:if condition="userHasCalendarAccess">
-      <li ng-class="{_selected: state.is('calendars')}" ui-sref="calendars">
-      <i class="icon-calendar2"> </i><var:string label:value="Calendars" /></li>
-      </var:if>
-      <li ng-class="{_selected: state.is('addressbooks')}" ui-sref="addressbooks">
-      <i class="icon-address-book"> </i><var:string label:value="Address Book" /></li>
-      <var:if condition="userHasMailAccess">
-      <li ng-class="{_selected: state.is('mailer')}" ui-sref="mailer">
-      <i class="icon-mail3"> </i><var:string label:value="Mailer" /></li>
-      </var:if>
-      </ul>
-      </div>
-  -->
-
-  <!--
-      <div id="container">
-      <div id="viewer" ui-view="preferences"> </div>
-      </div>
-  -->
   <main class="view md-layout-fill" ui-view="preferences" layout="row"
         ng-controller="navController"><!-- preferences --> </main>
 
       <script type="text/ng-template" id="preferences.html">
-        
+
         <md-sidenav id="left-sidenav" class="md-sidenav-left md-whiteframe-z1" md-component-id="left" md-is-locked-open="$mdMedia('gt-md')" layout="column">
-          
+
           <md-toolbar class="md-tall" layout-align="end start">
             <div class="md-toolbar-tools">
               <md-button class="iconButton sg-button-navicon" ng-click="openBottomSheet()">
@@ -51,7 +25,7 @@
               </md-button>
               <span class="sg-logo"><!--logo.svg--></span>
             </div>
-            
+
             <div class="md-toolbar-tools" layout="row">
               <div layout="column">
                 <p class="sg-md-title">{{activeUser.identification}}</p>
@@ -64,40 +38,40 @@
               </div>
             </div>
           </md-toolbar>
-          
+
           <md-content md-scroll-y="md-scroll-y" class="md-padding md-flex">
             <md-list>
-              
+
               <md-item>
                 <md-item-content>
                   <a ui-sref="preferences.general">General</a>
                 </md-item-content>
               </md-item>
-              
+
               <md-item>
                 <md-item-content>
                   <a ui-sref="preferences.calendars">Calendar</a>
                 </md-item-content>
               </md-item>
-              
+
               <md-item>
                 <md-item-content>
                   <a ui-sref="preferences.addressbooks">Contacts</a>
                 </md-item-content>
               </md-item>
-              
+
               <md-item>
                 <md-item-content>
                   <a ui-sref="preferences.mailer">Mail</a>
                 </md-item-content>
               </md-item>
-              
+
             </md-list>
           </md-content>
         </md-sidenav>
-        
+
         <section  layout="column" class="md-layout-fill">
-      
+
           <!-- TOP RIGHT TOOLBAR -->
           <md-toolbar layout="row" layout-align="space-between start" class="md-tall">
             <div class="md-toolbar-tools" ng-controller="navController">
@@ -114,7 +88,7 @@
               </span>
             </div>
           </md-toolbar>
-        
+
         <form name="preferencesForm"
               ng-submit="save()">
           <div ui-view="module"><!-- view --></div>
@@ -122,7 +96,7 @@
             <var:string label:value="Save" />
           </md-button>
         </form>
-        
+
         </section>
 
       </script>
@@ -533,10 +507,10 @@
         <md-tabs class="md-accent">
 
           <!-- CONTACT > GENERAL -->
-          <md-tab id="contactsGeneralTab"
+          <!-- <md-tab id="contactsGeneralTab"
                   aria-controls="contactsGeneralTab-content" label:label="General">
             GENERAL
-          </md-tab>
+          </md-tab> -->
            <!-- END OF CONTACT > GENERAL -->
 
           <!-- CONTACT > CATEGORIES -->
diff --git a/UI/WebServerResources/angular-material b/UI/WebServerResources/angular-material
index dc2d204d9..eda14e9b3 160000
--- a/UI/WebServerResources/angular-material
+++ b/UI/WebServerResources/angular-material
@@ -1 +1 @@
-Subproject commit dc2d204d9ac6c3536fbc485ff555cc419a601391
+Subproject commit eda14e9b367cccfe61ddc53686d288d7ed237d92
diff --git a/UI/WebServerResources/js/PreferencesUI.js b/UI/WebServerResources/js/PreferencesUI.js
index cac831070..98afbd9cd 100644
--- a/UI/WebServerResources/js/PreferencesUI.js
+++ b/UI/WebServerResources/js/PreferencesUI.js
@@ -76,6 +76,12 @@
 
       $scope.preferences = statePreferences;
 
+      $scope.addCalendarCategory = function() {
+        var color = {"": "#000"};
+        $scope.preferences.defaults.SOGoCalendarCategories.push("");
+        $scope.preferences.defaults.SOGoCalendarCategoriesColors.push(color);
+      }
+      
       $scope.removeCalendarCategory = function(index) {
         var key = $scope.preferences.defaults.SOGoCalendarCategories[index];
         $scope.preferences.defaults.SOGoCalendarCategories.splice(index, 1);