You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/12/07 11:42:19 UTC
svn commit: r1042964 [6/9] - in /ofbiz/branches/jquery: ./
applications/accounting/data/ applications/accounting/servicedef/
applications/accounting/src/org/ofbiz/accounting/tax/
applications/content/data/ applications/content/src/org/ofbiz/content/dat...
Modified: ofbiz/branches/jquery/framework/webtools/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/Menus.xml?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/Menus.xml Tue Dec 7 10:42:16 2010
@@ -1,276 +1,276 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-
- <menu name="WebtoolsAppBar" title="${uiLabelMap.FrameworkWebTools}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="logging" title="${uiLabelMap.WebtoolsLogging}">
- <link target="LogView"/>
- </menu-item>
- <menu-item name="cache" title="${uiLabelMap.WebtoolsCacheDebugTools}">
- <link target="FindUtilCache"/>
- </menu-item>
- <menu-item name="artifact" title="${uiLabelMap.WebtoolsArtifactInfo}">
- <link target="ArtifactInfo"/>
- </menu-item>
- <menu-item name="entity" title="${uiLabelMap.WebtoolsEntityEngine}">
- <link target="entitymaint"/>
- </menu-item>
- <menu-item name="service" title="${uiLabelMap.WebtoolsServiceEngineTools}">
- <link target="ServiceList"/>
- </menu-item>
- <menu-item name="importExport" title="${uiLabelMap.WebtoolsImportExport}">
- <link target="xmldsdump"/>
- </menu-item>
- <menu-item name="stats" title="${uiLabelMap.WebtoolsStatistics}">
- <link target="StatsSinceStart"/>
- </menu-item>
- <menu-item name="configuration" title="${uiLabelMap.WebtoolsConfiguration}">
- <link target="myCertificates"/>
- </menu-item>
- <menu-item name="geoManagement" title="${uiLabelMap.WebtoolsGeoManagement}">
- <link target="FindGeo"/>
- </menu-item>
- <menu-item name="portalAdmin" title="${uiLabelMap.WebtoolsAdminPortalPage}">
- <condition><if-has-permission permission="PORTALPAGE_ADMIN"/></condition>
- <link target="FindPortalPage"/>
- </menu-item>
- <menu-item name="tests" title="Tests">
- <link target="selenium"/>
- </menu-item>
- </menu>
-
- <menu name="configurationTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
- selected-menuitem-context-field-name="page.tabButtonItem">
- <menu-item name="tempexpr" title="${uiLabelMap.WebtoolsTemporalExpression}">
- <link target="findTemporalExpression"/>
- </menu-item>
- <menu-item name="myCertificates" title="${uiLabelMap.WebtoolsMyCertificates}">
- <link target="myCertificates"/>
- </menu-item>
- </menu>
-
- <menu name="importExportTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
- selected-menuitem-context-field-name="page.tabButtonItem">
- <menu-item name="data" title="${uiLabelMap.WebtoolsDataFileTools}">
- <link target="viewdatafile"/>
- </menu-item>
- <menu-item name="modelInduceFromDb" title="${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}">
- <link target="view/ModelInduceFromDb"/>
- </menu-item>
- <menu-item name="entityEoModelBundle" title="${uiLabelMap.WebtoolsExportEntityEoModelBundle}">
- <link target="EntityEoModelBundle"/>
- </menu-item>
- <menu-item name="xmlDsDump" title="${uiLabelMap.PageTitleEntityExport}">
- <link target="xmldsdump"/>
- </menu-item>
- <menu-item name="entityExportAll" title="${uiLabelMap.PageTitleEntityExportAll}">
- <link target="EntityExportAll"/>
- </menu-item>
- <menu-item name="entityImport" title="${uiLabelMap.PageTitleEntityImport}">
- <link target="EntityImport"/>
- </menu-item>
- <menu-item name="entityImportDir" title="${uiLabelMap.PageTitleEntityImportDir}">
- <link target="EntityImportDir"/>
- </menu-item>
- <menu-item name="entityImportReaders" title="${uiLabelMap.PageTitleEntityImportReaders}">
- <link target="EntityImportReaders"/>
- </menu-item>
- </menu>
-
- <menu name="serviceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
- selected-menuitem-context-field-name="page.tabButtonItem">
- <menu-item name="serviceList" title="${uiLabelMap.WebtoolsServiceReference}">
- <link target="ServiceList"/>
- </menu-item>
- <menu-item name="findJob" title="${uiLabelMap.WebtoolsJobList}">
- <link target="FindJob"/>
- </menu-item>
- <menu-item name="threadList" title="${uiLabelMap.WebtoolsThreadList}">
- <link target="threadList"/>
- </menu-item>
- <menu-item name="scheduleJob" title="${uiLabelMap.WebtoolsScheduleJob}">
- <link target="scheduleJob"/>
- </menu-item>
- <menu-item name="runService" title="${uiLabelMap.PageTitleRunService}">
- <link target="runService"/>
- </menu-item>
- </menu>
-
- <menu name="LoggingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
- selected-menuitem-context-field-name="tabButtonItem">
- <menu-item name="logView" title="${uiLabelMap.WebtoolsViewLog}">
- <link target="LogView"/>
- </menu-item>
- <menu-item name="serviceLog" title="${uiLabelMap.WebtoolsServiceLog}">
- <link target="ServiceLog"/>
- </menu-item>
- <menu-item name="logConfiguration" title="${uiLabelMap.PageTitleLogConfiguration}">
- <link target="LogConfiguration"/>
- </menu-item>
- </menu>
-
- <menu name="CacheTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
- selected-menuitem-context-field-name="logMenuItem">
- <menu-item name="findUtilCache" title="${uiLabelMap.WebtoolsCacheMaintenance}">
- <link target="FindUtilCache"/>
- </menu-item>
- </menu>
-
- <menu name="artifactTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
- selected-menuitem-context-field-name="tabButtonItem">
- <menu-item name="artifactInfo" title="${uiLabelMap.WebtoolsArtifactInfo}">
- <link target="ArtifactInfo"/>
- </menu-item>
- <menu-item name="viewents" title="${uiLabelMap.WebtoolsViewComponents}">
- <link target="ViewComponents"/>
- </menu-item>
- <menu-item name="labels" title="${uiLabelMap.WebtoolsLabelManager}">
- <link target="SearchLabels"/>
- </menu-item>
- </menu>
-
- <menu name="TempExprTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
- selected-menuitem-context-field-name="tabMenuItem">
- <menu-item name="findExpression" title="${uiLabelMap.CommonFind}">
- <link target="findTemporalExpression"/>
- </menu-item>
- <menu-item name="editExpression" title="${uiLabelMap.CommonEdit}">
- <condition>
- <not><if-empty field="temporalExpression"/></not>
- </condition>
- <link target="editTemporalExpression">
- <parameter param-name="tempExprId" from-field="temporalExpression.tempExprId"/>
- </link>
- </menu-item>
- </menu>
-
- <menu name="EntityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="entitymaint" title="${uiLabelMap.WebtoolsEntityDataMaintenance}">
- <link target="entitymaint"/>
- </menu-item>
- <menu-item name="entityref" title="${uiLabelMap.WebtoolsEntityReference} - Interactive">
- <link target="entityref" target-window="_BLANK"/>
- </menu-item>
- <menu-item name="entityrefStatic" title="${uiLabelMap.WebtoolsEntityReference} - ${uiLabelMap.WebtoolsEntityReferenceStaticVersion}">
- <link target="entityref" target-window="_BLANK">
- <parameter param-name="forstatic" value="true"/>
- </link>
- </menu-item>
- <menu-item name="entityrefReport" title="${uiLabelMap.WebtoolsEntityReferencePdf}">
- <link target="entityrefReport" target-window="_BLANK"/>
- </menu-item>
- <menu-item name="EntitySQLProcessor" title="${uiLabelMap.PageTitleEntitySQLProcessor}">
- <link target="EntitySQLProcessor"/>
- </menu-item>
- <menu-item name="entitySyncStatus" title="${uiLabelMap.WebtoolsEntitySyncStatus}">
- <link target="EntitySyncStatus"/>
- </menu-item>
- <menu-item name="checkDb" title="${uiLabelMap.WebtoolsCheckUpdateDatabase}">
- <link target="view/checkdb"/>
- </menu-item>
- <menu-item name="entityPerformanceTest" title="${uiLabelMap.WebtoolsPerformanceTests}">
- <link target="EntityPerformanceTest"/>
- </menu-item>
- </menu>
-
- <menu name="PortalPageAdmin">
- <menu-item name="duplicate" title="${uiLabelMap.CommonDuplicate}">
- <link target="DuplicatePortalPage">
- <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
- </link>
- </menu-item>
- <menu-item name="new" title="${uiLabelMap.CommonNew}">
- <link target="NewPortalPage"/>
- </menu-item>
- <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}">
- <link target="EditPortalPage">
- <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
- </link>
- </menu-item>
- </menu>
-
- <menu name="StatsSinceStart" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="clearStats" title="${uiLabelMap.WebtoolsStatsClearSince}">
- <link target="StatsSinceStart">
- <parameter param-name="clear" value="true"/>
- </link>
- </menu-item>
- <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}" widget-style="buttontext refresh">
- <link target="StatsSinceStart"/>
- </menu-item>
- </menu>
-
- <menu name="StatsBinHistory" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="statsSinceStart" title="${uiLabelMap.WebtoolsStatsMainPageTitle}">
- <link target="StatsSinceStart"/>
- </menu-item>
- <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}" widget-style="buttontext refresh">
- <link target="StatBinsHistory">
- <parameter param-name="statsId" from-field="parameters.statsId"/>
- <parameter param-name="type" from-field="parameters.type"/>
- </link>
- </menu-item>
- </menu>
-
- <menu name="FindCache" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}" widget-style="buttontext refresh">
- <link target="FindUtilCache"/>
- </menu-item>
- <menu-item name="clearAll" title="${uiLabelMap.WebtoolsClearAllCaches}">
- <link target="FindUtilCacheClearAll"/>
- </menu-item>
- <menu-item name="forceGarbageCollection" title="${uiLabelMap.WebtoolsRunGC}">
- <link target="ForceGarbageCollection"/>
- </menu-item>
- </menu>
-
- <menu name="CacheElements" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="back" title="${uiLabelMap.WebtoolsBackToCacheMaintenance}">
- <link target="FindUtilCache"/>
- </menu-item>
- </menu>
-
- <menu name="EditCache" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="clear" title="${uiLabelMap.WebtoolsClearThisCache}">
- <link target="EditUtilCacheClear">
- <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
- <parameter param-name="type" from-field="parameters.type"/>
- </link>
- </menu-item>
- <menu-item name="back" title="${uiLabelMap.WebtoolsBackToCacheMaintenance}">
- <link target="FindUtilCache"/>
- </menu-item>
- </menu>
-
- <menu name="geoManagement" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <!--menu-container-style="button-bar button-style-2 no-clear"-->
- <menu-item name="FindGeo" title="${uiLabelMap.WebtoolsGeosFind}">
- <link target="FindGeo"/>
- </menu-item>
- <menu-item name="EditGeo" title="${uiLabelMap.WebtoolsGeoCreateNew}">
- <link target="EditGeo"/>
- </menu-item>
- <menu-item name="LinkGeos" title="${uiLabelMap.WebtoolsGeosLink}">
- <link target="LinkGeos"/>
- </menu-item>
- </menu>
-
-</menus>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
+
+ <menu name="WebtoolsAppBar" title="${uiLabelMap.FrameworkWebTools}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="logging" title="${uiLabelMap.WebtoolsLogging}">
+ <link target="LogView"/>
+ </menu-item>
+ <menu-item name="cache" title="${uiLabelMap.WebtoolsCacheDebugTools}">
+ <link target="FindUtilCache"/>
+ </menu-item>
+ <menu-item name="artifact" title="${uiLabelMap.WebtoolsArtifactInfo}">
+ <link target="ArtifactInfo"/>
+ </menu-item>
+ <menu-item name="entity" title="${uiLabelMap.WebtoolsEntityEngine}">
+ <link target="entitymaint"/>
+ </menu-item>
+ <menu-item name="service" title="${uiLabelMap.WebtoolsServiceEngineTools}">
+ <link target="ServiceList"/>
+ </menu-item>
+ <menu-item name="importExport" title="${uiLabelMap.WebtoolsImportExport}">
+ <link target="xmldsdump"/>
+ </menu-item>
+ <menu-item name="stats" title="${uiLabelMap.WebtoolsStatistics}">
+ <link target="StatsSinceStart"/>
+ </menu-item>
+ <menu-item name="configuration" title="${uiLabelMap.WebtoolsConfiguration}">
+ <link target="myCertificates"/>
+ </menu-item>
+ <menu-item name="geoManagement" title="${uiLabelMap.WebtoolsGeoManagement}">
+ <link target="FindGeo"/>
+ </menu-item>
+ <menu-item name="portalAdmin" title="${uiLabelMap.WebtoolsAdminPortalPage}">
+ <condition><if-has-permission permission="PORTALPAGE_ADMIN"/></condition>
+ <link target="FindPortalPage"/>
+ </menu-item>
+ <menu-item name="tests" title="Tests">
+ <link target="selenium"/>
+ </menu-item>
+ </menu>
+
+ <menu name="configurationTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ selected-menuitem-context-field-name="page.tabButtonItem">
+ <menu-item name="tempexpr" title="${uiLabelMap.WebtoolsTemporalExpression}">
+ <link target="findTemporalExpression"/>
+ </menu-item>
+ <menu-item name="myCertificates" title="${uiLabelMap.WebtoolsMyCertificates}">
+ <link target="myCertificates"/>
+ </menu-item>
+ </menu>
+
+ <menu name="importExportTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ selected-menuitem-context-field-name="page.tabButtonItem">
+ <menu-item name="data" title="${uiLabelMap.WebtoolsDataFileTools}">
+ <link target="viewdatafile"/>
+ </menu-item>
+ <menu-item name="modelInduceFromDb" title="${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}">
+ <link target="view/ModelInduceFromDb"/>
+ </menu-item>
+ <menu-item name="entityEoModelBundle" title="${uiLabelMap.WebtoolsExportEntityEoModelBundle}">
+ <link target="EntityEoModelBundle"/>
+ </menu-item>
+ <menu-item name="xmlDsDump" title="${uiLabelMap.PageTitleEntityExport}">
+ <link target="xmldsdump"/>
+ </menu-item>
+ <menu-item name="entityExportAll" title="${uiLabelMap.PageTitleEntityExportAll}">
+ <link target="EntityExportAll"/>
+ </menu-item>
+ <menu-item name="entityImport" title="${uiLabelMap.PageTitleEntityImport}">
+ <link target="EntityImport"/>
+ </menu-item>
+ <menu-item name="entityImportDir" title="${uiLabelMap.PageTitleEntityImportDir}">
+ <link target="EntityImportDir"/>
+ </menu-item>
+ <menu-item name="entityImportReaders" title="${uiLabelMap.PageTitleEntityImportReaders}">
+ <link target="EntityImportReaders"/>
+ </menu-item>
+ </menu>
+
+ <menu name="serviceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ selected-menuitem-context-field-name="page.tabButtonItem">
+ <menu-item name="serviceList" title="${uiLabelMap.WebtoolsServiceReference}">
+ <link target="ServiceList"/>
+ </menu-item>
+ <menu-item name="findJob" title="${uiLabelMap.WebtoolsJobList}">
+ <link target="FindJob"/>
+ </menu-item>
+ <menu-item name="threadList" title="${uiLabelMap.WebtoolsThreadList}">
+ <link target="threadList"/>
+ </menu-item>
+ <menu-item name="scheduleJob" title="${uiLabelMap.WebtoolsScheduleJob}">
+ <link target="scheduleJob"/>
+ </menu-item>
+ <menu-item name="runService" title="${uiLabelMap.PageTitleRunService}">
+ <link target="runService"/>
+ </menu-item>
+ </menu>
+
+ <menu name="LoggingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="logView" title="${uiLabelMap.WebtoolsViewLog}">
+ <link target="LogView"/>
+ </menu-item>
+ <menu-item name="serviceLog" title="${uiLabelMap.WebtoolsServiceLog}">
+ <link target="ServiceLog"/>
+ </menu-item>
+ <menu-item name="logConfiguration" title="${uiLabelMap.PageTitleLogConfiguration}">
+ <link target="LogConfiguration"/>
+ </menu-item>
+ </menu>
+
+ <menu name="CacheTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ selected-menuitem-context-field-name="logMenuItem">
+ <menu-item name="findUtilCache" title="${uiLabelMap.WebtoolsCacheMaintenance}">
+ <link target="FindUtilCache"/>
+ </menu-item>
+ </menu>
+
+ <menu name="artifactTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="artifactInfo" title="${uiLabelMap.WebtoolsArtifactInfo}">
+ <link target="ArtifactInfo"/>
+ </menu-item>
+ <menu-item name="viewents" title="${uiLabelMap.WebtoolsViewComponents}">
+ <link target="ViewComponents"/>
+ </menu-item>
+ <menu-item name="labels" title="${uiLabelMap.WebtoolsLabelManager}">
+ <link target="SearchLabels"/>
+ </menu-item>
+ </menu>
+
+ <menu name="TempExprTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ selected-menuitem-context-field-name="tabMenuItem">
+ <menu-item name="findExpression" title="${uiLabelMap.CommonFind}">
+ <link target="findTemporalExpression"/>
+ </menu-item>
+ <menu-item name="editExpression" title="${uiLabelMap.CommonEdit}">
+ <condition>
+ <not><if-empty field="temporalExpression"/></not>
+ </condition>
+ <link target="editTemporalExpression">
+ <parameter param-name="tempExprId" from-field="temporalExpression.tempExprId"/>
+ </link>
+ </menu-item>
+ </menu>
+
+ <menu name="EntityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="entitymaint" title="${uiLabelMap.WebtoolsEntityDataMaintenance}">
+ <link target="entitymaint"/>
+ </menu-item>
+ <menu-item name="entityref" title="${uiLabelMap.WebtoolsEntityReference} - Interactive">
+ <link target="entityref" target-window="_BLANK"/>
+ </menu-item>
+ <menu-item name="entityrefStatic" title="${uiLabelMap.WebtoolsEntityReference} - ${uiLabelMap.WebtoolsEntityReferenceStaticVersion}">
+ <link target="entityref" target-window="_BLANK">
+ <parameter param-name="forstatic" value="true"/>
+ </link>
+ </menu-item>
+ <menu-item name="entityrefReport" title="${uiLabelMap.WebtoolsEntityReferencePdf}">
+ <link target="entityrefReport" target-window="_BLANK"/>
+ </menu-item>
+ <menu-item name="EntitySQLProcessor" title="${uiLabelMap.PageTitleEntitySQLProcessor}">
+ <link target="EntitySQLProcessor"/>
+ </menu-item>
+ <menu-item name="entitySyncStatus" title="${uiLabelMap.WebtoolsEntitySyncStatus}">
+ <link target="EntitySyncStatus"/>
+ </menu-item>
+ <menu-item name="checkDb" title="${uiLabelMap.WebtoolsCheckUpdateDatabase}">
+ <link target="view/checkdb"/>
+ </menu-item>
+ <menu-item name="entityPerformanceTest" title="${uiLabelMap.WebtoolsPerformanceTests}">
+ <link target="EntityPerformanceTest"/>
+ </menu-item>
+ </menu>
+
+ <menu name="PortalPageAdmin">
+ <menu-item name="duplicate" title="${uiLabelMap.CommonDuplicate}">
+ <link target="DuplicatePortalPage">
+ <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+ </link>
+ </menu-item>
+ <menu-item name="new" title="${uiLabelMap.CommonNew}">
+ <link target="NewPortalPage"/>
+ </menu-item>
+ <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}">
+ <link target="EditPortalPage">
+ <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+ </link>
+ </menu-item>
+ </menu>
+
+ <menu name="StatsSinceStart" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="clearStats" title="${uiLabelMap.WebtoolsStatsClearSince}">
+ <link target="StatsSinceStart">
+ <parameter param-name="clear" value="true"/>
+ </link>
+ </menu-item>
+ <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}" widget-style="buttontext refresh">
+ <link target="StatsSinceStart"/>
+ </menu-item>
+ </menu>
+
+ <menu name="StatsBinHistory" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="statsSinceStart" title="${uiLabelMap.WebtoolsStatsMainPageTitle}">
+ <link target="StatsSinceStart"/>
+ </menu-item>
+ <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}" widget-style="buttontext refresh">
+ <link target="StatBinsHistory">
+ <parameter param-name="statsId" from-field="parameters.statsId"/>
+ <parameter param-name="type" from-field="parameters.type"/>
+ </link>
+ </menu-item>
+ </menu>
+
+ <menu name="FindCache" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}" widget-style="buttontext refresh">
+ <link target="FindUtilCache"/>
+ </menu-item>
+ <menu-item name="clearAll" title="${uiLabelMap.WebtoolsClearAllCaches}">
+ <link target="FindUtilCacheClearAll"/>
+ </menu-item>
+ <menu-item name="forceGarbageCollection" title="${uiLabelMap.WebtoolsRunGC}">
+ <link target="ForceGarbageCollection"/>
+ </menu-item>
+ </menu>
+
+ <menu name="CacheElements" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="back" title="${uiLabelMap.WebtoolsBackToCacheMaintenance}">
+ <link target="FindUtilCache"/>
+ </menu-item>
+ </menu>
+
+ <menu name="EditCache" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="clear" title="${uiLabelMap.WebtoolsClearThisCache}">
+ <link target="EditUtilCacheClear">
+ <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
+ <parameter param-name="type" from-field="parameters.type"/>
+ </link>
+ </menu-item>
+ <menu-item name="back" title="${uiLabelMap.WebtoolsBackToCacheMaintenance}">
+ <link target="FindUtilCache"/>
+ </menu-item>
+ </menu>
+
+ <menu name="geoManagement" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <!--menu-container-style="button-bar button-style-2 no-clear"-->
+ <menu-item name="FindGeo" title="${uiLabelMap.WebtoolsGeosFind}">
+ <link target="FindGeo"/>
+ </menu-item>
+ <menu-item name="EditGeo" title="${uiLabelMap.WebtoolsGeoCreateNew}">
+ <link target="EditGeo"/>
+ </menu-item>
+ <menu-item name="LinkGeos" title="${uiLabelMap.WebtoolsGeosLink}">
+ <link target="LinkGeos"/>
+ </menu-item>
+ </menu>
+
+</menus>
Modified: ofbiz/branches/jquery/framework/webtools/widget/StatsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/StatsForms.xml?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/StatsForms.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/StatsForms.xml Tue Dec 7 10:42:16 2010
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-
- <form name="ListStats" type="list" paginate-target="StatsSinceStart" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <field name="requestId" title="${uiLabelMap.WebtoolsStatsRequestId}"><display/></field>
- <field name="startTime" title="${uiLabelMap.WebtoolsStatsStart}"><display/></field>
- <field name="endTime" title="${uiLabelMap.WebtoolsStatsStop}"><display/></field>
- <field name="lengthMins" title="${uiLabelMap.WebtoolsStatsMinutes}"><display/></field>
- <field name="numberHits" title="${uiLabelMap.WebtoolsStatsHits}"><display/></field>
- <field name="minTime" title="${uiLabelMap.WebtoolsStatsMin}"><display/></field>
- <field name="avgTime" title="${uiLabelMap.WebtoolsStatsAvg}"><display/></field>
- <field name="maxTime" title="${uiLabelMap.WebtoolsStatsMax}"><display/></field>
- <field name="hitsPerMin" title="${uiLabelMap.WebtoolsStatsHitsPerMin}"><display/></field>
- <field name="viewBins" widget-style="buttontext" title="${uiLabelMap.CommonEmptyHeader}">
- <hyperlink description="${uiLabelMap.WebtoolsStatsViewBins}" target="StatBinsHistory">
- <parameter param-name="statsId" from-field="requestId"/>
- <parameter param-name="type" from-field="requestType"/>
- </hyperlink>
- </field>
- </form>
-
- <form name="ListRequestStats" extends="ListStats" list-name="requestList"/>
- <form name="ListEventStats" extends="ListStats" list-name="eventList"/>
- <form name="ListViewStats" extends="ListStats" list-name="viewList"/>
- <form name="ListRequestBins" extends="ListStats" list-name="requestList">
- <field name="viewBins"><hidden/></field>
- </form>
-</forms>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+ <form name="ListStats" type="list" paginate-target="StatsSinceStart" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <field name="requestId" title="${uiLabelMap.WebtoolsStatsRequestId}"><display/></field>
+ <field name="startTime" title="${uiLabelMap.WebtoolsStatsStart}"><display/></field>
+ <field name="endTime" title="${uiLabelMap.WebtoolsStatsStop}"><display/></field>
+ <field name="lengthMins" title="${uiLabelMap.WebtoolsStatsMinutes}"><display/></field>
+ <field name="numberHits" title="${uiLabelMap.WebtoolsStatsHits}"><display/></field>
+ <field name="minTime" title="${uiLabelMap.WebtoolsStatsMin}"><display/></field>
+ <field name="avgTime" title="${uiLabelMap.WebtoolsStatsAvg}"><display/></field>
+ <field name="maxTime" title="${uiLabelMap.WebtoolsStatsMax}"><display/></field>
+ <field name="hitsPerMin" title="${uiLabelMap.WebtoolsStatsHitsPerMin}"><display/></field>
+ <field name="viewBins" widget-style="buttontext" title="${uiLabelMap.CommonEmptyHeader}">
+ <hyperlink description="${uiLabelMap.WebtoolsStatsViewBins}" target="StatBinsHistory">
+ <parameter param-name="statsId" from-field="requestId"/>
+ <parameter param-name="type" from-field="requestType"/>
+ </hyperlink>
+ </field>
+ </form>
+
+ <form name="ListRequestStats" extends="ListStats" list-name="requestList"/>
+ <form name="ListEventStats" extends="ListStats" list-name="eventList"/>
+ <form name="ListViewStats" extends="ListStats" list-name="viewList"/>
+ <form name="ListRequestBins" extends="ListStats" list-name="requestList">
+ <field name="viewBins"><hidden/></field>
+ </form>
+</forms>
Modified: ofbiz/branches/jquery/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/macros.xml?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/macros.xml (original)
+++ ofbiz/branches/jquery/macros.xml Tue Dec 7 10:42:16 2010
@@ -72,7 +72,7 @@ under the License.
</presetdef>
<presetdef name="javac16">
- <default-javac compiler="javac1.6" target="1.6" source="1.6" encoding="UTF-8" sourcepathref="src-path">
+ <default-javac compiler="javac1.6" target="1.6" source="1.6" encoding="UTF-8" sourcepathref="src-path" includeantruntime="false">
<!--
<compilerarg value="-Xlint:unchecked"/>
-->
Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/data/DemoEbayStoreData.xml?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ebaystore/data/DemoEbayStoreData.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ebaystore/data/DemoEbayStoreData.xml Tue Dec 7 10:42:16 2010
@@ -94,10 +94,10 @@
<Content contentId="EBAY_ITEM_DISPATCH1" contentTypeId="DOCUMENT" dataResourceId="EBAY_ITEM_DISPATCH1" statusId="CTNT_IN_PROGRESS"/>
<ContentRole contentId="EBAY_ITEM_DISPATCH1" partyId="DemoEbayAccount1" roleTypeId="OWNER" fromDate="2010-01-01 00:00:00.000"/>
- <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
- <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
- <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
- <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
+ <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
+ <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
+ <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
+ <ProductStoreEmailSetting productStoreId="90101" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
<!-- ===================== -->
<!-- Ebay Store Demo2 Data -->
@@ -174,8 +174,8 @@
<Content contentId="EBAY_ITEM_DISPATCH2" contentTypeId="DOCUMENT" dataResourceId="EBAY_ITEM_DISPATCH2" statusId="CTNT_IN_PROGRESS"/>
<ContentRole contentId="EBAY_ITEM_DISPATCH2" partyId="DemoEbayAccount2" roleTypeId="OWNER" fromDate="2010-01-01 00:00:00.000"/>
- <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
- <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
- <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
- <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
+ <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
+ <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
+ <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
+ <ProductStoreEmailSetting productStoreId="90102" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@example.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@example.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
</entity-engine-xml>
Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 7 10:42:16 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1040441
+/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1042956
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoMarketing.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoMarketing.xml?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoMarketing.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoMarketing.xml Tue Dec 7 10:42:16 2010
@@ -23,11 +23,11 @@ under the License.
<ContactList contactListId="9000" contactListTypeId="ANNOUNCEMENT" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000"
contactListName="New Product Announcements" description="New Product Announcements Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company"
- verifyEmailFrom="ofbiztest@yahoo.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
+ verifyEmailFrom="ofbiztest@example.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/>
<ContactList contactListId="9010" contactListTypeId="NEWSLETTER" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000"
contactListName="Product Tips Newsletter" description="Product Tips Newsletter Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company"
- verifyEmailFrom="ofbiztest@yahoo.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
+ verifyEmailFrom="ofbiztest@example.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/>
<ContactListParty contactListId="9000" partyId="DemoCustCompany" preferredContactMechId="9021" statusId="CLPT_ACCEPTED" fromDate="2001-05-13 00:00:00"/>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Tue Dec 7 10:42:16 2010
@@ -78,7 +78,7 @@ under the License.
<TelecomNumber contactMechId="9020" areaCode="801" contactNumber="555-5555"/>
<PartyContactMech partyId="DemoCustCompany" contactMechId="9020" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9020" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/>
- <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
+ <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@example.com"/>
<PartyContactMech partyId="DemoCustCompany" contactMechId="9021" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9021" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
@@ -104,7 +104,7 @@ under the License.
<TelecomNumber contactMechId="9022" areaCode="801" contactNumber="555-5555"/>
<PartyContactMech partyId="DemoCustAgent" contactMechId="9022" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9022" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/>
- <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
+ <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@example.com"/>
<PartyContactMech partyId="DemoCustAgent" contactMechId="9023" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9023" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
@@ -139,7 +139,7 @@ under the License.
<PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_HOME" fromDate="2001-05-13 00:00:00.000"/>
<PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_SHIPPING" fromDate="2001-05-13 00:00:00.000"/>
<PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9027" contactMechPurposeTypeId="PHONE_BILLING" fromDate="2001-05-13 00:00:00.000"/>
- <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
+ <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@example.com"/>
<PartyContactMech partyId="DemoCustomer" contactMechId="9026" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9026" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
@@ -165,7 +165,7 @@ under the License.
<PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
<PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
<PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
- <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
+ <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@example.com"/>
<PartyContactMech partyId="EuroCustomer" contactMechId="EURO01" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EURO01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
@@ -191,7 +191,7 @@ under the License.
<PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
<PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
<PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
- <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
+ <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@example.com"/>
<PartyContactMech partyId="FrenchCustomer" contactMechId="FRA01" fromDate="2009-01-09 00:00:00.000" allowSolicitation="Y"/>
<PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRA01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2009-01-09 00:00:00.000"/>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoProduct.xml Tue Dec 7 10:42:16 2010
@@ -23,7 +23,7 @@ under the License.
<ContactMech contactMechId="9200" contactMechTypeId="POSTAL_ADDRESS"/>
<ContactMech contactMechId="9201" contactMechTypeId="TELECOM_NUMBER"/>
- <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
+ <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@example.com"/>
<PostalAddress contactMechId="9200" toName="Company XYZ" attnName="ZJAA" address1="2003 Open Blvd" city="Orem" postalCode="84058" countryGeoId="USA" stateProvinceGeoId="UT" geoPointId="9000"/>
<TelecomNumber contactMechId="9201" areaCode="801" contactNumber="555-5555"/>
<FacilityContactMech facilityId="WebStoreWarehouse" contactMechId="9200" fromDate="2001-05-13 12:00:00.0"/>
@@ -97,34 +97,34 @@ under the License.
<ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
<ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_BILLACT" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztest@example.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@yahoo.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="ofbiztest@example.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@yahoo.com" subject="A Gift From ${senderName}!"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@yahoo.com" subject="Gift Card Reload Results"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@example.com" subject="A Gift From ${senderName}!"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@example.com" subject="Gift Card Reload Results"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@yahoo.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@example.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztest@yahoo.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztest@example.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/>
- <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztest@yahoo.com" />
+ <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztest@example.com" />
- <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztest@yahoo.com"/>
+ <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztest@example.com"/>
<WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from google analytics" contentId="GOOGLE_ANA_CNT"/>
<WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from bing analytics" contentId="BING_ANA_CNT"/>
@@ -967,4 +967,33 @@ under the License.
<ProductFeature productFeatureId="EC_TANKER" description="Tanker" productFeatureCategoryId="1002" productFeatureTypeId="EQUIP_CLASS"/>
<ProductFeature productFeatureId="EC_REEL_STAND" description="Reel Stand" productFeatureCategoryId="1002" productFeatureTypeId="EQUIP_CLASS"/>
+ <!-- Virtual-Variant Demo Product -->
+ <Product productId="WG-9943-B3-BX2" productTypeId="FINISHED_GOOD" primaryProductCategoryId="202" productName="Giant Widget B3" internalName="Giant Widget B3" description="Black Giant Widget with 3 Wheels" longDescription="This giant widget is mobile. It will seat one person safely. The wheels will never rust or break. Quite a unique item." quantityIncluded="10.0" weight="22.0" isVirtual="Y" isVariant="Y" piecesIncluded="2" quantityUomId="OTH_box" virtualVariantMethodEnum="VV_VARIANTTREE"/>
+ <Product productId="WG-9943-B3-BX5" productTypeId="FINISHED_GOOD" primaryProductCategoryId="202" productName="Giant Widget B3" internalName="Giant Widget B3" description="Black Giant Widget with 3 Wheels" longDescription="This giant widget is mobile. It will seat one person safely. The wheels will never rust or break. Quite a unique item." quantityIncluded="10.0" weight="22.0" isVirtual="Y" isVariant="Y" piecesIncluded="5" quantityUomId="OTH_box" virtualVariantMethodEnum="VV_VARIANTTREE"/>
+ <Product productId="WG-9943-B4-BX2" productTypeId="FINISHED_GOOD" primaryProductCategoryId="202" productName="Giant Widget B4" internalName="Giant Widget B4" description="Black Giant Widget with 4 Wheels" longDescription="This giant widget is mobile. It will seat one person safely. The wheels will never rust or break. Quite a unique item." quantityIncluded="10.0" weight="22.0" isVirtual="Y" isVariant="Y" piecesIncluded="2" quantityUomId="OTH_box" virtualVariantMethodEnum="VV_VARIANTTREE"/>
+ <Product productId="WG-9943-B4-BX5" productTypeId="FINISHED_GOOD" primaryProductCategoryId="202" productName="Giant Widget B4" internalName="Giant Widget B4" description="Black Giant Widget with 4 Wheels" longDescription="This giant widget is mobile. It will seat one person safely. The wheels will never rust or break. Quite a unique item." quantityIncluded="10.0" weight="22.0" isVirtual="Y" isVariant="Y" piecesIncluded="5" quantityUomId="OTH_box" virtualVariantMethodEnum="VV_VARIANTTREE"/>
+ <Product productId="WG-9943-S3-BX2" productTypeId="FINISHED_GOOD" primaryProductCategoryId="202" productName="Giant Widget S3" internalName="Giant Widget S3" description="Silver Giant Widget with 3 Wheels" longDescription="This giant widget is mobile. It will seat one person safely. The wheels will never rust or break. Quite a unique item." quantityIncluded="10.0" weight="22.0" isVirtual="Y" isVariant="Y" piecesIncluded="2" quantityUomId="OTH_box" virtualVariantMethodEnum="VV_VARIANTTREE"/>
+ <Product productId="WG-9943-S3-BX5" productTypeId="FINISHED_GOOD" primaryProductCategoryId="202" productName="Giant Widget S3" internalName="Giant Widget S3" description="Silver Giant Widget with 3 Wheels" longDescription="This giant widget is mobile. It will seat one person safely. The wheels will never rust or break. Quite a unique item." quantityIncluded="10.0" weight="22.0" isVirtual="Y" isVariant="Y" piecesIncluded="5" quantityUomId="OTH_box" virtualVariantMethodEnum="VV_VARIANTTREE"/>
+ <Product productId="WG-9943-S4-BX2" productTypeId="FINISHED_GOOD" primaryProductCategoryId="202" productName="Giant Widget S4" internalName="Giant Widget S4" description="Silver Giant Widget with 4 Wheels" longDescription="This giant widget is mobile. It will seat one person safely. The wheels will never rust or break. Quite a unique item." quantityIncluded="10.0" weight="22.0" isVirtual="Y" isVariant="Y" piecesIncluded="2" quantityUomId="OTH_box" virtualVariantMethodEnum="VV_VARIANTTREE"/>
+ <Product productId="WG-9943-S4-BX5" productTypeId="FINISHED_GOOD" primaryProductCategoryId="202" productName="Giant Widget S4" internalName="Giant Widget S4" description="Silver Giant Widget with 4 Wheels" longDescription="This giant widget is mobile. It will seat one person safely. The wheels will never rust or break. Quite a unique item." quantityIncluded="10.0" weight="22.0" isVirtual="Y" isVariant="Y" piecesIncluded="5" quantityUomId="OTH_box" virtualVariantMethodEnum="VV_VARIANTTREE"/>
+
+ <!-- Association between the alternative product and the variant product -->
+ <ProductAssoc productId="WG-9943-B3-BX2" productIdTo="WG-9943-B3" productAssocTypeId="ALTERNATIVE_PACKAGE" fromDate="2000-01-01 00:00:00.0"/>
+ <ProductAssoc productId="WG-9943-B3-BX5" productIdTo="WG-9943-B3" productAssocTypeId="ALTERNATIVE_PACKAGE" fromDate="2000-01-01 00:00:00.0"/>
+ <ProductAssoc productId="WG-9943-B4-BX2" productIdTo="WG-9943-B4" productAssocTypeId="ALTERNATIVE_PACKAGE" fromDate="2000-01-01 00:00:00.0"/>
+ <ProductAssoc productId="WG-9943-B4-BX5" productIdTo="WG-9943-B4" productAssocTypeId="ALTERNATIVE_PACKAGE" fromDate="2000-01-01 00:00:00.0"/>
+ <ProductAssoc productId="WG-9943-S3-BX2" productIdTo="WG-9943-S3" productAssocTypeId="ALTERNATIVE_PACKAGE" fromDate="2000-01-01 00:00:00.0"/>
+ <ProductAssoc productId="WG-9943-S3-BX5" productIdTo="WG-9943-S3" productAssocTypeId="ALTERNATIVE_PACKAGE" fromDate="2000-01-01 00:00:00.0"/>
+ <ProductAssoc productId="WG-9943-S4-BX2" productIdTo="WG-9943-S4" productAssocTypeId="ALTERNATIVE_PACKAGE" fromDate="2000-01-01 00:00:00.0"/>
+ <ProductAssoc productId="WG-9943-S4-BX5" productIdTo="WG-9943-S4" productAssocTypeId="ALTERNATIVE_PACKAGE" fromDate="2000-01-01 00:00:00.0"/>
+
+ <ProductPrice productId="WG-9943-B3-BX2" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2000-01-01 00:00:00.0" price="800.0" createdDate="2000-01-01 00:00:00.0"/>
+ <ProductPrice productId="WG-9943-B3-BX5" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2000-01-01 00:00:00.0" price="2000.0" createdDate="2000-01-01 00:00:00.0"/>
+ <ProductPrice productId="WG-9943-B4-BX2" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2000-01-01 00:00:00.0" price="800.0" createdDate="2000-01-01 00:00:00.0"/>
+ <ProductPrice productId="WG-9943-B4-BX5" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2000-01-01 00:00:00.0" price="2000.0" createdDate="2000-01-01 00:00:00.0"/>
+ <ProductPrice productId="WG-9943-S3-BX2" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2000-01-01 00:00:00.0" price="800.0" createdDate="2000-01-01 00:00:00.0"/>
+ <ProductPrice productId="WG-9943-S3-BX5" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2000-01-01 00:00:00.0" price="2000.0" createdDate="2000-01-01 00:00:00.0"/>
+ <ProductPrice productId="WG-9943-S4-BX2" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2000-01-01 00:00:00.0" price="800.0" createdDate="2000-01-01 00:00:00.0"/>
+ <ProductPrice productId="WG-9943-S4-BX5" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2000-01-01 00:00:00.0" price="2000.0" createdDate="2000-01-01 00:00:00.0"/>
+
</entity-engine-xml>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoRentalProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoRentalProduct.xml?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoRentalProduct.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoRentalProduct.xml Tue Dec 7 10:42:16 2010
@@ -45,22 +45,22 @@ headerLogo="/images/opentravelsystem_log
<ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="PAYPAL_CONFIG"/>
<ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="WORLDPAY_CONFIG"/>
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
-
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@example.com"/>
+
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@example.com"/>
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@example.com"/>
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@yahoo.com" subject="A Gift From ${senderName}!"/>
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@yahoo.com" subject="Gift Card Reload Results"/>
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@example.com" subject="A Gift From ${senderName}!"/>
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@example.com" subject="Gift Card Reload Results"/>
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@yahoo.com"/>
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@example.com"/>
- <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztest@yahoo.com"/>
+ <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztest@example.com"/>
<ProductStoreFacility productStoreId="RentalStore" facilityId="WebStoreWarehouse" fromDate="2001-05-13 12:00:00.0"/>
<ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="RentalStore" fromDate="2001-05-13 12:00:00.0"/>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Tue Dec 7 10:42:16 2010
@@ -1902,6 +1902,10 @@ under the License.
<response name="success" type="view" value="compareProducts" save-last-view="true"/>
</request-map>
+ <request-map uri="ProductUomDropDownOnly">
+ <security auth="false" https="false"/>
+ <response name="success" type="view" value="ProductUomDropDownOnly" save-last-view="true"/>
+ </request-map>
<!-- End of Request Mappings -->
<!-- View Mappings -->
@@ -2044,5 +2048,8 @@ under the License.
<view-map name="redirectToGoogleCheckout" type="screen" page="component://googlecheckout/widget/GoogleCheckoutScreens.xml#redirect"/>
<view-map name="compareProducts" type="screen" page="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#compareProducts"/>
+
+ <!-- Product in the different UOM -->
+ <view-map name="ProductUomDropDownOnly" type="screen" page="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#ProductUomDropDownOnly"/>
<!-- End of View Mappings -->
</site-conf>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl Tue Dec 7 10:42:16 2010
@@ -18,14 +18,19 @@ under the License.
-->
<div id="browse-blogs" class="screenlet">
- <h3>${uiLabelMap.ProductBrowseBlogs}</h3>
- <div class="screenlet-body">
- <ul class="browsecategorylist">
- <#list blogs as blog>
- <li class="browsecategorytext">
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a>
- </li>
- </#list>
- </ul>
- </div>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.ProductBrowseBlogs}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <ul class="browsecategorylist">
+ <#list blogs as blog>
+ <li class="browsecategorytext">
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a>
+ </li>
+ </#list>
+ </ul>
+ </div>
</div>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/choosecatalog.ftl Tue Dec 7 10:42:16 2010
@@ -23,16 +23,23 @@ under the License.
<#-- Only show if there is more than 1 (one) catalog, no sense selecting when there is only one option... -->
<#if (catalogCol?size > 1)>
<div id ="choosecatalog" class="screenlet">
- <h3>${uiLabelMap.ProductChooseCatalog}</h3>
- <form name="choosecatalogform" method="post" action="<@o...@ofbizUrl>">
- <select name='CURRENT_CATALOG_ID' class='selectBox' onchange="submit()">
- <option value='${currentCatalogId}'>${currentCatalogName}</option>
- <option value='${currentCatalogId}'></option>
- <#list catalogCol as catalogId>
- <#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)>
- <option value='${catalogId}'>${thisCatalogName}</option>
- </#list>
- </select>
- </form>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.ProductChooseCatalog}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <form name="choosecatalogform" method="post" action="<@o...@ofbizUrl>">
+ <select name='CURRENT_CATALOG_ID' class='selectBox' onchange="submit()">
+ <option value='${currentCatalogId}'>${currentCatalogName}</option>
+ <option value='${currentCatalogId}'></option>
+ <#list catalogCol as catalogId>
+ <#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)>
+ <option value='${catalogId}'>${thisCatalogName}</option>
+ </#list>
+ </select>
+ </form>
+ </div>
</div>
</#if>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl?rev=1042964&r1=1042963&r2=1042964&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl Tue Dec 7 10:42:16 2010
@@ -20,30 +20,32 @@ under the License.
<#assign maxToShow = 8/>
<#assign lastViewedCategories = sessionAttributes.lastViewedCategories?if_exists/>
<#if lastViewedCategories?has_content>
- <#if (lastViewedCategories?size > maxToShow)><#assign limit=maxToShow/><#else><#assign limit=(lastViewedCategories?size-1)/></#if>
- <div id="minilastviewedcategories" class="screenlet">
-
- <div class="boxlink">
- <a href="<@o...@ofbizUrl>" class="lightbuttontextsmall">[${uiLabelMap.CommonClear}]</a>
- </div>
- <h3>${uiLabelMap.EcommerceLastCategories}</h3>
- <div class="screenlet-body">
- <ul class="browsecategorylist">
- <#list lastViewedCategories[0..limit] as categoryId>
- <#assign category = delegator.findByPrimaryKeyCache("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", categoryId))?if_exists>
- <#if category?has_content>
- <li class="browsecategorytext">
- <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
- <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
- <#else>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.description?if_exists}</a>
- </#if>
- </li>
- </#if>
- </#list>
- </ul>
- </div>
+ <#if (lastViewedCategories?size > maxToShow)><#assign limit=maxToShow/><#else><#assign limit=(lastViewedCategories?size-1)/></#if>
+ <div id="minilastviewedcategories" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.EcommerceLastCategories}</li>
+ <li><a href="<@o...@ofbizUrl>">[${uiLabelMap.CommonClear}]</a></li>
+ </ul>
+ <br class="clear"/>
</div>
-</#if>
+ <div class="screenlet-body">
+ <ul class="browsecategorylist">
+ <#list lastViewedCategories[0..limit] as categoryId>
+ <#assign category = delegator.findByPrimaryKeyCache("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", categoryId))?if_exists>
+ <#if category?has_content>
+ <li class="browsecategorytext">
+ <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
+ <#else>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.description?if_exists}</a>
+ </#if>
+ </li>
+ </#if>
+ </#list>
+ </ul>
+ </div>
+ </div>
+</#if>
\ No newline at end of file