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] 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"/>';