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 2014/01/30 11:33:26 UTC
svn commit: r1562767 - in /ofbiz/trunk:
applications/content/ofbiz-component.xml
applications/content/widget/CommonScreens.xml
specialpurpose/cmssite/template/cms/HtmlHead.ftl
specialpurpose/ecommerce/data/EcommerceTypeData.xml
Author: jleroux
Date: Thu Jan 30 10:33:26 2014
New Revision: 1562767
URL: http://svn.apache.org/r1562767
Log:
Closes https://issues.apache.org/jira/browse/OFBIZ-5521 as not a problem
It was my bad, I was simply stupid on this, reverts r1519245
Modified:
ofbiz/trunk/applications/content/ofbiz-component.xml
ofbiz/trunk/applications/content/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl
ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml
Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=1562767&r1=1562766&r2=1562767&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Thu Jan 30 10:33:26 2014
@@ -70,12 +70,5 @@ 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"/>
</ofbiz-component>
Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=1562767&r1=1562766&r2=1562767&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Thu Jan 30 10:33:26 2014
@@ -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/images/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/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=1562767&r1=1562766&r2=1562767&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Thu Jan 30 10:33:26 2014
@@ -32,7 +32,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/images/contentForum.css" type="text/css"/>
<meta name="description" content="${(decoratedContent.subcontent.metaDescription.render)!}"/>
<meta name="keywords" content="${(decoratedContent.subcontent.metaKeywords.render)!}"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=1562767&r1=1562766&r2=1562767&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/EcommerceTypeData.xml Thu Jan 30 10:33:26 2014
@@ -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/images/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"/>