svn commit: r1740446 - in /ofbiz/trunk: applications/content/template/ applications/content/template/cms/ applications/content/template/content/ applications/content/template/contentsetup/ applications/content/template/layout/ applications/content/temp...

[Deepak Dixit-5]

Author: deepak
Date: Fri Apr 22 06:12:08 2016
New Revision: 1740446

URL: http://svn.apache.org/viewvc?rev=1740446&view=rev
Log:
(OFBIZ-6818) relocate .ftl files in the marketing component
Thanks Pierre for your contribution.

Added:
    ofbiz/trunk/applications/content/template/cms/
      - copied from r1740441, ofbiz/trunk/applications/content/webapp/content/cms/
    ofbiz/trunk/applications/content/template/content/
      - copied from r1740441, ofbiz/trunk/applications/content/webapp/content/content/
    ofbiz/trunk/applications/content/template/contentsetup/
      - copied from r1740441, ofbiz/trunk/applications/content/webapp/content/contentsetup/
    ofbiz/trunk/applications/content/template/dummy.ftl
      - copied unchanged from r1740441, ofbiz/trunk/applications/content/webapp/content/dummy.ftl
    ofbiz/trunk/applications/content/template/fonts.fo.ftl
      - copied unchanged from r1740441, ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl
    ofbiz/trunk/applications/content/template/layout/
      - copied from r1740441, ofbiz/trunk/applications/content/webapp/content/layout/
    ofbiz/trunk/applications/content/template/lookup/
      - copied from r1740441, ofbiz/trunk/applications/content/webapp/content/lookup/
    ofbiz/trunk/applications/content/template/survey/EditSurveyQuestions.ftl
      - copied unchanged from r1740441, ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
    ofbiz/trunk/applications/content/template/survey/EditSurveyResponse.ftl
      - copied unchanged from r1740441, ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl
    ofbiz/trunk/applications/content/template/survey/ViewSurveyResponses.ftl
      - copied unchanged from r1740441, ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
    ofbiz/trunk/applications/content/template/website/
      - copied from r1740441, ofbiz/trunk/applications/content/webapp/content/website/
Removed:
    ofbiz/trunk/applications/content/webapp/content/cms/
    ofbiz/trunk/applications/content/webapp/content/content/
    ofbiz/trunk/applications/content/webapp/content/contentsetup/
    ofbiz/trunk/applications/content/webapp/content/dummy.ftl
    ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl
    ofbiz/trunk/applications/content/webapp/content/layout/
    ofbiz/trunk/applications/content/webapp/content/lookup/
    ofbiz/trunk/applications/content/webapp/content/survey/
    ofbiz/trunk/applications/content/webapp/content/website/
Modified:
    ofbiz/trunk/applications/content/widget/CommonScreens.xml
    ofbiz/trunk/applications/content/widget/SurveyScreens.xml
    ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
    ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
    ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
    ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
    ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
    ofbiz/trunk/framework/common/widget/HelpScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml

Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=1740446&r1=1740445&r2=1740446&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Fri Apr 22 06:12:08 2016
@@ -496,7 +496,7 @@ under the License.
             </actions>
             <widgets>
                 <platform-specific>
-                    <xsl-fo><html-template location="component://content/webapp/content/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/SurveyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=1740446&r1=1740445&r2=1740446&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Fri Apr 22 06:12:08 2016
@@ -185,7 +185,7 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonSurveyDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://content/webapp/content/survey/EditSurveyQuestions.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://content/template/survey/EditSurveyQuestions.ftl"/></html></platform-specific>
 
                         <!-- This page is a bit of a mess, so will cleanup/modernize later...
                         <include-form name="ListSurveyQuestions" location="component://content/widget/survey/SurveyForms.xml"/>
@@ -270,7 +270,7 @@ under the License.
                                     </container>
                                 </widgets>
                             </section>
-                            <platform-specific><html><html-template location="component://content/webapp/content/survey/ViewSurveyResponses.ftl"/></html></platform-specific>
+                            <platform-specific><html><html-template location="component://content/template/survey/ViewSurveyResponses.ftl"/></html></platform-specific>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>
@@ -295,7 +295,7 @@ under the License.
                 <decorator-screen name="CommonSurveyDecorator">
                     <decorator-section name="body">
                         <container><label style="h1">${uiLabelMap.PageTitleEditSurveyResponse}, ${uiLabelMap.ContentSurveyResponse}: ${parameters.surveyResponseId}, ${uiLabelMap.ContentSurveySurveyId}: ${surveyId}</label></container>
-                        <platform-specific><html><html-template location="component://content/webapp/content/survey/EditSurveyResponse.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://content/template/survey/EditSurveyResponse.ftl"/></html></platform-specific>
                         <include-form name="BuildSurveyResponseFromPdf" location="component://content/widget/survey/SurveyForms.xml"/>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=1740446&r1=1740445&r2=1740446&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Fri Apr 22 06:12:08 2016
@@ -183,7 +183,7 @@ under the License.
         <section>
             <widgets>
                 <screenlet title="${uiLabelMap.PageTitleWebSiteCMSNav}">
-                    <platform-specific><html><html-template location="component://content/webapp/content/website/WebSiteCMSNav.ftl"/></html></platform-specific>
+                    <platform-specific><html><html-template location="component://content/template/website/WebSiteCMSNav.ftl"/></html></platform-specific>
                 </screenlet>
             </widgets>
         </section>
@@ -245,7 +245,7 @@ under the License.
                     <screenlet title="${uiLabelMap.PageTitleWebSiteCMSContent}">
                         <platform-specific>
                             <html>
-                                <html-template location="component://content/webapp/content/website/WebSiteCMSContent.ftl"/>
+                                <html-template location="component://content/template/website/WebSiteCMSContent.ftl"/>
                             </html>
                         </platform-specific>
                     </screenlet>
@@ -272,7 +272,7 @@ under the License.
             <widgets>
                 <platform-specific>
                     <html>
-                        <html-template location="component://content/webapp/content/website/WebSiteCMSEditor.ftl"/>
+                        <html-template location="component://content/template/website/WebSiteCMSEditor.ftl"/>
                     </html>
                 </platform-specific>
             </widgets>
@@ -294,7 +294,7 @@ under the License.
                     <screenlet title="${uiLabelMap.PageTitleWebSiteCMSContent}">
                         <platform-specific>
                             <html>
-                                <html-template location="component://content/webapp/content/website/WebSiteCMSMeta.ftl"/>
+                                <html-template location="component://content/template/website/WebSiteCMSMeta.ftl"/>
                             </html>
                         </platform-specific>
                     </screenlet>
@@ -321,7 +321,7 @@ under the License.
                     <screenlet title="${uiLabelMap.PageTitleWebSiteCMSContent}">
                         <platform-specific>
                             <html>
-                                <html-template location="component://content/webapp/content/website/WebSiteCMSPathAlias.ftl"/>
+                                <html-template location="component://content/template/website/WebSiteCMSPathAlias.ftl"/>
                             </html>
                         </platform-specific>
                     </screenlet>

Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=1740446&r1=1740445&r2=1740446&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Fri Apr 22 06:12:08 2016
@@ -81,7 +81,7 @@ under the License.
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleEditCMSContent}">
                             <platform-specific>
-                                <html><html-template location="component://content/webapp/content/cms/CMSContentEdit.ftl"/></html>
+                                <html><html-template location="component://content/template/cms/CMSContentEdit.ftl"/></html>
                             </platform-specific>
                         </screenlet>
                     </decorator-section>
@@ -185,7 +185,7 @@ under the License.
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.ContentCMSSearchPage}">
                             <platform-specific>
-                                <html><html-template location="component://content/webapp/content/cms/CMSSites.ftl"/></html>
+                                <html><html-template location="component://content/template/cms/CMSSites.ftl"/></html>
                             </platform-specific>
                         </screenlet>
                     </decorator-section>
@@ -205,7 +205,7 @@ under the License.
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleSearchContent}">
                             <platform-specific>
-                                <html><html-template location="component://content/webapp/content/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=1740446&r1=1740445&r2=1740446&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Fri Apr 22 06:12:08 2016
@@ -1231,7 +1231,7 @@ under the License.
                     <decorator-section name="body">
                         <platform-specific>
                             <html>
-                                <html-template location="component://content/webapp/content/dummy.ftl"/>
+                                <html-template location="component://content/template/dummy.ftl"/>
                             </html>
                         </platform-specific>
                     </decorator-section>

Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=1740446&r1=1740445&r2=1740446&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Fri Apr 22 06:12:08 2016
@@ -124,7 +124,7 @@ under the License.
             <widgets>
                 <platform-specific>
                     <html>
-                        <html-template location="component://content/webapp/content/content/ContentNav.ftl"/>
+                        <html-template location="component://content/template/content/ContentNav.ftl"/>
                     </html>
                 </platform-specific>
             </widgets>
@@ -162,7 +162,7 @@ under the License.
 <!--                <include-form name="ListDocument" location="component://content/widget/content/ContentForms.xml"/>-->
                 <platform-specific>
                     <html>
-                        <html-template location="component://content/webapp/content/lookup/ContentTreeLookupList.ftl"/>
+                        <html-template location="component://content/template/lookup/ContentTreeLookupList.ftl"/>
                     </html>
                 </platform-specific>
             </widgets>
@@ -202,7 +202,7 @@ under the License.
             <widgets>
                 <platform-specific>
                     <html>
-                        <html-template location="component://content/webapp/content/content/EditContentTree.ftl"/>
+                        <html-template location="component://content/template/content/EditContentTree.ftl"/>
                     </html>
                 </platform-specific>
             </widgets>
@@ -481,7 +481,7 @@ under the License.
                 <container id="Document">
                     <platform-specific>
                         <html>
-                            <html-template location="component://content/webapp/content/lookup/ContentTreeLookupList.ftl"/>
+                            <html-template location="component://content/template/lookup/ContentTreeLookupList.ftl"/>
                         </html>
                     </platform-specific>
                 </container>
@@ -511,7 +511,7 @@ under the License.
                                     <container style="left-border">
                                         <platform-specific>
                                             <html>
-                                                <html-template location="component://content/webapp/content/content/ContentNav.ftl"/>
+                                                <html-template location="component://content/template/content/ContentNav.ftl"/>
                                             </html>
                                         </platform-specific>
                                     </container>
@@ -549,7 +549,7 @@ under the License.
                                     <container style="left-border">
                                         <platform-specific>
                                             <html>
-                                                <html-template location="component://content/webapp/content/content/ContentNav.ftl"/>
+                                                <html-template location="component://content/template/content/ContentNav.ftl"/>
                                             </html>
                                         </platform-specific>
                                     </container>
@@ -608,7 +608,7 @@ under the License.
                 <decorator-screen name="contentDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                          <platform-specific>
-                              <html><html-template location="component://content/webapp/content/content/ContentSearchOptions.ftl"/></html>
+                              <html><html-template location="component://content/template/content/ContentSearchOptions.ftl"/></html>
                          </platform-specific>
                     </decorator-section>
                 </decorator-screen>
@@ -626,7 +626,7 @@ under the License.
                 <decorator-screen name="contentDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                          <platform-specific>
-                              <html><html-template location="component://content/webapp/content/content/ContentSearchResults.ftl"/></html>
+                              <html><html-template location="component://content/template/content/ContentSearchResults.ftl"/></html>
                          </platform-specific>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=1740446&r1=1740445&r2=1740446&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Fri Apr 22 06:12:08 2016
@@ -109,7 +109,7 @@ under the License.
             <widgets>
                 <platform-specific>
                     <html>
-                        <html-template location="component://content/webapp/content/content/nav.ftl"/>
+                        <html-template location="component://content/template/content/nav.ftl"/>
                     </html>
                 </platform-specific>
             </widgets>

Modified: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml?rev=1740446&r1=1740445&r2=1740446&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml Fri Apr 22 06:12:08 2016
@@ -156,7 +156,7 @@ under the License.
                     <decorator-section name="body">
                         <platform-specific>
                             <html>
-                                <html-template location="component://content/webapp/content/contentsetup/UserPermissions.ftl"/>
+                                <html-template location="component://content/template/contentsetup/UserPermissions.ftl"/>
                             </html>
                         </platform-specific>
                     </decorator-section>

Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=1740446&r1=1740445&r2=1740446&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Fri Apr 22 06:12:08 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/webapp/content/layout/renderSubContent.ftl"/></html>
+                                <html><html-template location="component://content/template/layout/renderSubContent.ftl"/></html>
                             </platform-specific>
                         </screenlet>
                     </decorator-section>

Modified: ofbiz/trunk/framework/common/widget/HelpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/HelpScreens.xml?rev=1740446&r1=1740445&r2=1740446&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/HelpScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/HelpScreens.xml Fri Apr 22 06:12:08 2016
@@ -196,7 +196,7 @@ under the License.
                                 <screenlet title="${uiLabelMap.PageTitleNavigateContent}" >
                                     <container style="left-border">
                                         <container id="EditDocumentTree"/>
-                                        <platform-specific><html><html-template location="component://content/webapp/content/content/DisplayContentNav.ftl"/></html></platform-specific>
+                                        <platform-specific><html><html-template location="component://content/template/content/DisplayContentNav.ftl"/></html></platform-specific>
                                     </container>
                                     <container style="leftonly">
                                         <include-screen name="showDocument"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml?rev=1740446&r1=1740445&r2=1740446&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml Fri Apr 22 06:12:08 2016
@@ -51,7 +51,7 @@ under the License.
                 <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.EcommerceSurveyResults}">
-                            <platform-specific><html><html-template location="component://content/webapp/content/survey/ViewSurveyResponses.ftl"/></html></platform-specific>
+                            <platform-specific><html><html-template location="˙template/survey/ViewSurveyResponses.ftl"/></html></platform-specific>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>