You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/10/18 18:40:58 UTC
svn commit: r1533546 - in /ofbiz/branches/release13.07: ./
applications/content/ofbiz-component.xml
applications/content/widget/CommonScreens.xml
specialpurpose/ecommerce/data/EcommerceTypeData.xml
Author: jleroux
Date: Fri Oct 18 16:40:58 2013
New Revision: 1533546
URL: http://svn.apache.org/r1533546
Log:
"Applied fix from trunk for revision: 1519245"
------------------------------------------------------------------------
r1519245 | jleroux | 2013-09-01 10:18:47 +0200 (dim. 01 sept. 2013) | 1 ligne
The path /content/images/ was used in some places (only for contentForum.css it seems) but no mount point was associated, here is a fix
------------------------------------------------------------------------
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/content/ofbiz-component.xml
ofbiz/branches/release13.07/applications/content/widget/CommonScreens.xml
ofbiz/branches/release13.07/specialpurpose/ecommerce/data/EcommerceTypeData.xml
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1519245
Modified: ofbiz/branches/release13.07/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/ofbiz-component.xml?rev=1533546&r1=1533545&r2=1533546&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/ofbiz-component.xml (original)
+++ ofbiz/branches/release13.07/applications/content/ofbiz-component.xml Fri Oct 18 16:40:58 2013
@@ -70,6 +70,13 @@ under the License.
location="webapp/content"
base-permission="CONTENTMGR"
mount-point="/content"/>
+
+ <webapp name="contentimages"
+ title="Content Images"
+ server="default-server"
+ location="webapp/content/images"
+ mount-point="/contentimages/"
+ app-bar-display="false"/>
<!--
<webapp name="ofbizhelp"
Modified: ofbiz/branches/release13.07/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/widget/CommonScreens.xml?rev=1533546&r1=1533545&r2=1533546&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release13.07/applications/content/widget/CommonScreens.xml Fri Oct 18 16:40:58 2013
@@ -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="/content/images/contentForum.css" global="true"/>
+ <set field="layoutSettings.styleSheets[]" value="/contentimages/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/release13.07/specialpurpose/ecommerce/data/EcommerceTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=1533546&r1=1533545&r2=1533546&view=diff
==============================================================================
--- ofbiz/branches/release13.07/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original)
+++ ofbiz/branches/release13.07/specialpurpose/ecommerce/data/EcommerceTypeData.xml Fri Oct 18 16:40:58 2013
@@ -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="/content/images/contentForum.css" sequenceId="03"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/contentimages/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"/>