From 95e42d38f754dc701de20a9c300dc9b0d34c6b9b Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 9 Dec 2011 16:34:11 +0000
Subject: [PATCH] Monotone-Parent: b4900cbcd7c48cfd36bb5a262eec357e3ac1033a
 Monotone-Revision: 533c5fea139373885b136bf6d41275a80a56967b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-12-09T16:34:11
---
 UI/MailerUI/Toolbars/SOGoDraftObject.toolbar  |  2 +-
 UI/MailerUI/Toolbars/SOGoMailFolder.toolbar   |  2 +-
 UI/SOGoUI/UIxComponent.h                      |  6 --
 UI/SOGoUI/UIxComponent.m                      | 23 +-----
 UI/Templates/PreferencesUI/UIxPreferences.wox | 14 ++--
 UI/Templates/UIxPageFrame.wox                 | 78 ++++++++-----------
 6 files changed, 40 insertions(+), 85 deletions(-)

diff --git a/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar b/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar
index c4c1020ad..63d1f38a6 100644
--- a/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar
+++ b/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar
@@ -12,7 +12,7 @@
     { link  = "#";
       onclick  = "return onContactAdd(this);";
       image = "tb-compose-contacts-flat-24x24.png";
-      cssClass = "tbicon_addressbook";
+      cssClass = "tbicon_addressbook single-window-not-conditional";
       label = "Contacts";
       tooltip = "Select a recipient from an Address Book"; },
     { link  = "#";
diff --git a/UI/MailerUI/Toolbars/SOGoMailFolder.toolbar b/UI/MailerUI/Toolbars/SOGoMailFolder.toolbar
index a84c9780c..1c9d1968d 100644
--- a/UI/MailerUI/Toolbars/SOGoMailFolder.toolbar
+++ b/UI/MailerUI/Toolbars/SOGoMailFolder.toolbar
@@ -59,7 +59,7 @@
   (
    { link = "#";
      onclick = "return onPrintCurrentMessage(event);";
-     cssClass = "tbicon_print";
+     cssClass = "tbicon_print single-window-not-conditional";
      image = "tb-mail-print-flat-24x24.png";
      label = "Print"; 
      tooltip = "Print this message"; },
diff --git a/UI/SOGoUI/UIxComponent.h b/UI/SOGoUI/UIxComponent.h
index 05477b801..c343773f2 100644
--- a/UI/SOGoUI/UIxComponent.h
+++ b/UI/SOGoUI/UIxComponent.h
@@ -66,12 +66,6 @@
 - (NSString *)ownPath;
 - (NSString *)relativePathToUserFolderSubPath:(NSString *)_sub;
 
-/* module access */
-- (BOOL) isCalendarEnabled;
-- (BOOL) isContactsEnabled;
-- (BOOL) isMailEnabled;
-- (BOOL) isPreferencesEnabled;
-
 /* date selection */
 - (NSCalendarDate *) selectedDate;
 
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index ed2194008..e57f10256 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -460,7 +460,7 @@ static NSMutableArray *abbrMonthLabelKeys = nil;
   value = [[context request] cookieValueForKey: @"SOGoWindowMode"];
   result = ([value isEqualToString: @"single"]);
 
-  NSLog(@"Single window mode %@", result?@"enabled":@"disabled");
+  //NSLog(@"Single window mode %@", result?@"enabled":@"disabled");
 
   return result;
 }
@@ -483,27 +483,6 @@ static NSMutableArray *abbrMonthLabelKeys = nil;
   return [user canAccessModule: @"Mail"];
 }
 
-#warning we might want to refine the tests here...
-- (BOOL) isCalendarEnabled
-{
-  return [self userHasCalendarAccess] && ![self singleWindowModeEnabled];
-}
-
-- (BOOL) isContactsEnabled
-{
-  return ![self singleWindowModeEnabled];
-}
-
-- (BOOL) isMailEnabled
-{
-  return [self userHasMailAccess];
-}
-
-- (BOOL) isPreferencesEnabled
-{
-  return ![self singleWindowModeEnabled];
-}
-
 /* SoUser */
 
 - (NSString *) shortUserNameForDisplay
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 06d0771c1..2b3cce7e4 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -20,15 +20,13 @@
       <ul>
         <li target="generalView"><span>
             <var:string label:value="General" /></span></li>
-	<var:if condition="isCalendarEnabled">
+	<var:if condition="userHasCalendarAccess">
           <li target="calendarOptionsView"><span><var:string
                 label:value="Calendar Options"/></span></li>
 	</var:if
-          ><var:if condition="isContactsEnabled">
-          <li target="contactsOptionsView"><span><var:string
-                label:value="Contacts Options"/></span></li>
-        </var:if
-          ><var:if condition="isMailEnabled">
+          ><li target="contactsOptionsView"><span><var:string
+              label:value="Contacts Options"/></span></li
+          ><var:if condition="userHasMailAccess">
           <li target="mailOptionsView"><span><var:string
                 label:value="Mail Options"/></span></li>
           <li target="mailAccountsView"><span><var:string
@@ -82,7 +80,7 @@
                 /></label>
           </div>
         </div>
-        <var:if condition="isCalendarEnabled">
+        <var:if condition="userHasCalendarAccess">
           <div id="calendarOptionsView" class="tab">
             <label><var:string label:value="Week begins on :"/>
               <var:popup list="daysList" item="item"
@@ -181,7 +179,7 @@
           <input type="hidden" const:id="contactsCategoriesValue" 
             const:name="contactsCategoriesValue" var:value="contactsCategoriesValue"/>
         </div>
-        <var:if condition="isMailEnabled">
+        <var:if condition="userHasMailAccess">
           <div id="mailOptionsView" class="tab">
             <label><input type="checkbox" 
                 const:name="subscribedFoldersOnly"
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 7f245037b..3176d3e95 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -38,16 +38,6 @@
 	<var:if-ie
 	  ><link type="text/css" rel="stylesheet" rsrc:href="iefixes.css"
 	    /></var:if-ie>
-        <style type="text/css">
-          <var:if condition="singleWindowModeEnabled"
-            >.single-window-not-conditional</var:if
-            ><var:if condition="singleWindowModeEnabled"
-              const:negate="YES"
-              >.single-window-conditional</var:if>
-            {
-              display: none !important;
-            }
-        </style>
       </head>
 
       <body var:class="bodyClasses"
@@ -76,46 +66,46 @@
                   <var:if condition="userHasVacationEnabled"><img rsrc:src="status.vacation-msg.png" label:title="Vacation message is enabled" /></var:if>
                   <var:string var:value="userIdentification"/></span
                   ></var:if>
-              <var:if condition="isCalendarEnabled">
-                <var:if condition="isCalendar">
-                  <span class="active"><var:string label:value="Calendar"
-                      /></span>
-                </var:if>
-                <var:if condition="isCalendar" const:negate="YES">
-                  <a id="calendarBannerLink"
-                    var:href="relativeCalendarPath"
-                    ><var:string label:value="Calendar" /></a>
-                </var:if>
-              </var:if>
-              <var:if condition="isContactsEnabled">
-                <var:if condition="isContacts">
-                  <span class="active"><var:string label:value="Address Book"
-                      /></span>
-                </var:if>
-                <var:if condition="isContacts" const:negate="YES">
-                  <a id="contactsBannerLink"
-                    var:href="relativeContactsPath"
-                    ><var:string label:value="Address Book" /></a>
-                </var:if>
-              </var:if>
-              <var:if condition="isMailEnabled">
+	      <var:if condition="userHasCalendarAccess">
+		<var:if condition="isCalendar">
+		  <span class="active"><var:string label:value="Calendar"
+		      /></span>
+		  </var:if>
+		<var:if condition="isCalendar" const:negate="YES">
+		  <a id="calendarBannerLink"
+		    var:href="relativeCalendarPath"
+		    ><var:string label:value="Calendar" /></a>
+		</var:if>
+
+	      </var:if>
+	      <var:if condition="isContacts">
+		<span class="active"><var:string label:value="Address Book"
+		    /></span>
+	      </var:if>
+	      <var:if condition="isContacts" const:negate="YES">
+		<a id="contactsBannerLink"
+		  var:href="relativeContactsPath"
+		  ><var:string label:value="Address Book" /></a>
+	      </var:if>
+	      
+	      <var:if condition="userHasMailAccess">
 		<var:if condition="isMail">
-                  <span class="active"><var:string label:value="Mail"
+		    <span class="active"><var:string label:value="Mail"
 		      /></span>
 		</var:if>
 		<var:if condition="isMail" const:negate="YES">
 		  <a id="mailBannerLink" var:href="relativeMailPath"
 		    ><var:string label:value="Mail" /></a>
 		</var:if>
+		
 	      </var:if>
-              <var:if condition="isPreferencesEnabled">
-                <a id="preferencesBannerLink"
-                  var:href="relativePreferencesPath"
-                  ><var:string label:value="Preferences" /></a>
-              </var:if
-                ><var:if condition="isSuperUser">
+	      <a id="preferencesBannerLink"
+		var:href="relativePreferencesPath"
+		><var:string label:value="Preferences" /></a>
+	      <var:if condition="isSuperUser">
+		
 		<var:if condition="isAdministration">
-                  <span class="active"><var:string label:value="Administration"
+		    <span class="active"><var:string label:value="Administration"
 		      /></span>
 		</var:if>
 		<var:if condition="isAdministration" const:negate="YES">
@@ -146,12 +136,6 @@
 	    <var:if condition="isSuperUser" const:negate="YES"
 	      >var IsSuperUser = false;
 	    </var:if>
-            var IsCalendarEnabled = <var:if condition="isCalendarEnabled">true</var:if
-              ><var:if condition="isCalendarEnabled" const:negate="YES">false</var:if>;
-            var IsAddressBookEnabled = <var:if condition="isAddressBookEnabled">true</var:if
-              ><var:if condition="isAddressBookEnabled" const:negate="YES">false</var:if>;
-            var IsMailEnabled = <var:if condition="isMailEnabled">true</var:if
-              ><var:if condition="isMailEnabled" const:negate="YES">false</var:if>;
 	    <var:if condition="usesCASAuthentication"
 	      >var usesCASAuthentication = true;
 	    </var:if>