X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=UI%2FTemplates%2FUIxPageFrame.wox;h=3d936ae62423854c0797072c95c7a83fe50b49af;hb=204a5e9e597063c8a01142f01d91f2138f93e5a5;hp=828487d20890e1d01e1dc9b5b0789bafbcd75668;hpb=3f78550201baa4e73d15e533b3299edc2e3c7fce;p=scalable-opengroupware.org

diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 828487d2..3d936ae6 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -28,6 +28,10 @@
 	<var:if condition="hasPageSpecificCSS"
 	  ><link type="text/css" rel="stylesheet" var:href="pageCSSURL"
 	    /></var:if>
+	<var:foreach list="additionalCSSFiles" item="item"
+	  ><link type="text/css" rel="stylesheet" var:href="item"
+	    />
+	</var:foreach>
 	<var:if-ie
 	  ><link type="text/css" rel="stylesheet" rsrc:href="iefixes.css"
 	    /></var:if-ie>
@@ -38,7 +42,8 @@
 	  >
 	  <var:if condition="shortUserNameForDisplay" const:value="anonymous"
 	    const:negate="YES"
-	    ><var:if condition="shortUserNameForDisplay" const:value="wrongusernamepassword"
+	    ><var:if condition="shortUserNameForDisplay"
+	      const:value="wrongusernamepassword"
 	      const:negate="YES"
 	      ><var:if condition="isPopup" const:negate="YES"
 		><var:if condition="context.isUIxDebugEnabled"
@@ -46,16 +51,45 @@
 		<div id="linkBanner" class="linkbanner">
 		  <a id="logoff" var:href="logoffPath"
 		    ><var:string label:value="Disconnect" /></a>
-		  <a var:href="relativeCalendarPath"
-		    ><var:string label:value="Calendar" /></a> |
-		  <a var:href="relativeContactsPath"
-		    ><var:string label:value="Address Book" /></a> |
-		  <a var:href="relativeMailPath"
-		    ><var:string label:value="Mail" /></a> |
-		  <a var:href="relativePreferencesPath"
+		  <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>
+		    </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>
+		  <a id="preferencesBannerLink"
+		    var:href="relativePreferencesPath"
 		    ><var:string label:value="Preferences" /></a>
 		  <var:if condition="context.isUIxDebugEnabled"
-		    >| <a href="#"><var:string
+		    >| <a id="consoleBannerLink"
+		      href="#"><var:string
 			label:value="Log Console (dev.)" /></a
 		      ></var:if>
 		</div>
@@ -69,8 +103,14 @@
 	  <div id="javascriptSafetyNet"><!-- space --></div>
 
 	  <script type="text/javascript">
-	    var ApplicationBaseURL = '<var:string value="applicationPath" />';
+	    var ApplicationBaseURL = '<var:string value="applicationPath"/>';
 	    var ResourcesURL = '/SOGo.woa/WebServerResources';
+	    <var:if condition="isSuperUser"
+	      >var IsSuperUser = true;
+	    </var:if>
+	    <var:if condition="isSuperUser" const:negate="YES"
+	      >var IsSuperUser = false;
+	    </var:if>
 	    <var:if condition="shortUserNameForDisplay" const:value="anonymous"
 	      const:negate="YES"
 	      >var UserFolderURL = '<var:string value="userFolderPath" />';
@@ -79,6 +119,7 @@
 	    <var:string value="productLocalizableStrings" const:escapeHTML="NO"/>
 	  </script>
 	  <script type="text/javascript" rsrc:src="events.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="fastinit.js"><!-- space --></script>
 	  <script type="text/javascript" rsrc:src="prototype.js"><!-- space --></script>
 	  <script type="text/javascript" rsrc:src="tablekit.js"><!-- space --></script>
 	  <script type="text/javascript" rsrc:src="tablekit-trueresize.js"><!-- space --></script>
@@ -97,7 +138,7 @@
 	  <var:foreach list="additionalJSFiles" item="item"
 	    ><script type="text/javascript" var:src="item"><!-- space --></script>
 	  </var:foreach>
-	  <script type="text/javascript">addEvent(window, 'load', onFinalLoadHandler);</script>
+	  <script type="text/javascript">FastInit.addOnLoad(onFinalLoadHandler);</script>
         </var:if>
         <var:if condition="isCompatibleBrowser" const:negate="YES">
 	  <div id="loginScreen">