OFBiz › OFBiz - Commits

svn commit: r1737969 - in /ofbiz/trunk/applications/marketing: template/ template/contact/ template/lead/ webapp/marketing/contact/ webapp/sfa/contact/ webapp/sfa/lead/ widget/ widget/sfa/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Deepak Dixit-5

svn commit: r1737969 - in /ofbiz/trunk/applications/marketing: template/ template/contact/ template/lead/ webapp/marketing/contact/ webapp/sfa/contact/ webapp/sfa/lead/ widget/ widget/sfa/

Author: deepak
Date: Wed Apr 6 11:47:19 2016
New Revision: 1737969

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

Added:
ofbiz/trunk/applications/marketing/template/
ofbiz/trunk/applications/marketing/template/contact/
- copied from r1737950, ofbiz/trunk/applications/marketing/webapp/marketing/contact/
ofbiz/trunk/applications/marketing/template/contact/mergeContacts.ftl
- copied unchanged from r1737950, ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
ofbiz/trunk/applications/marketing/template/lead/
- copied from r1737950, ofbiz/trunk/applications/marketing/webapp/sfa/lead/
Removed:
ofbiz/trunk/applications/marketing/webapp/marketing/contact/
ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
ofbiz/trunk/applications/marketing/webapp/sfa/lead/
Modified:
ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml

Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=1737969&r1=1737968&r2=1737969&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Wed Apr 6 11:47:19 2016
@@ -439,7 +439,7 @@ under the License.
<widgets>
<platform-specific>
<html>
- <html-template location="component://marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl"/>
+ <html-template location="component://marketing/template/contact/ContactCommunicationPreview.ftl"/>
</html>
</platform-specific>
</widgets>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml?rev=1737969&r1=1737968&r2=1737969&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml Wed Apr 6 11:47:19 2016
@@ -113,7 +113,7 @@ under the License.
</condition>
<widgets>
<platform-specific>
- <html><html-template location="component://marketing/webapp/sfa/contact/mergeContacts.ftl"/></html>
+ <html><html-template location="component://marketing/template/contact/mergeContacts.ftl"/></html>
</platform-specific>
</widgets>
<fail-widgets>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=1737969&r1=1737968&r2=1737969&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Wed Apr 6 11:47:19 2016
@@ -163,7 +163,7 @@ under the License.
</condition>
<widgets>
<platform-specific>
- <html><html-template location="component://marketing/webapp/sfa/lead/mergeLeads.ftl"/></html>
+ <html><html-template location="component://marketing/template/lead/mergeLeads.ftl"/></html>
</platform-specific>
</widgets>
<fail-widgets>