Author: jleroux
Date: Fri Jan 12 13:31:38 2018
New Revision: 1820980
URL: http://svn.apache.org/viewvc?rev=1820980&view=rev
Log:
Improved: Clean images, among them logos, in all locations used
(OFBIZ-10128)
Fix my previous commits, there is no themes webapp so no URL at
/themes/common/webapp/images/ofbiz_logo.png
It's only images/ofbiz_logo.png
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/config/payment.properties
ofbiz/ofbiz-framework/trunk/applications/accounting/data/OrganizationDemoData.xml
ofbiz/ofbiz-framework/trunk/applications/party/minilang/test/PartyTests.xml
ofbiz/ofbiz-framework/trunk/themes/README.md
ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml
ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml
ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml
ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/config/payment.properties
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/config/payment.properties?rev=1820980&r1=1820979&r2=1820980&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/config/payment.properties
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/config/payment.properties
Fri Jan 12 13:31:38 2018
@@ -277,7 +277,7 @@ payment.paypal.return=
payment.paypal.cancelReturn=
# Image To Use On PayPal
-#payment.paypal.image=http://[yourServerName]/themes/common/webapp/images/ofbiz_logo.png
+#payment.paypal.image=http://[yourServerName]/images/ofbiz_logo.png
payment.paypal.image=
# Thank-You / Confirm Order Template (rendered via Freemarker)
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/data/OrganizationDemoData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/data/OrganizationDemoData.xml?rev=1820980&r1=1820979&r2=1820980&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/data/OrganizationDemoData.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/data/OrganizationDemoData.xml
Fri Jan 12 13:31:38 2018
@@ -20,7 +20,7 @@ under the License.
<entity-engine-xml>
<!-- The main Company Internal Organization -->
<Party partyId="Company" partyTypeId="PARTY_GROUP"
statusId="PARTY_ENABLED"/>
- <PartyGroup partyId="Company" groupName="Your Company Name Here"
logoImageUrl="/themes/common/webapp/images/ofbiz_logo.png"/>
+ <PartyGroup partyId="Company" groupName="Your Company Name Here"
logoImageUrl="/images/ofbiz_logo.png"/>
<PartyRole partyId="Company" roleTypeId="BILL_FROM_VENDOR"/>
<PartyRole partyId="Company" roleTypeId="BILL_TO_CUSTOMER"/>
<PartyRole partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO"/>
@@ -196,7 +196,7 @@ under the License.
<!-- An Enterprise Internal Organization -->
<Party partyId="Enterprise" partyTypeId="PARTY_GROUP"
statusId="PARTY_ENABLED"/>
- <PartyGroup partyId="Enterprise" groupName="Large Enterprise, Inc."
logoImageUrl="/themes/common/webapp/images/ofbiz_logo.png"/>
+ <PartyGroup partyId="Enterprise" groupName="Large Enterprise, Inc."
logoImageUrl="/images/ofbiz_logo.png"/>
<PartyRole partyId="Enterprise" roleTypeId="INTERNAL_ORGANIZATIO"/>
<PartyRole partyId="Enterprise" roleTypeId="PARENT_ORGANIZATION"/>
<PartyStatus partyId="Enterprise" statusId="PARTY_ENABLED"
statusDate="2001-01-01 12:00:00.0"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/minilang/test/PartyTests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/minilang/test/PartyTests.xml?rev=1820980&r1=1820979&r2=1820980&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/minilang/test/PartyTests.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/minilang/test/PartyTests.xml
Fri Jan 12 13:31:38 2018
@@ -1228,7 +1228,7 @@ under the License.
<simple-method method-name="testUpdatePartyGroup" short-description="Test
the service to update party group" login-required="false">
<set field="serviceCtx.partyId" value="TestGroup-1"/>
<set field="serviceCtx.groupName" value="Test Party Group"/>
- <set field="serviceCtx.logoImageUrl"
value="/themes/common/webapp/images/ofbiz_logo.png"/>
+ <set field="serviceCtx.logoImageUrl" value="/images/ofbiz_logo.png"/>
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
@@ -1241,7 +1241,7 @@ under the License.
<assert>
<not><if-empty field="partyGroup"/></not>
<if-compare field="partyGroup.groupName" operator="equals"
value="Test Party Group"/>
- <if-compare field="partyGroup.logoImageUrl" operator="equals"
value="/themes/common/webapp/images/ofbiz_logo.png"/>
+ <if-compare field="partyGroup.logoImageUrl" operator="equals"
value="/images/ofbiz_logo.png"/>
</assert>
<check-errors/>
</simple-method>
Modified: ofbiz/ofbiz-framework/trunk/themes/README.md
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/README.md?rev=1820980&r1=1820979&r2=1820980&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/README.md (original)
+++ ofbiz/ofbiz-framework/trunk/themes/README.md Fri Jan 12 13:31:38 2018
@@ -242,7 +242,7 @@ The blue light theme has been these prop
```xml
<VisualTheme visualThemeId="BLUELIGHT" visualThemeSetId="BACKOFFICE"
description="BlueLight Theme: breadcrumbs, drop-down menus and rounded
corners"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_NAME" resourceValue="BLUELIGHT" sequenceId="01"/>
- <VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_IMAGE_URL"
resourceValue="/themes/common/webapp/images/ofbiz_logo.png" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_IMAGE_Url" resourceValue="/images/ofbiz_logo.png"
sequenceId="01"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_SHORTCUT_ICON"
resourceValue="/themes/common/webapp/images/ofbiz.ico" sequenceId="01"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/bluelight/screenshot.jpg"
sequenceId="01"/>
Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml?rev=1820980&r1=1820979&r2=1820980&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml Fri Jan 12
13:31:38 2018
@@ -37,7 +37,7 @@ under the License.
<property name="VT_HELPSTYLESHEET['add']" value="/bluelight/help.css"/>
<property name="VT_DOCBOOKSTYLESHEET['add']"
value="/bluelight/webapp/bluelight/docbook.css"/>
<!--header image -->
- <property name="VT_HDR_IMAGE_URL"
value="/themes/common/webapp/images/ofbiz_logo.png"/>
+ <property name="VT_HDR_IMAGE_Url" value="/images/ofbiz_logo.png"/>
<!--template location-->
<property name="VT_HDR_TMPLT_LOC"
value="component://bluelight/template/Header.ftl"/>
<property name="VT_FTR_TMPLT_LOC"
value="component://bluelight/template/Footer.ftl"/>
Modified: ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml?rev=1820980&r1=1820979&r2=1820980&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml Fri Jan
12 13:31:38 2018
@@ -455,7 +455,7 @@ under the License.
<entity-one entity-name="PartyNameView"
value-field="currentOrganization">
<field-map field-name="partyId"
from-field="organizationPartyId"/>
</entity-one>
- <set field="logoImageUrl"
value="/themes/common/webapp/images/ofbiz_logo.png"/>
+ <set field="logoImageUrl" value="/images/ofbiz_logo.png"/>
<!--<set field="defaultFontFamily" value="Arial"/>-->
</actions>
<widgets>
@@ -477,7 +477,7 @@ under the License.
<section>
<actions>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
- <set field="logoImageUrl"
value="/themes/common/webapp/images/ofbiz_logo.png" global="true"/>
+ <set field="logoImageUrl" value="/images/ofbiz_logo.png"
global="true"/>
<property-to-field resource="fop.properties"
field="defaultFontFamily" property="fop.font.family" default="NotoSans"/>
</actions>
<widgets>
@@ -490,7 +490,7 @@ under the License.
<screen name="GlobalFoDecorator">
<section>
<actions>
- <set field="layoutSettings.commonHeaderImageUrl"
value="/themes/common/webapp/images/ofbiz_logo.png"/>
+ <set field="layoutSettings.commonHeaderImageUrl"
value="/images/ofbiz_logo.png"/>
</actions>
<widgets>
<platform-specific>
@@ -510,7 +510,7 @@ under the License.
<screen name="FoError">
<section>
<actions>
- <set field="logoImageUrl"
value="/themes/common/webapp/images/ofbiz_logo.png"/>
+ <set field="logoImageUrl" value="/images/ofbiz_logo.png"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml?rev=1820980&r1=1820979&r2=1820980&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml Fri Jan 12
13:31:38 2018
@@ -31,7 +31,7 @@ under the License.
<theme-properties>
<!--header image -->
- <property name="VT_HDR_IMAGE_URL"
value="/themes/common/webapp/images/ofbiz_logo.png"/>
+ <property name="VT_HDR_IMAGE_Url" value="/images/ofbiz_logo.png"/>
<!--template location-->
<property name="VT_HDR_TMPLT_LOC"
value="component://flatgrey/template/Header.ftl"/>
<property name="VT_FTR_TMPLT_LOC"
value="component://flatgrey/template/Footer.ftl"/>
Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml?rev=1820980&r1=1820979&r2=1820980&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml Fri Jan 12
13:31:38 2018
@@ -38,7 +38,7 @@ under the License.
<extends location="component://common-theme/widget/Theme.xml"/>
<theme-properties>
<!--header image -->
- <property name="VT_HDR_IMAGE_URL"
value="/themes/common/webapp/images/ofbiz_logo.png"/>
+ <property name="VT_HDR_IMAGE_Url" value="/images/ofbiz_logo.png"/>
<!--template location-->
<property name="VT_HDR_TMPLT_LOC"
value="component://rainbowstone/template/includes/Header.ftl"/>
<property name="VT_FTR_TMPLT_LOC"
value="component://rainbowstone/template/includes/Footer.ftl"/>
Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml?rev=1820980&r1=1820979&r2=1820980&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml Fri Jan 12
13:31:38 2018
@@ -36,7 +36,7 @@ under the License.
<property name="VT_NAV_CLOSE_TMPLT"
value="component://tomahawk/template/AppBarClose.ftl"/>
<property name="VT_MSG_TMPLT_LOC"
value="component://common-theme/template/includes/Messages.ftl"/>
<!--header image -->
- <property name="VT_HDR_IMAGE_URL"
value="/themes/common/webapp/images/ofbiz_logo.png"/>
+ <property name="VT_HDR_IMAGE_Url" value="/images/ofbiz_logo.png"/>
<!--javascript lib-->
<property name="VT_HDR_JAVASCRIPT['add']"
value="/tomahawk/js/dropdown.js"/>
<!--Css style-->
![http://[yourServerName]/themes/common/webapp/images/ofbiz_logo.png](http://[yourServerName]/themes/common/webapp/images/ofbiz_logo.png){kind=link}
![http://[yourServerName]/images/ofbiz_logo.png](http://[yourServerName]/images/ofbiz_logo.png){kind=link}