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 2016/05/05 18:11:55 UTC
svn commit: r1742457 - in /ofbiz/trunk: applications/content/data/
applications/content/template/ applications/content/template/cms/
applications/content/template/content/ applications/content/template/email/
applications/content/template/layout/ appli...
Author: deepak
Date: Thu May 5 18:11:54 2016
New Revision: 1742457
URL: http://svn.apache.org/viewvc?rev=1742457&view=rev
Log:
(OFBIZ-7021) Renamed content component ftl file name from lower case to upper case pattern.
Added:
ofbiz/trunk/applications/content/template/Dummy.ftl
- copied unchanged from r1742455, ofbiz/trunk/applications/content/template/dummy.ftl
ofbiz/trunk/applications/content/template/Fonts.fo.ftl
- copied unchanged from r1742455, ofbiz/trunk/applications/content/template/fonts.fo.ftl
ofbiz/trunk/applications/content/template/cms/AddSubSite.ftl
- copied unchanged from r1742455, ofbiz/trunk/applications/content/template/cms/addSubSite.ftl
ofbiz/trunk/applications/content/template/content/Nav.ftl
- copied unchanged from r1742455, ofbiz/trunk/applications/content/template/content/nav.ftl
ofbiz/trunk/applications/content/template/email/ServiceNotification.ftl
- copied unchanged from r1742455, ofbiz/trunk/applications/content/template/email/servicenotification.ftl
ofbiz/trunk/applications/content/template/layout/RenderSubContent.ftl
- copied unchanged from r1742455, ofbiz/trunk/applications/content/template/layout/renderSubContent.ftl
ofbiz/trunk/applications/content/template/mime-type/Flash-flv.ftl
- copied unchanged from r1742455, ofbiz/trunk/applications/content/template/mime-type/flash-flv.ftl
ofbiz/trunk/applications/content/template/mime-type/Flash-swf.ftl
- copied unchanged from r1742455, ofbiz/trunk/applications/content/template/mime-type/flash-swf.ftl
ofbiz/trunk/applications/content/template/mime-type/Image.ftl
- copied unchanged from r1742455, ofbiz/trunk/applications/content/template/mime-type/image.ftl
ofbiz/trunk/applications/content/template/mime-type/QuickTime.ftl
- copied unchanged from r1742455, ofbiz/trunk/applications/content/template/mime-type/quicktime.ftl
ofbiz/trunk/applications/content/template/survey/GenericSurvey.ftl
- copied unchanged from r1742455, ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl
Removed:
ofbiz/trunk/applications/content/template/cms/addSubSite.ftl
ofbiz/trunk/applications/content/template/content/nav.ftl
ofbiz/trunk/applications/content/template/dummy.ftl
ofbiz/trunk/applications/content/template/email/servicenotification.ftl
ofbiz/trunk/applications/content/template/fonts.fo.ftl
ofbiz/trunk/applications/content/template/layout/renderSubContent.ftl
ofbiz/trunk/applications/content/template/mime-type/flash-flv.ftl
ofbiz/trunk/applications/content/template/mime-type/flash-swf.ftl
ofbiz/trunk/applications/content/template/mime-type/image.ftl
ofbiz/trunk/applications/content/template/mime-type/quicktime.ftl
ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl
Modified:
ofbiz/trunk/applications/content/data/MimeTypeTemplate.xml
ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy
ofbiz/trunk/applications/content/widget/CommonScreens.xml
ofbiz/trunk/applications/content/widget/EmailScreens.xml
ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoFinAccount.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml
Modified: ofbiz/trunk/applications/content/data/MimeTypeTemplate.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/MimeTypeTemplate.xml?rev=1742457&r1=1742456&r2=1742457&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/MimeTypeTemplate.xml (original)
+++ ofbiz/trunk/applications/content/data/MimeTypeTemplate.xml Thu May 5 18:11:54 2016
@@ -20,17 +20,17 @@
<entity-engine-xml>
<!-- application templates -->
- <MimeTypeHtmlTemplate mimeTypeId="application/x-shockwave-flash" templateLocation="component://content/template/mime-type/flash-swf.ftl"/>
+ <MimeTypeHtmlTemplate mimeTypeId="application/x-shockwave-flash" templateLocation="component://content/template/mime-type/Flash-swf.ftl"/>
<!-- image template -->
- <MimeTypeHtmlTemplate mimeTypeId="image/jpeg" templateLocation="component://content/template/mime-type/image.ftl"/>
- <MimeTypeHtmlTemplate mimeTypeId="image/pjpeg" templateLocation="component://content/template/mime-type/image.ftl"/>
- <MimeTypeHtmlTemplate mimeTypeId="image/gif" templateLocation="component://content/template/mime-type/image.ftl"/>
- <MimeTypeHtmlTemplate mimeTypeId="image/tiff" templateLocation="component://content/template/mime-type/image.ftl"/>
- <MimeTypeHtmlTemplate mimeTypeId="image/png" templateLocation="component://content/template/mime-type/image.ftl"/>
+ <MimeTypeHtmlTemplate mimeTypeId="image/jpeg" templateLocation="component://content/template/mime-type/Image.ftl"/>
+ <MimeTypeHtmlTemplate mimeTypeId="image/pjpeg" templateLocation="component://content/template/mime-type/Image.ftl"/>
+ <MimeTypeHtmlTemplate mimeTypeId="image/gif" templateLocation="component://content/template/mime-type/Image.ftl"/>
+ <MimeTypeHtmlTemplate mimeTypeId="image/tiff" templateLocation="component://content/template/mime-type/Image.ftl"/>
+ <MimeTypeHtmlTemplate mimeTypeId="image/png" templateLocation="component://content/template/mime-type/Image.ftl"/>
<!-- video templates -->
- <MimeTypeHtmlTemplate mimeTypeId="video/quicktime" templateLocation="component://content/template/mime-type/quicktime.ftl"/>
- <MimeTypeHtmlTemplate mimeTypeId="video/mp4" templateLocation="component://content/template/mime-type/quicktime.ftl"/>
- <MimeTypeHtmlTemplate mimeTypeId="video/x-flv" templateLocation="component://content/template/mime-type/flash-flv.ftl"/>
+ <MimeTypeHtmlTemplate mimeTypeId="video/quicktime" templateLocation="component://content/template/mime-type/QuickTime.ftl"/>
+ <MimeTypeHtmlTemplate mimeTypeId="video/mp4" templateLocation="component://content/template/mime-type/QuickTime.ftl"/>
+ <MimeTypeHtmlTemplate mimeTypeId="video/x-flv" templateLocation="component://content/template/mime-type/Flash-flv.ftl"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy?rev=1742457&r1=1742456&r2=1742457&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy Thu May 5 18:11:54 2016
@@ -32,7 +32,7 @@ if (!surveyId && surveyResponseId) {
surveyWrapper = new SurveyWrapper(delegator, surveyResponseId, partyId, surveyId, null);
surveyWrapper.setEdit(true);
-templateUrl = UtilURL.fromOfbizHomePath("applications/content/template/survey/genericsurvey.ftl");
+templateUrl = UtilURL.fromOfbizHomePath("applications/content/template/survey/GenericSurvey.ftl");
if (templateUrl) {
writer = new StringWriter();
surveyWrapper.render(templateUrl, writer);
Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=1742457&r1=1742456&r2=1742457&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Thu May 5 18:11:54 2016
@@ -496,7 +496,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://content/template/fonts.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://content/template/Fonts.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
Modified: ofbiz/trunk/applications/content/widget/EmailScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/EmailScreens.xml?rev=1742457&r1=1742456&r2=1742457&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/EmailScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/EmailScreens.xml Thu May 5 18:11:54 2016
@@ -24,7 +24,7 @@
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://content/template/email/servicenotification.ftl"/></html>
+ <html><html-template location="component://content/template/email/ServiceNotification.ftl"/></html>
</platform-specific>
</widgets>
</section>
Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=1742457&r1=1742456&r2=1742457&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Thu May 5 18:11:54 2016
@@ -205,7 +205,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleSearchContent}">
<platform-specific>
- <html><html-template location="component://content/template/cms/addSubSite.ftl"/></html>
+ <html><html-template location="component://content/template/cms/AddSubSite.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=1742457&r1=1742456&r2=1742457&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Thu May 5 18:11:54 2016
@@ -1231,7 +1231,7 @@ under the License.
<decorator-section name="body">
<platform-specific>
<html>
- <html-template location="component://content/template/dummy.ftl"/>
+ <html-template location="component://content/template/Dummy.ftl"/>
</html>
</platform-specific>
</decorator-section>
Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=1742457&r1=1742456&r2=1742457&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Thu May 5 18:11:54 2016
@@ -109,7 +109,7 @@ under the License.
<widgets>
<platform-specific>
<html>
- <html-template location="component://content/template/content/nav.ftl"/>
+ <html-template location="component://content/template/content/Nav.ftl"/>
</html>
</platform-specific>
</widgets>
Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=1742457&r1=1742456&r2=1742457&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Thu May 5 18:11:54 2016
@@ -107,7 +107,7 @@ under the License.
<parameter param-name="contentId" from-field="currentValue.contentId"/>
</link>
<platform-specific>
- <html><html-template location="component://content/template/layout/renderSubContent.ftl"/></html>
+ <html><html-template location="component://content/template/layout/RenderSubContent.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoFinAccount.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoFinAccount.xml?rev=1742457&r1=1742456&r2=1742457&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoFinAccount.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoFinAccount.xml Thu May 5 18:11:54 2016
@@ -80,7 +80,7 @@
<ProductFeatureAppl productId="FA-001-O" productFeatureId="2104" productFeatureApplTypeId="STANDARD_FEATURE" fromDate="2003-11-20 13:51:53.35" sequenceNum="2"/>
<!-- survey appl -->
- <ProductStoreSurveyAppl productStoreSurveyId="1100" productStoreId="9000" surveyApplTypeId="CART_ADD" surveyId="1100" productId="FA-001" fromDate="2003-11-24 16:00:02.467" surveyTemplate="/applications/content/template/survey/genericsurvey.ftl" lastUpdatedStamp="2003-12-04 21:40:23.27" lastUpdatedTxStamp="2003-12-04 21:40:20.607"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="1100" productStoreId="9000" surveyApplTypeId="CART_ADD" surveyId="1100" productId="FA-001" fromDate="2003-11-24 16:00:02.467" surveyTemplate="/applications/content/template/survey/GenericSurvey.ftl" lastUpdatedStamp="2003-12-04 21:40:23.27" lastUpdatedTxStamp="2003-12-04 21:40:20.607"/>
<!-- fulfillment service -->
<Content contentId="FA_ACTIVATION" customMethodId="FIN_PURCH_OFBIZ"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml?rev=1742457&r1=1742456&r2=1742457&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml Thu May 5 18:11:54 2016
@@ -104,9 +104,9 @@ under the License.
<SurveyQuestionOption surveyQuestionId="1041" surveyOptionSeqId="00001" description="Right Hand" sequenceNum="1"/>
<SurveyQuestionOption surveyQuestionId="1041" surveyOptionSeqId="00002" description="Left Hand" sequenceNum="2"/>
- <ProductStoreSurveyAppl productStoreSurveyId="1000" productStoreId="9000" surveyApplTypeId="CART_ADD" surveyId="1000" productCategoryId="GC-101" fromDate="2003-11-24 16:00:02.467" surveyTemplate="component://content/template/survey/genericsurvey.ftl"/>
- <ProductStoreSurveyAppl productStoreSurveyId="1001" productStoreId="9000" surveyApplTypeId="CART_ADD" surveyId="1001" productCategoryId="GC-102" fromDate="2003-11-24 16:00:51.693" surveyTemplate="component://content/template/survey/genericsurvey.ftl"/>
- <ProductStoreSurveyAppl productStoreSurveyId="1002" productStoreId="9000" surveyApplTypeId="CUSTOMER_PROFILE" surveyId="1002" fromDate="2003-12-05 19:22:40.925" surveyTemplate="component://content/template/survey/genericsurvey.ftl" resultTemplate="component://ecommerce/template/survey/genericresult.ftl" sequenceNum="1"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="1000" productStoreId="9000" surveyApplTypeId="CART_ADD" surveyId="1000" productCategoryId="GC-101" fromDate="2003-11-24 16:00:02.467" surveyTemplate="component://content/template/survey/GenericSurvey.ftl"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="1001" productStoreId="9000" surveyApplTypeId="CART_ADD" surveyId="1001" productCategoryId="GC-102" fromDate="2003-11-24 16:00:51.693" surveyTemplate="component://content/template/survey/GenericSurvey.ftl"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="1002" productStoreId="9000" surveyApplTypeId="CUSTOMER_PROFILE" surveyId="1002" fromDate="2003-12-05 19:22:40.925" surveyTemplate="component://content/template/survey/GenericSurvey.ftl" resultTemplate="component://ecommerce/template/survey/genericresult.ftl" sequenceNum="1"/>
<ProductStoreSurveyAppl productStoreSurveyId="1003" productStoreId="9000" surveyApplTypeId="RANDOM_POLL" groupName="testSurveyGroup" surveyId="1003" fromDate="2003-12-05 19:22:40.925" surveyTemplate="component://ecommerce/template/survey/minisurvey.ftl" resultTemplate="component://ecommerce/template/survey/miniresult.ftl" sequenceNum="1"/>
<ProductStoreSurveyAppl productStoreSurveyId="1004" productStoreId="9000" surveyApplTypeId="RANDOM_POLL" groupName="testSurveyGroup" surveyId="1004" fromDate="2003-12-05 19:22:40.925" surveyTemplate="component://ecommerce/template/survey/minisurvey.ftl" resultTemplate="component://ecommerce/template/survey/miniresult.ftl" sequenceNum="1"/>
</entity-engine-xml>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml?rev=1742457&r1=1742456&r2=1742457&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml Thu May 5 18:11:54 2016
@@ -40,14 +40,14 @@ under the License.
<SurveyQuestionCategory surveyQuestionCategoryId="2001" description="Mini Cart section questions "/>
<SurveyQuestionCategory surveyQuestionCategoryId="2101" description="Show Cart functionality questions "/>
- <ProductStoreSurveyAppl productStoreSurveyId="1401" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1401" surveyTemplate="/applications/content/template/survey/genericsurvey.ftl"/>
- <ProductStoreSurveyAppl productStoreSurveyId="1501" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1501" surveyTemplate="/applications/content/template/survey/genericsurvey.ftl"/>
- <ProductStoreSurveyAppl productStoreSurveyId="1601" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1601" surveyTemplate="/applications/content/template/survey/genericsurvey.ftl"/>
- <ProductStoreSurveyAppl productStoreSurveyId="1701" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1701" surveyTemplate="/applications/content/template/survey/genericsurvey.ftl"/>
- <ProductStoreSurveyAppl productStoreSurveyId="1801" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1801" surveyTemplate="/applications/content/template/survey/genericsurvey.ftl"/>
- <ProductStoreSurveyAppl productStoreSurveyId="1901" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1901" surveyTemplate="/applications/content/template/survey/genericsurvey.ftl"/>
- <ProductStoreSurveyAppl productStoreSurveyId="2001" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="2001" surveyTemplate="/applications/content/template/survey/genericsurvey.ftl"/>
- <ProductStoreSurveyAppl productStoreSurveyId="2101" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="2101" surveyTemplate="/applications/content/template/survey/genericsurvey.ftl"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="1401" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1401" surveyTemplate="/applications/content/template/survey/GenericSurvey.ftl"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="1501" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1501" surveyTemplate="/applications/content/template/survey/GenericSurvey.ftl"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="1601" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1601" surveyTemplate="/applications/content/template/survey/GenericSurvey.ftl"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="1701" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1701" surveyTemplate="/applications/content/template/survey/GenericSurvey.ftl"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="1801" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1801" surveyTemplate="/applications/content/template/survey/GenericSurvey.ftl"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="1901" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="1901" surveyTemplate="/applications/content/template/survey/GenericSurvey.ftl"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="2001" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="2001" surveyTemplate="/applications/content/template/survey/GenericSurvey.ftl"/>
+ <ProductStoreSurveyAppl productStoreSurveyId="2101" productStoreId="9000" surveyApplTypeId="TEST_SURVEY" surveyId="2101" surveyTemplate="/applications/content/template/survey/GenericSurvey.ftl"/>
<!--CHECKOUT PAGE-->
<SurveyQuestion surveyQuestionId="1401" surveyQuestionCategoryId="1401" surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on the checkout link in minicart if the user is anonymous then page is displayed https://localhost:8443/ecommerce/control/checkoutoptions"/>