From 5b674abcf1133cb5321603424edc261b29725c25 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon, 16 Mar 2015 11:53:50 -0400
Subject: [PATCH] Fixed preferences module wrt recent changes

---
 UI/Templates/PreferencesUI/UIxPreferences.wox | 144 ++++++++++--------
 1 file changed, 80 insertions(+), 64 deletions(-)

diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 1029f3da6..f2c1c8810 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -37,70 +37,85 @@
       <div id="viewer" ui-view="preferences"> </div>
       </div>
   -->
-  <section layout="row" flex="flex">
-
-    <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">{{activeUser.identification}}</span>
-        </h2>
-      </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="toggleCtrl">
-          <span flex="flex">
-            <md-button ng-click="toggleLeft()" class="md-primary" hide-gt-md="hide-gt-md">
-              <span class="icon-ic_menu_24px"></span>
-            </md-button>
-            <div class="display-1" style="font-size: 2em; font-weight: 300">
-              [[Preferences]]
-            </div>
-          </span>
-          <span class="sd-toolbar-tools">
-            <span>search</span>
-          </span>
-        </div>
-      </md-toolbar>
-
-
-      <div ui-view="preferences"><!-- view --></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="$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">{{activeUser.identification}}</span>
+              <md-button class="iconButton sg-button-navicon" ng-click="openBottomSheet()">
+                <i class="md-icon-apps"><!--icon--></i>
+              </md-button>
+              <span class="sg-logo"><!--logo.svg--></span>
+            </h2>
+            
+            <div class="md-toolbar-tools" layout="row">
+              <div layout="column">
+                <p class="sg-md-title">{{activeUser.identification}}</p>
+                <!--fixme: implement this with the proper model and actions -->
+                <md-select class="sg-logout" ng-model="accounts.options" label:placeholder="sogo1@inverse.ca">
+                  <md-option >sogo1@inverse.ca</md-option>
+                  <md-option >connect an other account</md-option>
+                  <md-option >logout</md-option>
+                </md-select>
+              </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">
+              <span flex="flex">
+                <md-button ng-click="toggleLeft()" class="md-primary" hide-gt-md="hide-gt-md">
+                  <span class="icon-ic_menu_24px"></span>
+                </md-button>
+                <div class="display-1" style="font-size: 2em; font-weight: 300">
+                  [[Preferences]]
+                </div>
+              </span>
+              <span class="sd-toolbar-tools">
+                <span>search</span>
+              </span>
+            </div>
+          </md-toolbar>
+        
         <form name="preferencesForm"
               ng-submit="save()">
           <div ui-view="module"><!-- view --></div>
@@ -108,8 +123,10 @@
             <var:string label:value="Save" />
           </md-button>
         </form>
+        
+        </section>
+
       </script>
-    </section>
 
     <!--
         GENERAL PREFERENCE PANEL
@@ -903,5 +920,4 @@
       </var:if>
     </script>
 
-</section>
 </var:component>