You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/10/05 18:26:49 UTC

svn commit: r1811222 - in /ofbiz/ofbiz-plugins/trunk: cmssite/data/CmsMultiSiteDemoData.xml cmssite/template/cms/HtmlHead.ftl ecommerce/data/EcommerceTypeData.xml ecommerce/widget/Theme.xml

Author: deepak
Date: Thu Oct  5 18:26:49 2017
New Revision: 1811222

URL: http://svn.apache.org/viewvc?rev=1811222&view=rev
Log:
Improved: Updated ecommain.css reference, as its moved from common theme to ecommerce (OFBIZ-9771)

Modified:
    ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsMultiSiteDemoData.xml
    ofbiz/ofbiz-plugins/trunk/cmssite/template/cms/HtmlHead.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml
    ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml

Modified: ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsMultiSiteDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsMultiSiteDemoData.xml?rev=1811222&r1=1811221&r2=1811222&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsMultiSiteDemoData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsMultiSiteDemoData.xml Thu Oct  5 18:26:49 2017
@@ -27,7 +27,7 @@
                 <link rel="shortcut icon" href="/images/ofbiz.ico" />
                 <script language="javascript" src="/common/js/util/fieldlookup.js" type="text/javascript"></script>
                 <script language="javascript" src="/common/js/util/OfbizUtil.js" type="text/javascript"></script>
-                <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/>
+                <link rel="stylesheet" href="/ecommerce/images/ecommain.css" type="text/css"/>
                 <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
                 <link rel="stylesheet" href="/contentimages/css/contentForum.css" type="text/css"/>
                 <meta name="description" content="${(decoratedContent.subcontent.metaDescription.render)!}"/>
@@ -107,8 +107,8 @@
                 <title>${(decoratedContent.subcontent.title.render)!"WebSite 2 Generic Title (Set subcontent 'title' on your content!)"}</title>
                 <link rel="shortcut icon" href="/images/ofbiz.ico" />
                 <script language="javascript" src="/common/js/util/fieldlookup.js" type="text/javascript"></script>
-                <script language="javascript" src="/common/js/util/selectall.js" type="text/javascript"></script>
-                <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/>
+                <script language="javascript" src="/common/js/util/OfbizUtil.js" type="text/javascript"></script>
+                <link rel="stylesheet" href="/ecommerce/images/ecommain.css" type="text/css"/>
                 <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
                 <link rel="stylesheet" href="/contentimages/css/contentForum.css" type="text/css"/>
                 <meta name="description" content="${(decoratedContent.subcontent.metaDescription.render)!}"/>

Modified: ofbiz/ofbiz-plugins/trunk/cmssite/template/cms/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/cmssite/template/cms/HtmlHead.ftl?rev=1811222&r1=1811221&r2=1811222&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/cmssite/template/cms/HtmlHead.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/cmssite/template/cms/HtmlHead.ftl Thu Oct  5 18:26:49 2017
@@ -31,7 +31,7 @@ under the License.
     <link rel="shortcut icon" href="/images/ofbiz.ico" />
     <script language="javascript" src="/common/js/util/fieldlookup.js" type="text/javascript"></script>
     <script language="javascript" src="/common/js/util/OfbizUtil.js" type="text/javascript"></script>
-    <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/>
+    <link rel="stylesheet" href="/ecommerce/images/ecommain.css" type="text/css"/>
     <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
     <link rel="stylesheet" href="/contentimages/css/contentForum.css" type="text/css"/>
 

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml?rev=1811222&r1=1811221&r2=1811222&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml Thu Oct  5 18:26:49 2017
@@ -23,7 +23,7 @@ under the License.
     <VisualTheme visualThemeId="EC_DEFAULT" visualThemeSetId="ECOMMERCE" description="OFBiz Ecommerce Standard Floating Layout"/>
     <delete>
     <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="/ecommerce/images/ecommain.css" sequenceId="02"/>
     <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/contentimages/css/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"/>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml?rev=1811222&r1=1811221&r2=1811222&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml Thu Oct  5 18:26:49 2017
@@ -33,7 +33,7 @@ under the License.
     <theme-properties>
         <!--Css style-->
         <property name="VT_STYLESHEET['add']" value="/ecommerce/images/blog.css"/>
-        <property name="VT_STYLESHEET['add']" value="/images/ecommain.css"/>
+        <property name="VT_STYLESHEET['add']" value="/ecommerce/images/ecommain.css"/>
         <property name="VT_STYLESHEET['add']" value="/contentimages/css/contentForum.css"/>
         <!--header image -->
         <property name="VT_HDR_IMAGE_URL" value="/images/ofbiz_logo.gif"/>