(feat) major rework of the sidenav and top toolbars

Alinto · Aug 14, 2015 · b72a938 · b72a938
1 parent d3d9a72
commit b72a938
Show file tree

Hide file tree

Showing 8 changed files with 164 additions and 270 deletions.
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
@@ -440,40 +440,6 @@ - (BOOL) hasProductSpecificCSS
   return ([[self productCSSURL] length] > 0);
 }
 
-- (BOOL) _moduleIs: (NSString *) moduleName
-{
-  NSString *frameworkName;
-
-  frameworkName = [[context page] frameworkName];
-
-  return [frameworkName isEqualToString: moduleName];
-}
-
-- (BOOL) isCalendar
-{
-  return [self _moduleIs: @"SchedulerUI"];
-}
-
-- (BOOL) isContacts
-{
-  return [self _moduleIs: @"ContactsUI"];
-}
-
-- (BOOL) isMail
-{
-  return [self _moduleIs: @"MailerUI"];
-}
-
-- (BOOL) isPreferences
-{
-  return [self _moduleIs: @"PreferencesUI"];
-}
-
-- (BOOL) isAdministration
-{
-  return [self _moduleIs: @"AdministrationUI"];
-}
-
 - (void) setToolbar: (NSString *) newToolbar
 {
   ASSIGN (toolbar, newToolbar);
@@ -509,6 +475,12 @@ - (NSString *) userIdentification
   return [[context activeUser] cn];
 }
 
+- (NSString *) userEmail
+{
+  return [[context activeUser] systemEmail];
+}
+
+
 - (BOOL) canLogoff
 {
   BOOL canLogoff;

diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -235,17 +235,17 @@
             <div layout="row" layout-align="space-between center">
               <span>{{account.name}}</span>
               <div>
-              <md-button class="sg-icon-button"
-                         label:aria-label="New Folder..."
-                         ng-click="app.newFolder(account)">
-                <md-icon>add_circle_outline</md-icon>
-              </md-button>
-              <md-button class="sg-icon-button"
-                         ng-show="account.id == 0"
-                         label:aria-label="Delegation..."
-                         ng-click="app.delegate(account)">
-                <md-icon>people</md-icon>
-              </md-button>
+                <md-button class="sg-icon-button"
+                           label:aria-label="New Folder..."
+                           ng-click="app.newFolder(account)">
+                  <md-icon>add_circle_outline</md-icon>
+                </md-button>
+                <md-button class="sg-icon-button"
+                           ng-show="account.id == 0"
+                           label:aria-label="Delegation..."
+                           ng-click="app.delegate(account)">
+                  <md-icon>people</md-icon>
+                </md-button>
               </div>
             </div>
           </md-subheader>
@@ -346,14 +346,10 @@
   </script>
 
   <script type="text/ng-template" id="UIxMailFolderTemplate">
-    <md-toolbar layout="column" layout-align="space-between start" class="md-tall toolbar-main">
-      <div class="md-toolbar-tools md-toolbar-tools-top sg-padded" layout="row" layout-align="space-between start">
+    <md-toolbar layout="column" layout-align="space-between start" class="md-tall toolbar-main" >
+      <div class="md-toolbar-tools md-toolbar-tools-top sg-padded"
+           layout="row" layout-align="space-between start">
         <var:component className="UIxTopnavToolbarTemplate" />
-        <div class="sg-toolbar-group-last">
-          <md-button class="sg-icon-button" label:aria-label="More">
-            <md-icon>more_vert</md-icon>
-          </md-button>
-        </div>
       </div>
       <div class="md-toolbar-tools" layout="row" layout-align="space-between center"
            ng-show="mailbox.selectedFolder.$selectedCount() == 0">

diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -53,11 +53,6 @@
       <md-toolbar layout="row" layout-align="space-between start" class="md-tall">
         <div class="md-toolbar-tools md-toolbar-tools-top sg-padded" layout="row" layout-align="space-between start">
           <var:component className="UIxTopnavToolbarTemplate" />
-          <div class="sg-toolbar-group-last">
-            <md-button class="sg-icon-button" label:aria-label="Menu">
-              <md-icon>more_vert</md-icon>
-            </md-button>
-          </div>
         </div>
       </md-toolbar>