svn commit: r1736633 - in /ofbiz/branches/release15.12: ./ applications/content/widget/CommonScreens.xml specialpurpose/cmssite/template/cms/HtmlHead.ftl specialpurpose/ecommerce/data/EcommerceTypeData.xml

Author: jleroux
Date: Fri Mar 25 18:05:16 2016
New Revision: 1736633

URL: http://svn.apache.org/viewvc?rev=1736633&view=rev
Log:
"Applied fix from trunk for revision: 1736628"
------------------------------------------------------------------------
r1736628 | jleroux | 2016-03-25 19:02:16 +0100 (ven. 25 mars 2016) | 7 lignes

Fixes "Failed to load contentForum.css" - https://issues.apache.org/jira/browse/OFBIZ-6956

Got the following error when accessing ecommerce main page
"NetworkError: 404 Not Found - https://127.0.0.1:8443/contentimages/contentForum.css"

jleroux: contentimages webapp path was wrongly used there instead of simply content. I replaced all occurrences

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/content/widget/CommonScreens.xml
    ofbiz/branches/release15.12/specialpurpose/cmssite/template/cms/HtmlHead.ftl
    ofbiz/branches/release15.12/specialpurpose/ecommerce/data/EcommerceTypeData.xml

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 25 18:05:16 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628

Modified: ofbiz/branches/release15.12/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/widget/CommonScreens.xml?rev=1736633&r1=1736632&r2=1736633&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release15.12/applications/content/widget/CommonScreens.xml Fri Mar 25 18:05:16 2016
@@ -32,7 +32,7 @@ under the License.
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.ContentCompanyName" global="true"/>
                 <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ContentCompanySubtitle" global="true"/>
-                <set field="layoutSettings.styleSheets[]" value="/contentimages/contentForum.css" global="true"/>
+                <set field="layoutSettings.styleSheets[]" value="/content/contentForum.css" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
                 <set field="activeApp" value="contentmgr" global="true"/>
                 <set field="applicationMenuName" value="ContentAppBar" global="true"/>

Modified: ofbiz/branches/release15.12/specialpurpose/cmssite/template/cms/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=1736633&r1=1736632&r2=1736633&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original)
+++ ofbiz/branches/release15.12/specialpurpose/cmssite/template/cms/HtmlHead.ftl Fri Mar 25 18:05:16 2016
@@ -33,7 +33,7 @@ under the License.
     <script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
     <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/>
     <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
-    <link rel="stylesheet" href="/contentimages/contentForum.css" type="text/css"/>
+    <link rel="stylesheet" href="/content/contentForum.css" type="text/css"/>
 
     <meta name="description" content="${(decoratedContent.subcontent.metaDescription.render)!}"/>
     <meta name="keywords" content="${(decoratedContent.subcontent.metaKeywords.render)!}"/>

Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/data/EcommerceTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=1736633&r1=1736632&r2=1736633&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/data/EcommerceTypeData.xml Fri Mar 25 18:05:16 2016
@@ -23,7 +23,7 @@ under the License.
     <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"/>
     <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/ecommain.css" sequenceId="02"/>
-    <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/contentimages/contentForum.css" sequenceId="03"/>
+    <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/content/contentForum.css" sequenceId="03"/>
     <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="04"/>
     <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="05"/>
     <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/header.ftl" sequenceId="06"/>