Monotone-Parent: 0bad93574cbb34f80f8e581a8347fec75a28f612

Monotone-Revision: 31bbff0f57dce6334191e5cabb61c655e5022a37

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-09T14:17:22
Monotone-Branch: ca.inverse.sogo

UI/Templates/MailerUI/UIxMailEditor.wox

@@ -10,6 +10,7 @@
   className="UIxPageFrame"
   title="panelTitle"
   const:popup="YES"
+  const:userDefaultsKeys="SOGoMailComposeMessageType,SOGoMailReplyPlacement,SOGoMailSignature"
   const:jsFiles="UIxMailToSelection.js,ckeditor/ckeditor.js,SOGoAutoCompletion.js">
   <script type="text/javascript">
     var mailIsReply = <var:string value="isMailReply"/>;

UI/Templates/MailerUI/UIxMailMainFrame.wox

@@ -7,6 +7,8 @@
   xmlns:label="OGo:label"
   className="UIxPageFrame"
   title="title"
+  const:userDefaultsKeys="SOGoMailMessageCheck,SOGoMailListViewColumnsOrder"
+  const:userSettingsKeys="Mail"
   const:jsFiles="dtree.js,MailerUIdTree.js,SOGoAutoCompletion.js,SOGoResizableTable.js,SOGoMailDataSource.js,SOGoDataTable.js">
   <script type="text/javascript">
     var textMailAccounts = '<var:string value="mailAccounts" const:escapeHTML="NO"/>';

UI/Templates/SchedulerUI/UIxCalMainView.wox

@@ -7,6 +7,8 @@
   xmlns:rsrc="OGo:url"
   xmlns:label="OGo:label"
   className="UIxPageFrame"
+  const:userDefaultsKeys="SOGoCalendarCategoriesColors"
+  const:userSettingsKeys="Calendar,ShowCompletedTasks"
   const:jsFiles="SchedulerUIDnD.js"
   title="title">
   <script type="text/javascript">

UI/Templates/UIxPageFrame.wox

@@ -45,8 +45,19 @@
 	  ><var:if condition="isPopup" const:negate="YES"
 	    ><var:if condition="isUIxDebugEnabled"
 	      ><div id="logConsole"><!-- space --></div></var:if>
-	    <div id="linkBanner" class="linkbanner">
-              <var:if condition="canLogoff"
+            <var:if condition="shortUserNameForDisplay" const:value="anonymous"
+	      const:negate="YES"><var:if condition="hasUserSettingsKeys"
+                ><script type="text/javascript">
+                  var UserSettings = <var:string value="userSettings" const:escapeHTML="NO"/>;
+                </script
+                  ></var:if><var:if condition="hasUserDefaultsKeys">
+                <script type="text/javascript">
+                  var UserDefaults = <var:string value="userDefaults" const:escapeHTML="NO"/>;
+                </script
+                  ></var:if
+                ></var:if>
+              <div id="linkBanner" class="linkbanner">
+                <var:if condition="canLogoff"
                 ><a id="logoff" var:href="logoffPath"
                   ><var:string label:value="Disconnect"/> </a
                   ><span id="userIdentificationDisplay">
@@ -127,8 +138,7 @@
 	      >var UserFolderURL = '<var:string value="userFolderPath" const:escapeHTML="NO"/>';
 	      var UserLogin = '<var:string value="shortUserNameForDisplay" const:escapeHTML="NO"/>';
 	      var UserLanguage = '<var:string value="userLanguage" const:escapeHTML="NO"/>';
-	      var UserSettings = <var:string value="userSettings" const:escapeHTML="NO"/>;
-	      var UserDefaults = <var:string value="userDefaults" const:escapeHTML="NO"/>;</var:if>
+            </var:if>
 	    <var:string value="commonLocalizableStrings" const:escapeHTML="NO"/>
 	    <var:string value="productLocalizableStrings" const:escapeHTML="NO"/>
 	  </script>