From d7fce32ed5c78411a65843f9defd531e927b6d9a Mon Sep 17 00:00:00 2001
From: iRouge <bfavreault@inverse.ca>
Date: Tue, 13 Jan 2015 16:24:42 -0500
Subject: [PATCH 1/5] Rows adjustments

---
 UI/Templates/MailerUI/UIxMailMainFrame.wox | 2 +-
 UI/Templates/UIxPageFrame.wox              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 995efb350..45118ebe5 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -214,7 +214,7 @@
   </div>
   -->
 
-  <div ui-view="mailboxes" layout="row" layout-fill="layout-fill"><!-- mailboxes list --></div>
+  <div ui-view="mailboxes" layout="row" style="max-height: 100%"><!-- mailboxes list --></div>
 
   <script type="text/ng-template" id="mailboxes.html">
 
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index f73aac700..587fb08af 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -58,9 +58,9 @@
 	      ><!-- space --></var:if>
 	  </var:if>
 
-          <div class="container" layout="row" layout-fill="layout-fill">
+
             <var:component-content/>
-          </div>
+
           <md-toolbar layout="row" layout-align="center center" style="background-color:#212121; position: fixed; bottom: 0px; left: 0px; width: 100%; z-index: 100">
             <var:if condition="userHasCalendarAccess">
 	      <var:if condition="isCalendar">

From 4981be9367d4a69ea615a0f478f67ff603fef0bf Mon Sep 17 00:00:00 2001
From: iRouge <bfavreault@inverse.ca>
Date: Tue, 13 Jan 2015 22:49:03 -0500
Subject: [PATCH 2/5] Correct Bottom-Bar Buttons url

---
 .../MailerUI/UIxMailFolderTemplate.wox        |  8 +--
 UI/Templates/UIxPageFrame.wox                 | 69 ++++++++++---------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index f5c594ebb..e566c25a6 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -6,9 +6,9 @@
    xmlns:rsrc="OGo:url"
    xmlns:label="OGo:label"
    xmlns:uix="OGo:uix">
-    <md-content md-scroll-y="md-scroll-y" style="width: 250px" id="messagesList">
-      <md-list data-n0-vs-repeat="56"
-               data-n0-vs-scroll-parent="#messagesList">
+    <md-content md-scroll-y="md-scroll-y" flex="33" id="messagesList">
+      <md-list data-vs-repeat="56"
+               data-vs-scroll-parent="#messagesList">
         <md-item ng-repeat="currentMessage in mailbox.$messages track by currentMessage.id"
                  data-ng-class="{unread: !currentMessage.isread}">
           <a data-ui-sref="mail.account.mailbox.message({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: currentMessage.uid})"
@@ -24,5 +24,5 @@
         </md-item>
       </md-list>
     </md-content>
-    <md-content flex="flex" data-ui-view="message"><!-- message view --></md-content>
+    <md-content flex="66" data-ui-view="message"><!-- message view --></md-content>
 </container>
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 587fb08af..1ee6f6978 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -60,40 +60,41 @@
 
 
             <var:component-content/>
-
-          <md-toolbar layout="row" layout-align="center center" style="background-color:#212121; position: fixed; bottom: 0px; left: 0px; width: 100%; z-index: 100">
-            <var:if condition="userHasCalendarAccess">
-	      <var:if condition="isCalendar">
-		<md-button class="active"><a href="#"><var:string label:value="Calendar" /></a></md-button>
-	      </var:if>
-	      <var:if condition="isCalendar" const:negate="YES">
-		<md-button><a var:href="relativeCalendarPath"><var:string label:value="Calendar" /></a></md-button>
-	      </var:if>
-	    </var:if>
-	    <var:if condition="isContacts">
-	      <md-button class="active"><a href="#"><var:string label:value="Address Book"/></a></md-button>
-	    </var:if>
-	    <var:if condition="isContacts" const:negate="YES">
-	      <md-button><a var:href="relativeContactsPath"><var:string label:value="Address Book" /></a></md-button>
-	    </var:if>
-	    <var:if condition="userHasMailAccess">
-	      <var:if condition="isMail">
-		<md-button class="active"><a href="#"><var:string label:value="Mail"/></a></md-button>
-	      </var:if>
-	      <var:if condition="isMail" const:negate="YES">
-		<md-button><a var:href="relativeMailPath"><var:string label:value="Mail" /></a></md-button>
-	      </var:if>
-	    </var:if>
-	    <md-button><a var:href="relativePreferencesPath"><var:string label:value="Preferences" /></a></md-button>
-	    <var:if condition="isSuperUser">
-	      <var:if condition="isAdministration">
-		<md-button class="active"><var:string label:value="Administration"/></md-button>
-	      </var:if>
-	      <var:if condition="isAdministration" const:negate="YES">
-		<md-button><a var:href="relativeAdministrationPath"><var:string label:value="Administration" /></a></md-button>
-	      </var:if>
-	    </var:if>
-          </md-toolbar>
+<!--FIXME : make sure the .md-button.md-default-theme[disabled] is "contrast aware" disabled labels are actualy almost invisible -->
+<!--FIXME : repport in-line styling in style definitions -->
+	  <md-toolbar layout="row" layout-align="center center" style="background-color:#212121; position: fixed; bottom: 0px; left: 0px; width: 100%; z-index: 100">
+		  <var:if condition="userHasCalendarAccess">
+			  <var:if condition="isCalendar">
+				  <md-button ng-disabled="true"><var:string label:value="Calendar" /></md-button>
+			  </var:if>
+			  <var:if condition="isCalendar" const:negate="YES">
+				  <md-button var:data-ng-href="relativeCalendarPath"><var:string label:value="Calendar" /></md-button>
+			  </var:if>
+		  </var:if>
+		  <var:if condition="isContacts">
+			  <md-button ng-disabled="true"><var:string label:value="Address Book"/></md-button>
+		  </var:if>
+		  <var:if condition="isContacts" const:negate="YES">
+			  <md-button var:data-ng-href="relativeContactsPath"><var:string label:value="Address Book" /></md-button>
+		  </var:if>
+		  <var:if condition="userHasMailAccess">
+			  <var:if condition="isMail">
+				  <md-button ng-disabled="true"><var:string label:value="Mail"/></md-button>
+			  </var:if>
+			  <var:if condition="isMail" const:negate="YES">
+				  <md-button var:data-ng-href="relativeMailPath"><var:string label:value="Mail" /></md-button>
+			  </var:if>
+		  </var:if>
+		  <md-button var:data-ng-href="relativePreferencesPath"><var:string label:value="Preferences" /></md-button>
+		  <var:if condition="isSuperUser">
+			  <var:if condition="isAdministration">
+				  <md-button ng-disabled="true"><var:string label:value="Administration"/></md-button>
+			  </var:if>
+			  <var:if condition="isAdministration" const:negate="YES">
+				  <md-button var:data-ng-href="relativeAdministrationPath"><var:string label:value="Administration" /></md-button>
+			  </var:if>
+		  </var:if>
+	  </md-toolbar>
 
 	  <script type="text/javascript">
 	    var ApplicationBaseURL = '<var:string value="modulePath"/>';

From f2f1d9ec81345bb11d67304c35617e49f0de9c47 Mon Sep 17 00:00:00 2001
From: iRouge <bfavreault@inverse.ca>
Date: Wed, 14 Jan 2015 03:11:47 -0500
Subject: [PATCH 3/5] Fought with ms-layouts (and they won)

---
 UI/Templates/MailerUI/UIxMailMainFrame.wox | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 45118ebe5..75a5a37f3 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -213,7 +213,7 @@
     </ul>
   </div>
   -->
-
+  <!--FIXME : repport in-line styling in style definitions -->
   <div ui-view="mailboxes" layout="row" style="max-height: 100%"><!-- mailboxes list --></div>
 
   <script type="text/ng-template" id="mailboxes.html">
@@ -240,7 +240,6 @@
     </div>
 
     <md-sidenav class="md-sidenav-left md-whiteframe-z1" md-component-id="left" md-is-locked-open="$media('gt-md')" layout="column">
-      <div style="text-align: center; position: absolute; top: 0; width: 100%; z-index: 100;">[ZONE DE NAVIGATION]</div>
       <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>
@@ -282,7 +281,7 @@
           </span>
         </div>
       </md-toolbar>
-      <md-content layout="row" layout-md="column" layout-sm="column" layout-fill="layout-fill" flex="flex" class="md-padding" ui-view="mailbox"><!-- messages list --></md-content>
+      <md-content layout="row" flex="flex" class="md-padding" ui-view="mailbox"><!-- messages list --></md-content>
     </main>
   </script>
 

From c6c6f1e7c9011cd0bf62916cc94441c1cb10bbca Mon Sep 17 00:00:00 2001
From: iRouge <bfavreault@inverse.ca>
Date: Wed, 14 Jan 2015 03:13:24 -0500
Subject: [PATCH 4/5] Should had been include with preceeding

---
 UI/Templates/UIxPageFrame.wox | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 1ee6f6978..89a73a30b 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -38,8 +38,9 @@
            </var:if-ie>
       </head>
 
-      <body style="overflow: hidden" var:data-ng-app="angularModule" var:class="bodyClasses"
-	><var:if condition="isCompatibleBrowser"
+	  <!--FIXME : repport in-line styling in style definitions -->
+      <body style="overflow: hidden; padding-bottom:64px;" var:data-ng-app="angularModule" var:class="bodyClasses"
+><var:if condition="isCompatibleBrowser"
 	  ><var:if condition="singleWindowModeEnabled"
           ><div id="popupFrame" style="display: none;"><iframe width="100%" height="100%" src="/SOGo/loading"><!-- space --></iframe></div></var:if
           ><var:if condition="shortUserNameForDisplay" const:value="anonymous"

From 140f26fdaec5664502d69be369e9ffe22e24068a Mon Sep 17 00:00:00 2001
From: iRouge <bfavreault@inverse.ca>
Date: Wed, 14 Jan 2015 11:36:10 -0500
Subject: [PATCH 5/5] Views tweaking and todos

---
 UI/Templates/MailerUI/UIxMailFolderTemplate.wox | 6 ++++--
 UI/Templates/MailerUI/UIxMailMainFrame.wox      | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index e566c25a6..43bba7a2c 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -6,7 +6,7 @@
    xmlns:rsrc="OGo:url"
    xmlns:label="OGo:label"
    xmlns:uix="OGo:uix">
-    <md-content md-scroll-y="md-scroll-y" flex="33" id="messagesList">
+    <md-content md-scroll-y="md-scroll-y" class="md-padding" flex="flex" id="messagesList">
       <md-list data-vs-repeat="56"
                data-vs-scroll-parent="#messagesList">
         <md-item ng-repeat="currentMessage in mailbox.$messages track by currentMessage.id"
@@ -24,5 +24,7 @@
         </md-item>
       </md-list>
     </md-content>
-    <md-content flex="66" data-ui-view="message"><!-- message view --></md-content>
+
+    <md-content class="md-padding" flex="66" data-ui-view="message"><!-- message view --></md-content>
+
 </container>
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 75a5a37f3..cbcca1c35 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -269,6 +269,7 @@
 
     <main layout="column" layout-fill="layout-fill">
       <md-toolbar layout="row" layout-align="space-between start" class="md-tall md-warn">
+        <!--fixme : md-toolbar-tools height is inconsistently defined, in former version it was 64px (basic toolbar height), here it's 100% -->
         <div class="md-toolbar-tools">
           <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>
@@ -276,12 +277,12 @@
               [[Calendar]]
             </div>
           </span>
-          <span class="sd-toolbar">
+          <span class="sd-toolbar-tools">
             <span>search</span>
           </span>
         </div>
       </md-toolbar>
-      <md-content layout="row" flex="flex" class="md-padding" ui-view="mailbox"><!-- messages list --></md-content>
+      <md-content layout="row" flex="flex" ui-view="mailbox"><!-- messages list --></md-content>
     </main>
   </script>