[OFBiz] SVN: r7808 - in trunk: applications/workeffort/widget framework/common/webcommon/includes framework/common/widget

Sat Jun 17 17:18:59 CDT 2006

Author: jonesde
Date: 2006-06-17 17:18:53 -0500 (Sat, 17 Jun 2006)
New Revision: 7808

Modified:
   trunk/applications/workeffort/widget/CommonScreens.xml
   trunk/framework/common/webcommon/includes/header.ftl
   trunk/framework/common/widget/CommonScreens.xml
Log:
Applied patch from Jacopo based on recent discussions to better parameterize the css file locations, using the global decorator

Modified: trunk/applications/workeffort/widget/CommonScreens.xml
===================================================================

--- trunk/applications/workeffort/widget/CommonScreens.xml	2006-06-16 16:28:16 UTC (rev 7807)
+++ trunk/applications/workeffort/widget/CommonScreens.xml	2006-06-17 22:18:53 UTC (rev 7808)
@@ -31,8 +31,8 @@
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.WorkEffortCompanyName" global="true"/>
                 <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.WorkEffortCompanySubtitle" global="true"/>
                 <set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>
-                <set field="layoutSettings.styleSheets[]" value="/images/maincss.css" global="true"/>
-                <set field="layoutSettings.styleSheets[]" value="/images/tabstyles.css" global="true"/>
+                <!-- The WorkEffort component's screens need the calendarstyles.css stylesheet to render the calendar pages:
+                     it is added to the list of default stylesheet (layoutSettings.styleSheets) defined in the GlobalDecorator -->
                 <set field="layoutSettings.styleSheets[]" value="/images/calendarstyles.css" global="true"/>
                 <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
                 <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->

Modified: trunk/framework/common/webcommon/includes/header.ftl
===================================================================
--- trunk/framework/common/webcommon/includes/header.ftl	2006-06-16 16:28:16 UTC (rev 7807)
+++ trunk/framework/common/webcommon/includes/header.ftl	2006-06-17 22:18:53 UTC (rev 7808)
@@ -46,10 +46,6 @@
         <link rel="stylesheet" href="<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>" type="text/css"/>
         <link rel="stylesheet" href="<@ofbizContentUrl>/images/tabstyles.css</@ofbizContentUrl>" type="text/css"/>
     </#if>
-    <#if layoutSettings.extraStyleSheet?exists>
-      <#-- Component-specified style sheet -->
-      <link rel="stylesheet" href="${layoutSettings.extraStyleSheet}" type="text/css"/>
-    </#if>
     ${layoutSettings.extraHead?if_exists}
 </head>
 

Modified: trunk/framework/common/widget/CommonScreens.xml
===================================================================
--- trunk/framework/common/widget/CommonScreens.xml	2006-06-16 16:28:16 UTC (rev 7807)
+++ trunk/framework/common/widget/CommonScreens.xml	2006-06-17 22:18:53 UTC (rev 7808)
@@ -61,6 +61,12 @@
     <!-- Global decorator for General Screens/Pages -->
     <screen name="GlobalDecorator">
         <section>
+            <actions>
+                <!-- The two default (global) stylesheets are added to the list
+                     of stylesheets to the first and second position -->
+                <set field="layoutSettings.styleSheets[+0]" value="/images/maincss.css" global="true"/>
+                <set field="layoutSettings.styleSheets[+1]" value="/images/tabstyles.css" global="true"/>
+            </actions>
             <widgets>
                 <!-- render header -->
                 <platform-specific><html><html-template location="component://common/webcommon/includes/header.ftl"/></html></platform-specific>

