You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2009/04/19 08:22:19 UTC
svn commit: r766427 - in /ofbiz/branches/release09.04:
applications/accounting/config/ applications/accounting/data/
applications/accounting/widget/ applications/humanres/widget/
applications/manufacturing/widget/manufacturing/ applications/marketing/w...
Author: jonesde
Date: Sun Apr 19 06:22:18 2009
New Revision: 766427
URL: http://svn.apache.org/viewvc?rev=766427&view=rev
Log:
Applied fix from trunk for revision: 766426
Added:
ofbiz/branches/release09.04/framework/images/webapp/images/ofbiz.ico
- copied unchanged from r766426, ofbiz/trunk/framework/images/webapp/images/ofbiz.ico
ofbiz/branches/release09.04/framework/images/webapp/images/ofbiz_logo.gif
- copied unchanged from r766426, ofbiz/trunk/framework/images/webapp/images/ofbiz_logo.gif
ofbiz/branches/release09.04/themes/multiflex/data/MultiflexThemeData.xml
- copied unchanged from r766426, ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml
Removed:
ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/ofbiz.ico
ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/ofbiz_logo.gif
ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/ofbiz.ico
ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/ofbiz_logo.jpg
ofbiz/branches/release09.04/themes/multiflex/data/ThemeData.xml
ofbiz/branches/release09.04/themes/multiflex/webapp/multiflex/ofbiz.ico
ofbiz/branches/release09.04/themes/smoothfeather/webapp/smoothfeather/images/logo.gif
ofbiz/branches/release09.04/themes/smoothfeather/webapp/smoothfeather/ofbiz.ico
Modified:
ofbiz/branches/release09.04/applications/accounting/config/payment.properties
ofbiz/branches/release09.04/applications/accounting/data/DemoOrganizationData.xml
ofbiz/branches/release09.04/applications/accounting/widget/CommonScreens.xml
ofbiz/branches/release09.04/applications/humanres/widget/CommonScreens.xml
ofbiz/branches/release09.04/applications/manufacturing/widget/manufacturing/CommonScreens.xml
ofbiz/branches/release09.04/applications/marketing/widget/CommonScreens.xml
ofbiz/branches/release09.04/applications/order/widget/ordermgr/CommonScreens.xml
ofbiz/branches/release09.04/applications/party/widget/partymgr/CommonScreens.xml
ofbiz/branches/release09.04/applications/product/widget/catalog/CommonScreens.xml
ofbiz/branches/release09.04/applications/product/widget/facility/CommonScreens.xml
ofbiz/branches/release09.04/applications/workeffort/widget/CommonScreens.xml
ofbiz/branches/release09.04/framework/common/widget/CommonScreens.xml
ofbiz/branches/release09.04/framework/example/data/ExamplePortletData.xml
ofbiz/branches/release09.04/framework/example/widget/example/CommonScreens.xml
ofbiz/branches/release09.04/framework/start/src/org/ofbiz/base/start/pos.properties
ofbiz/branches/release09.04/framework/webtools/widget/CommonScreens.xml
ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/CommonScreens.xml
ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml
ofbiz/branches/release09.04/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl
ofbiz/branches/release09.04/specialpurpose/ecommerce/data/DemoProduct.xml
ofbiz/branches/release09.04/specialpurpose/ecommerce/data/DemoSurvey.xml
ofbiz/branches/release09.04/specialpurpose/ecommerce/data/EcommerceTypeData.xml
ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/branches/release09.04/specialpurpose/shark/widget/CommonScreens.xml
ofbiz/branches/release09.04/themes/bluelight/data/BlueLightThemeData.xml
ofbiz/branches/release09.04/themes/flatgrey/data/FlatGreyThemeData.xml
ofbiz/branches/release09.04/themes/smoothfeather/data/SmoothFeatherThemeData.xml
Modified: ofbiz/branches/release09.04/applications/accounting/config/payment.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/config/payment.properties?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/accounting/config/payment.properties (original)
+++ ofbiz/branches/release09.04/applications/accounting/config/payment.properties Sun Apr 19 06:22:18 2009
@@ -261,7 +261,7 @@
payment.paypal.cancelReturn=
# Image To Use On PayPal
-#payment.paypal.image=http://[yourServerName]/images/ofbiz_logo.jpg
+#payment.paypal.image=http://[yourServerName]/images/ofbiz_logo.gif
payment.paypal.image=
# Thank-You / Confirm Order Template (rendered via Freemarker)
Modified: ofbiz/branches/release09.04/applications/accounting/data/DemoOrganizationData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/data/DemoOrganizationData.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/accounting/data/DemoOrganizationData.xml (original)
+++ ofbiz/branches/release09.04/applications/accounting/data/DemoOrganizationData.xml Sun Apr 19 06:22:18 2009
@@ -20,7 +20,7 @@
<entity-engine-xml>
<!-- The main Company Internal Organization -->
<Party partyId="Company" partyTypeId="PARTY_GROUP"/>
- <PartyGroup partyId="Company" groupName="Your Company Name Here" logoImageUrl="http://ofbiz.apache.org/images/ofbiz_logo.jpg"/>
+ <PartyGroup partyId="Company" groupName="Your Company Name Here" logoImageUrl="http://ofbiz.apache.org/images/ofbiz_logo.gif"/>
<PartyRole partyId="Company" roleTypeId="BILL_FROM_VENDOR"/>
<PartyRole partyId="Company" roleTypeId="BILL_TO_CUSTOMER"/>
<PartyRole partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO"/>
Modified: ofbiz/branches/release09.04/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/widget/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/accounting/widget/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -36,7 +36,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.AccountingCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<set field="activeApp" value="accounting" global="true"/>
<set field="applicationMenuName" value="AccountingAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://accounting/widget/Menus.xml" global="true"/>
Modified: ofbiz/branches/release09.04/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/widget/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/humanres/widget/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -34,7 +34,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.HumanResCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<set field="activeApp" value="humanres" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/partymgr/static/partymgr.js" global="true"/>
<set field="layoutSettings.styleSheets[]" value="/partymgr/static/partymgr.css" global="true"/>
Modified: ofbiz/branches/release09.04/applications/manufacturing/widget/manufacturing/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/manufacturing/widget/manufacturing/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/manufacturing/widget/manufacturing/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -36,7 +36,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ManufacturingCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="manufacturing" global="true"/>
Modified: ofbiz/branches/release09.04/applications/marketing/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/marketing/widget/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/marketing/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/marketing/widget/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -33,7 +33,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.MarketingCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="marketing" global="true"/>
Modified: ofbiz/branches/release09.04/applications/order/widget/ordermgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/widget/ordermgr/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/widget/ordermgr/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/order/widget/ordermgr/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -39,7 +39,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.OrderCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="ordermgr" global="true"/>
Modified: ofbiz/branches/release09.04/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/widget/partymgr/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/party/widget/partymgr/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -40,7 +40,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
Modified: ofbiz/branches/release09.04/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/widget/catalog/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/product/widget/catalog/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -36,7 +36,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ProductCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="catalogmgr" global="true"/>
Modified: ofbiz/branches/release09.04/applications/product/widget/facility/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/widget/facility/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/widget/facility/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/product/widget/facility/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -34,7 +34,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.FacilityCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="facilitymgr" global="true"/>
Modified: ofbiz/branches/release09.04/applications/workeffort/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/workeffort/widget/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/workeffort/widget/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -37,7 +37,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.WorkEffortCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="workeffort" global="true"/>
Modified: ofbiz/branches/release09.04/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/widget/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/framework/common/widget/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -285,7 +285,7 @@
<set field="layoutSettings.shortcutIcon" value="/images/ofbiz.ico" global="true"/>
<!-- The settings below are used for xsl-fo screens -->
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="logoImageUrl" value="/images/ofbiz_logo.jpg"/>
+ <set field="logoImageUrl" value="/images/ofbiz_logo.gif"/>
<!--<set field="defaultFontFamily" value="Arial"/>-->
</actions>
<widgets>
@@ -304,7 +304,7 @@
<section>
<actions>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="logoImageUrl" value="/images/ofbiz_logo.jpg"/>
+ <set field="logoImageUrl" value="/images/ofbiz_logo.gif"/>
<!--<set field="defaultFontFamily" value="Arial"/>-->
</actions>
<widgets>
@@ -317,7 +317,7 @@
<screen name="GlobalFoDecorator">
<section>
<actions>
- <set field="layoutSettings.commonHeaderImageUrl" value="/images/ofbiz_logo.jpg"/>
+ <set field="layoutSettings.commonHeaderImageUrl" value="/images/ofbiz_logo.gif"/>
</actions>
<widgets>
<platform-specific>
@@ -338,7 +338,7 @@
<section>
<actions>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="logoImageUrl" value="/images/ofbiz_logo.jpg"/>
+ <set field="logoImageUrl" value="/images/ofbiz_logo.gif"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/branches/release09.04/framework/example/data/ExamplePortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/example/data/ExamplePortletData.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/example/data/ExamplePortletData.xml (original)
+++ ofbiz/branches/release09.04/framework/example/data/ExamplePortletData.xml Sun Apr 19 06:22:18 2009
@@ -21,7 +21,7 @@
<PortalPortlet portalPortletId="EXAMPLE_1" portletName="Example 1" description="Example portlet n. 1"
screenName="ExamplePortlet1" screenLocation="component://example/widget/example/PortletScreens.xml"
editFormName="ExamplePortlet1Edit" editFormLocation="component://example/widget/example/PortletEditForms.xml"
- screenshot="/images/ofbiz_logo.jpg"/>
+ screenshot="/images/ofbiz_logo.gif"/>
<PortalPortlet portalPortletId="EXAMPLE_2" portletName="Example 2" description="Example portlet n. 2"
screenName="ExamplePortlet2" screenLocation="component://example/widget/example/PortletScreens.xml"
Modified: ofbiz/branches/release09.04/framework/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/example/widget/example/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/framework/example/widget/example/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -32,7 +32,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ExampleCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
Modified: ofbiz/branches/release09.04/framework/start/src/org/ofbiz/base/start/pos.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/start/src/org/ofbiz/base/start/pos.properties?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/start/src/org/ofbiz/base/start/pos.properties (original)
+++ ofbiz/branches/release09.04/framework/start/src/org/ofbiz/base/start/pos.properties Sun Apr 19 06:22:18 2009
@@ -48,7 +48,7 @@
ofbiz.start.loader2=org.ofbiz.base.container.ContainerLoader
# -- Splash Logo
-ofbiz.start.splash.logo=framework/images/webapp/images/ofbiz_logo.jpg
+ofbiz.start.splash.logo=framework/images/webapp/images/ofbiz_logo.gif
# -- Enable the shutdown hook
ofbiz.enable.hook=true
Modified: ofbiz/branches/release09.04/framework/webtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/webtools/widget/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/framework/webtools/widget/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -31,7 +31,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.WebtoolsCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="webtools" global="true"/>
Modified: ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -35,7 +35,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.AssetMaintCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<set field="applicationMenuName" value="AssetMaintAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://assetmaint/widget/Menus.xml" global="true"/>
<set field="applicationTitle" value="${uiLabelMap.AssetMaintApplication}"/>
Modified: ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -38,7 +38,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.IsMgrCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
Modified: ofbiz/branches/release09.04/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl Sun Apr 19 06:22:18 2009
@@ -47,7 +47,7 @@
<div class="headerboxoutside">
<div class="headerboxtop">
<div class="left">
- <a href="http://ofbiz.apache.org/"><img src="/ofbiz/images/ofbiz_logo.jpg" border="0" alt="The Open For Business Project"/></a>
+ <a href="http://ofbiz.apache.org/"><img src="/ofbiz/images/ofbiz_logo.gif" border="0" alt="The Open For Business Project"/></a>
</div>
<div class="right">
<a href="http://ofbiz.apache.org/"><img class="main-logo" src="/ofbiz/images/ofbiz_powered.gif" alt="Powered By Apache OFBiz"/></a>
Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/data/DemoProduct.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/data/DemoProduct.xml Sun Apr 19 06:22:18 2009
@@ -258,8 +258,8 @@
<!-- test Digital Download product -->
<Product productId="GZ-DIG" productTypeId="DIGITAL_GOOD" primaryProductCategoryId="101" productName="Digital Gizmo" internalName="Digital Gizmo" description="A digital gizmo: can be downloaded immediately after purchase." longDescription="This gizmo is part of an exciting new breed that needs no corporeal form: it is all digital! Buy and download it now!" taxable="Y" chargeShipping="N" autoCreateKeywords="Y" isVirtual="N" isVariant="N" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
- <DataResource dataResourceId="GZ-DIG" dataResourceTypeId="OFBIZ_FILE_BIN" mimeTypeId="image/jpeg" dataResourceName="Digital Gizmo Image" objectInfo="framework/images/webapp/images/ofbiz_logo.jpg"/>
- <Content contentId="GZ-DIG" contentTypeId="DOCUMENT" dataResourceId="GZ-DIG" mimeTypeId="image/jpeg" contentName="ofbiz_logo.jpg" description="Image of Digital Gizmo (actually the OFBiz logo)"/>
+ <DataResource dataResourceId="GZ-DIG" dataResourceTypeId="OFBIZ_FILE_BIN" mimeTypeId="image/gif" dataResourceName="Digital Gizmo Image" objectInfo="framework/images/webapp/images/ofbiz_logo.gif"/>
+ <Content contentId="GZ-DIG" contentTypeId="DOCUMENT" dataResourceId="GZ-DIG" mimeTypeId="image/gif" contentName="ofbiz_logo.gif" description="Image of Digital Gizmo (actually the OFBiz logo)"/>
<ProductContent productId="GZ-DIG" contentId="GZ-DIG" productContentTypeId="DIGITAL_DOWNLOAD" fromDate="2001-05-13 12:00:00.0" useTime="3" useTimeUomId="TF_mon"/>
<ProductPrice productId="GZ-DIG" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="55.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
<ProductPrice productId="GZ-DIG" productPricePurposeId="PURCHASE" productPriceTypeId="LIST_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="80.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/data/DemoSurvey.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/data/DemoSurvey.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/data/DemoSurvey.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/data/DemoSurvey.xml Sun Apr 19 06:22:18 2009
@@ -53,7 +53,7 @@
<SurveyQuestion surveyQuestionId="1034" surveyQuestionCategoryId="1001" surveyQuestionTypeId="OPTION" question="How would you rate this store for on-line functionality?"/>
<SurveyQuestion surveyQuestionId="1035" surveyQuestionCategoryId="1001" surveyQuestionTypeId="URL" question="What is your favorite on-line store? (Enter Valid URL)"/>
<SurveyQuestion surveyQuestionId="1036" surveyQuestionCategoryId="1001" surveyQuestionTypeId="TEXTAREA" question="Comments:"/>
- <SurveyQuestion surveyQuestionId="1037" surveyQuestionCategoryId="1001" surveyQuestionTypeId="SEPERATOR_TEXT" question="<img src="http://localhost:8080/images/ofbiz_logo.jpg">"/>
+ <SurveyQuestion surveyQuestionId="1037" surveyQuestionCategoryId="1001" surveyQuestionTypeId="SEPERATOR_TEXT" question="<img src="http://localhost:8080/images/ofbiz_logo.gif">"/>
<SurveyQuestion surveyQuestionId="1038" surveyQuestionCategoryId="1001" surveyQuestionTypeId="SEPERATOR_LINE"/>
<SurveyQuestion surveyQuestionId="1042" surveyQuestionCategoryId="1001" surveyQuestionTypeId="CONTENT" question="Do you have a picture you would like to attach?"/>
Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/data/EcommerceTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/data/EcommerceTypeData.xml Sun Apr 19 06:22:18 2009
@@ -19,7 +19,6 @@
-->
<entity-engine-xml>
-
<!-- Ecommerce Default Visual Theme -->
<VisualTheme visualThemeId="EC_DEFAULT" visualThemeSetId="ECOMMERCE" description="OFBiz Ecommerce Standard Floating Layout"/>
<VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/ecommerce/images/blog.css" sequenceId="01"/>
@@ -27,9 +26,8 @@
<VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/prototypejs/popup.css" sequenceId="03"/>
<VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/content/images/contentForum.css" sequenceId="04"/>
<VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.jpg" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
<VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/header.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/footer.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/images/ecdefaulttheme.jpg" sequenceId="01"/>
-
</entity-engine-xml>
Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -39,7 +39,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ProjectMgrCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<set field="activeApp" value="projectmgr" global="true"/>
<set field="applicationMenuName" value="ProjectMgrAppBar" global="true"/>
Modified: ofbiz/branches/release09.04/specialpurpose/shark/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/shark/widget/CommonScreens.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/shark/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/shark/widget/CommonScreens.xml Sun Apr 19 06:22:18 2009
@@ -30,7 +30,7 @@
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.SharkCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>-->
+ <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="activeApp" value="shark" global="true"/>
Modified: ofbiz/branches/release09.04/themes/bluelight/data/BlueLightThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/bluelight/data/BlueLightThemeData.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/bluelight/data/BlueLightThemeData.xml (original)
+++ ofbiz/branches/release09.04/themes/bluelight/data/BlueLightThemeData.xml Sun Apr 19 06:22:18 2009
@@ -22,8 +22,8 @@
<VisualTheme visualThemeId="BLUELIGHT" visualThemeSetId="BACKOFFICE" description="BlueLight Theme: Breadcrumbs, drop-down menus and rounded corners"/>
<VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/bluelight/style.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bluelight/dropdown.js" sequenceId="01"/>
- <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/bluelight/ofbiz.ico" sequenceId="01"/>
- <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/bluelight/ofbiz_logo.gif" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
<VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://bluelight/includes/header.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://bluelight/includes/footer.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://bluelight/includes/appbar.ftl" sequenceId="01"/>
Modified: ofbiz/branches/release09.04/themes/flatgrey/data/FlatGreyThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/flatgrey/data/FlatGreyThemeData.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/flatgrey/data/FlatGreyThemeData.xml (original)
+++ ofbiz/branches/release09.04/themes/flatgrey/data/FlatGreyThemeData.xml Sun Apr 19 06:22:18 2009
@@ -22,8 +22,8 @@
<VisualTheme visualThemeId="FLAT_GREY" visualThemeSetId="BACKOFFICE" description="Flat Grey - Old OFBiz Standard Floating Layout"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/maincss.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/flatgrey/mainrtl.css" sequenceId="01"/>
- <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/flatgrey/ofbiz.ico" sequenceId="01"/>
- <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/flatgrey/ofbiz_logo.jpg" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://flatgrey/includes/header.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://flatgrey/includes/footer.ftl" sequenceId="01"/>
Modified: ofbiz/branches/release09.04/themes/smoothfeather/data/SmoothFeatherThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/smoothfeather/data/SmoothFeatherThemeData.xml?rev=766427&r1=766426&r2=766427&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/smoothfeather/data/SmoothFeatherThemeData.xml (original)
+++ ofbiz/branches/release09.04/themes/smoothfeather/data/SmoothFeatherThemeData.xml Sun Apr 19 06:22:18 2009
@@ -22,8 +22,8 @@
<VisualTheme visualThemeId="SMOOTH_FEATHER" visualThemeSetId="BACKOFFICE" description="New Smooth Feather Interface with new OFBiz branding and styling"/>
<VisualThemeResource visualThemeId="SMOOTH_FEATHER" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/smoothfeather/css/global.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="SMOOTH_FEATHER" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/smoothfeather/js/global.js" sequenceId="01"/>
- <VisualThemeResource visualThemeId="SMOOTH_FEATHER" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/smoothfeather/ofbiz.ico" sequenceId="01"/>
- <VisualThemeResource visualThemeId="SMOOTH_FEATHER" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/smoothfeather/ofbiz_logo.jpg" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="SMOOTH_FEATHER" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="SMOOTH_FEATHER" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
<VisualThemeResource visualThemeId="SMOOTH_FEATHER" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://smoothfeather/includes/header.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="SMOOTH_FEATHER" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://smoothfeather/includes/footer.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="SMOOTH_FEATHER" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://smoothfeather/includes/appbar.ftl" sequenceId="01"/>