svn commit: r766426 - in /ofbiz/trunk: applications/accounting/config
Locked
svn commit: r766426 - in /ofbiz/trunk: applications/accounting/config
 
|
Author: jonesde
Date: Sun Apr 19 06:12:55 2009 New Revision: 766426 URL: http://svn.apache.org/viewvc?rev=766426&view=rev Log: Moved logo and icon images back to images component and removed from everywhere else; all references to these should be to there only now; fixes issue with logo in ecommerce and other little things Added: ofbiz/trunk/framework/images/webapp/images/ofbiz.ico (with props) ofbiz/trunk/framework/images/webapp/images/ofbiz_logo.gif - copied unchanged from r766420, ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/images/logo.gif ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml - copied, changed from r766420, ofbiz/trunk/themes/multiflex/data/ThemeData.xml Removed: ofbiz/trunk/themes/bluelight/webapp/bluelight/ofbiz.ico ofbiz/trunk/themes/bluelight/webapp/bluelight/ofbiz_logo.gif ofbiz/trunk/themes/flatgrey/webapp/flatgrey/ofbiz.ico ofbiz/trunk/themes/flatgrey/webapp/flatgrey/ofbiz_logo.jpg ofbiz/trunk/themes/multiflex/data/ThemeData.xml ofbiz/trunk/themes/multiflex/webapp/multiflex/ofbiz.ico ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/images/logo.gif ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/ofbiz.ico Modified: ofbiz/trunk/applications/accounting/config/payment.properties ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml ofbiz/trunk/applications/accounting/widget/CommonScreens.xml ofbiz/trunk/applications/humanres/widget/CommonScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml ofbiz/trunk/applications/marketing/widget/CommonScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/framework/example/data/ExamplePortletData.xml ofbiz/trunk/framework/example/widget/example/CommonScreens.xml ofbiz/trunk/framework/start/src/org/ofbiz/base/start/pos.properties ofbiz/trunk/framework/webtools/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml ofbiz/trunk/themes/smoothfeather/data/SmoothFeatherThemeData.xml Modified: ofbiz/trunk/applications/accounting/config/payment.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/payment.properties?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/payment.properties (original) +++ ofbiz/trunk/applications/accounting/config/payment.properties Sun Apr 19 06:12:55 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/trunk/applications/accounting/data/DemoOrganizationData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml (original) +++ ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml Sun Apr 19 06:12:55 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/trunk/applications/accounting/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/applications/marketing/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/applications/order/widget/ordermgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/applications/party/widget/partymgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/applications/product/widget/facility/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/applications/workeffort/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/framework/example/data/ExamplePortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/data/ExamplePortletData.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/framework/example/data/ExamplePortletData.xml (original) +++ ofbiz/trunk/framework/example/data/ExamplePortletData.xml Sun Apr 19 06:12:55 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/trunk/framework/example/widget/example/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/framework/example/widget/example/CommonScreens.xml (original) +++ ofbiz/trunk/framework/example/widget/example/CommonScreens.xml Sun Apr 19 06:12:55 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"/> --> Added: ofbiz/trunk/framework/images/webapp/images/ofbiz.ico URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ofbiz.ico?rev=766426&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/images/webapp/images/ofbiz.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/pos.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/pos.properties?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/pos.properties (original) +++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/pos.properties Sun Apr 19 06:12:55 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/trunk/framework/webtools/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl (original) +++ ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizHead.ftl Sun Apr 19 06:12:55 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/trunk/specialpurpose/ecommerce/data/DemoProduct.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Sun Apr 19 06:12:55 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/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml Sun Apr 19 06:12:55 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/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml Sun Apr 19 06:12:55 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/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/specialpurpose/shark/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml Sun Apr 19 06:12:55 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/trunk/themes/bluelight/data/BlueLightThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml (original) +++ ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml Sun Apr 19 06:12:55 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/trunk/themes/flatgrey/data/FlatGreyThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original) +++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Sun Apr 19 06:12:55 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"/> Copied: ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml (from r766420, ofbiz/trunk/themes/multiflex/data/ThemeData.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml?p2=ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml&p1=ofbiz/trunk/themes/multiflex/data/ThemeData.xml&r1=766420&r2=766426&rev=766426&view=diff ============================================================================== --- ofbiz/trunk/themes/multiflex/data/ThemeData.xml (original) +++ ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml Sun Apr 19 06:12:55 2009 @@ -24,8 +24,8 @@ <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/multiflex/style.css" sequenceId="02"/> <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/prototypejs/popup.css" sequenceId="03"/> <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/content/images/contentForum.css" sequenceId="04"/> - <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/multiflex/ofbiz.ico" sequenceId="01"/> - <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/multiflex/ofbiz_logo.jpg" sequenceId="01"/> + <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/> + <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/> <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://multiflex/includes/header.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://multiflex/includes/footer.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/multiflex/screenshot.jpg" sequenceId="01"/> Modified: ofbiz/trunk/themes/smoothfeather/data/SmoothFeatherThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/data/SmoothFeatherThemeData.xml?rev=766426&r1=766425&r2=766426&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/data/SmoothFeatherThemeData.xml (original) +++ ofbiz/trunk/themes/smoothfeather/data/SmoothFeatherThemeData.xml Sun Apr 19 06:12:55 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"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |