svn commit: r1820867 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/widget/ applications/humanres/widget/ applications/manufacturing/widget/manufacturing/ appl...

Author: jleroux
Date: Thu Jan 11 12:13:22 2018
New Revision: 1820867

URL: http://svn.apache.org/viewvc?rev=1820867&view=rev
Log:
"Applied fix from trunk for revision: 1820862"
------------------------------------------------------------------------
r1820862 | jleroux | 2018-01-11 12:05:26 +0100 (jeu., 11 janv. 2018) | 11 lines

Improved: Clean images, among them logos, in all locations used
(OFBIZ-10128)

The ofbiz_logo.png is now in theme. This is only the framework part.
I have also made change in theme but I need to review again and perhaps create
a patch for others to review...
Note: testUpdatePartyGroup is OK

Then I'll also rename the logo in site to use the same name before maybe
referring to svn trunk repo to use only 1 file everywhere, same for the .ico
file
------------------------------------------------------------------------


Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/config/payment.properties
    ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/data/OrganizationDemoData.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/CommonScreens.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/widget/CommonScreens.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/manufacturing/widget/manufacturing/CommonScreens.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/widget/CommonScreens.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/order/widget/ordermgr/CommonScreens.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/party/minilang/test/PartyTests.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/CommonScreens.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/catalog/CommonScreens.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/facility/CommonScreens.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/widget/CommonScreens.xml
    ofbiz/ofbiz-framework/branches/release17.12/framework/webtools/widget/CommonScreens.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 11 12:13:22 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820862

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/config/payment.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/config/payment.properties?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/config/payment.properties (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/config/payment.properties Thu Jan 11 12:13:22 2018
@@ -277,7 +277,7 @@ payment.paypal.return=
 payment.paypal.cancelReturn=
 
 # Image To Use On PayPal
-#payment.paypal.image=http://[yourServerName]/images/ofbiz_logo.png
+#payment.paypal.image=http://[yourServerName]/themes/common/webapp/images/ofbiz_logo.png
 payment.paypal.image=
 
 # Thank-You / Confirm Order Template (rendered via Freemarker)

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/data/OrganizationDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/data/OrganizationDemoData.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/data/OrganizationDemoData.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/data/OrganizationDemoData.xml Thu Jan 11 12:13:22 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="/images/ofbiz_logo.png"/>
+    <PartyGroup partyId="Company" groupName="Your Company Name Here" logoImageUrl="/themes/common/webapp/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="http://ofbiz.apache.org/images/ofbiz_logo.png"/>
+    <PartyGroup partyId="Enterprise" groupName="Large Enterprise, Inc." logoImageUrl="/themes/common/webapp/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/branches/release17.12/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/CommonScreens.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/CommonScreens.xml Thu Jan 11 12:13:22 2018
@@ -35,7 +35,7 @@ under the License.
                 <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.png" global="true"/>-->
+                <!--<set field="layoutSettings.headerImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png" global="true"/>-->
                 <set field="activeApp" value="accounting" global="true"/>
                 <set field="applicationMenuName" value="AccountingAppBar" global="true"/>
                 <set field="applicationMenuLocation" value="component://accounting/widget/AccountingMenus.xml" global="true"/>

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/widget/CommonScreens.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/widget/CommonScreens.xml Thu Jan 11 12:13:22 2018
@@ -33,7 +33,7 @@ under the License.
                 <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.png" global="true"/>-->
+                <!--<set field="layoutSettings.headerImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png" 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/ofbiz-framework/branches/release17.12/applications/manufacturing/widget/manufacturing/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/manufacturing/widget/manufacturing/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/manufacturing/widget/manufacturing/CommonScreens.xml Thu Jan 11 12:13:22 2018
@@ -36,7 +36,7 @@ under the License.
                 <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.png" global="true"/>-->
+                <!--<set field="layoutSettings.headerImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png" 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/ofbiz-framework/branches/release17.12/applications/marketing/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/widget/CommonScreens.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/widget/CommonScreens.xml Thu Jan 11 12:13:22 2018
@@ -33,7 +33,7 @@ under the License.
                 <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.png" global="true"/>-->
+                <!--<set field="layoutSettings.headerImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png" 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/ofbiz-framework/branches/release17.12/applications/order/widget/ordermgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/order/widget/ordermgr/CommonScreens.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/order/widget/ordermgr/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/order/widget/ordermgr/CommonScreens.xml Thu Jan 11 12:13:22 2018
@@ -38,7 +38,7 @@ under the License.
                 <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.png" global="true"/>-->
+                <!--<set field="layoutSettings.headerImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png" 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/ofbiz-framework/branches/release17.12/applications/party/minilang/test/PartyTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/party/minilang/test/PartyTests.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/party/minilang/test/PartyTests.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/party/minilang/test/PartyTests.xml Thu Jan 11 12:13:22 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="http://ofbiz.apache.org/images/ofbiz_logo.png"/>
+        <set field="serviceCtx.logoImageUrl" value="/themes/common/webapp/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="http://ofbiz.apache.org/images/ofbiz_logo.png"/>
+            <if-compare field="partyGroup.logoImageUrl" operator="equals" value="/themes/common/webapp/images/ofbiz_logo.png"/>
         </assert>
         <check-errors/>
     </simple-method>

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/CommonScreens.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/CommonScreens.xml Thu Jan 11 12:13:22 2018
@@ -39,7 +39,7 @@ under the License.
                 <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.png" global="true"/>-->
+                <!--<set field="layoutSettings.headerImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png" global="true"/>-->
 
                 <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
                 <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/catalog/CommonScreens.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/catalog/CommonScreens.xml Thu Jan 11 12:13:22 2018
@@ -34,7 +34,7 @@ under the License.
                 <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.png" global="true"/>-->
+                <!--<set field="layoutSettings.headerImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png" 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/ofbiz-framework/branches/release17.12/applications/product/widget/facility/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/facility/CommonScreens.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/facility/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/widget/facility/CommonScreens.xml Thu Jan 11 12:13:22 2018
@@ -36,7 +36,7 @@ under the License.
                 <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.png" global="true"/>-->
+                <!--<set field="layoutSettings.headerImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png" 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/ofbiz-framework/branches/release17.12/applications/workeffort/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/widget/CommonScreens.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/widget/CommonScreens.xml Thu Jan 11 12:13:22 2018
@@ -37,7 +37,7 @@ under the License.
                 <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.png" global="true"/>-->
+                <!--<set field="layoutSettings.headerImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png" 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/ofbiz-framework/branches/release17.12/framework/webtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/webtools/widget/CommonScreens.xml?rev=1820867&r1=1820866&r2=1820867&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/webtools/widget/CommonScreens.xml Thu Jan 11 12:13:22 2018
@@ -33,7 +33,7 @@ under the License.
                 <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.png" global="true"/>-->
+                <!--<set field="layoutSettings.headerImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png" global="true"/>-->
                 <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
                 <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
                 <!-- Help link actions -->