svn commit: r734455 - in /ofbiz/trunk/framework/common: data/CommonTypeData.xml widget/CommonScreens.xml

[adrianc]

Author: adrianc
Date: Wed Jan 14 09:42:02 2009
New Revision: 734455

URL: http://svn.apache.org/viewvc?rev=734455&view=rev
Log:
Added main navigation template location to the Visual Themes.

Modified:
    ofbiz/trunk/framework/common/data/CommonTypeData.xml
    ofbiz/trunk/framework/common/widget/CommonScreens.xml

Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=734455&r1=734454&r2=734455&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original)
+++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Wed Jan 14 09:42:02 
2009
@@ -110,7 +110,8 @@
     <Enumeration enumId="VT_HDR_JAVASCRIPT" description="Header JavaScript 
File URL" enumTypeId="VT_RES_TYPE" sequenceId="07"/>
     <Enumeration enumId="VT_FTR_TMPLT_LOC" description="Footer Template 
Location" enumTypeId="VT_RES_TYPE" sequenceId="08"/>
     <Enumeration enumId="VT_FTR_JAVASCRIPT" description="Footer JavaScript 
File URL" enumTypeId="VT_RES_TYPE" sequenceId="09"/>
-    <Enumeration enumId="VT_SCREENSHOT" description="Theme Preview Screenshot" 
enumTypeId="VT_RES_TYPE" sequenceId="10"/>
+    <Enumeration enumId="VT_NAV_TMPLT_LOC" description="Main Navigation 
Template Location" enumTypeId="VT_RES_TYPE" sequenceId="10"/>
+    <Enumeration enumId="VT_SCREENSHOT" description="Theme Preview Screenshot" 
enumTypeId="VT_RES_TYPE" sequenceId="11"/>
     <VisualTheme visualThemeId="DEFAULT" description="OFBiz Standard Floating 
Layout"/>
     <VisualThemeResource visualThemeId="DEFAULT" 
resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/maincss.css" 
sequenceId="01"/>
     <VisualThemeResource visualThemeId="DEFAULT" 
resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/images/mainrtl.css" 
sequenceId="01"/>
@@ -118,6 +119,7 @@
     <VisualThemeResource visualThemeId="DEFAULT" 
resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.jpg" 
sequenceId="01"/>
     <VisualThemeResource visualThemeId="DEFAULT" 
resourceTypeEnumId="VT_HDR_TMPLT_LOC" 
resourceValue="component://common/webcommon/includes/header.ftl" 
sequenceId="01"/>
     <VisualThemeResource visualThemeId="DEFAULT" 
resourceTypeEnumId="VT_FTR_TMPLT_LOC" 
resourceValue="component://common/webcommon/includes/footer.ftl" 
sequenceId="01"/>
+    <VisualThemeResource visualThemeId="DEFAULT" 
resourceTypeEnumId="VT_NAV_TMPLT_LOC" 
resourceValue="component://common/webcommon/includes/appbar.ftl" 
sequenceId="01"/>
     <VisualThemeResource visualThemeId="DEFAULT" 
resourceTypeEnumId="VT_SCREENSHOT" 
resourceValue="/images/default-screenshot.gif" sequenceId="01"/>
 
     <!-- Uom Conversion Purposes -->

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=734455&r1=734454&r2=734455&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Wed Jan 14 09:42:02 
2009
@@ -132,6 +132,7 @@
                 <set field="layoutSettings" from-field="themeResources" 
default-value="${layoutSettings}" global="true"/>
                 <set field="headerTemplateLocation" 
from-field="layoutSettings.VT_HDR_TMPLT_LOC[0]" 
default-value="component://common/webcommon/includes/header.ftl"/>
                 <set field="footerTemplateLocation" 
from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" 
default-value="component://common/webcommon/includes/footer.ftl"/>
+                <set field="appbarTemplateLocation" 
from-field="layoutSettings.VT_NAV_TMPLT_LOC[0]" 
default-value="component://common/webcommon/includes/appbar.ftl"/>
                 <property-to-field resource="general" 
property="defaultOrganizationPartyId" 
field="defaultOrganizationPartyIdProperties"/>
                 <set field="defaultOrganizationPartyId" 
value="${bsh:&quot;DEFAULT&quot;.equals(userPreferences.get(&quot;ORGANIZATION_PARTY&quot;))?defaultOrganizationPartyIdProperties:userPreferences.get(&quot;ORGANIZATION_PARTY&quot;)}"
 global="true"/>
                 <property-to-field resource="general" 
property="currency.uom.id.default" field="defaultCurrencyUomId"/>
@@ -145,7 +146,7 @@
                 <!-- render header -->
                 <platform-specific><html><html-template 
location="${headerTemplateLocation}"/></html></platform-specific>
                 <!-- render appbar -->
-                <platform-specific><html><html-template 
location="component://common/webcommon/includes/appbar.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template 
location="${appbarTemplateLocation}"/></html></platform-specific>
                 
                 <!-- render appheader: both menu widget style and ftl template 
style menus are supported-->
                 <section>