OFBiz › OFBiz - Commits

svn commit: r1740464 - in /ofbiz/trunk: applications/party/template/party/ applications/party/template/security/ applications/party/template/visit/ applications/party/webapp/partymgr/party/ applications/party/webapp/partymgr/security/ applications/part...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Deepak Dixit-5

svn commit: r1740464 - in /ofbiz/trunk: applications/party/template/party/ applications/party/template/security/ applications/party/template/visit/ applications/party/webapp/partymgr/party/ applications/party/webapp/partymgr/security/ applications/part...

Author: deepak
Date: Fri Apr 22 08:33:46 2016
New Revision: 1740464

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

Added:
ofbiz/trunk/applications/party/template/party/
- copied from r1740441, ofbiz/trunk/applications/party/webapp/partymgr/party/
ofbiz/trunk/applications/party/template/security/
- copied from r1740441, ofbiz/trunk/applications/party/webapp/partymgr/security/
ofbiz/trunk/applications/party/template/visit/
- copied from r1740441, ofbiz/trunk/applications/party/webapp/partymgr/visit/
Removed:
ofbiz/trunk/applications/party/webapp/partymgr/party/
ofbiz/trunk/applications/party/webapp/partymgr/security/
ofbiz/trunk/applications/party/webapp/partymgr/visit/
Modified:
ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml

Modified: ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml?rev=1740464&r1=1740463&r2=1740464&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml Fri Apr 22 08:33:46 2016
@@ -27,7 +27,7 @@ under the License.
<set field="title" value="${uiLabelMap.PartyNotificationMailCreate}"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://party/templates/email/CreatePartyNotification.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://party/template/email/CreatePartyNotification.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -38,7 +38,7 @@ under the License.
<set field="title" value="${uiLabelMap.PartyNotificationMailChange}"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://party/templates/email/ChangePersonalInfoNotification.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://party/template/email/ChangePersonalInfoNotification.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -49,7 +49,7 @@ under the License.
<set field="title" value="${uiLabelMap.PartyNotificationMailVerification}"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://party/templates/email/VerifyEmailAddressNotification.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://party/template/email/VerifyEmailAddressNotification.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -60,7 +60,7 @@ under the License.
<set field="title" value="${uiLabelMap.PartyNotificationMailActivated}"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://party/templates/email/AccountActivatedNotification.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://party/template/email/AccountActivatedNotification.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1740464&r1=1740463&r2=1740464&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri Apr 22 08:33:46 2016
@@ -406,7 +406,7 @@ under the License.
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://party/webapp/partymgr/party/editShoppingList.ftl"/></html>
+ <html><html-template location="component://party/template/party/editShoppingList.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -453,7 +453,7 @@ under the License.
<platform-specific>
<html>
<html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/>
- <html-template location="component://party/webapp/partymgr/party/editcontactmech.ftl"/>
+ <html-template location="component://party/template/party/editcontactmech.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -813,7 +813,7 @@ under the License.
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://party/webapp/partymgr/party/addressMatchMap.ftl"/></html>
+ <html><html-template location="component://party/template/party/addressMatchMap.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -832,7 +832,7 @@ under the License.
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://party/webapp/partymgr/party/findMatches.ftl"/></html>
+ <html><html-template location="component://party/template/party/findMatches.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -1184,7 +1184,7 @@ under the License.
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://party/webapp/partymgr/party/editGeoLocation.ftl"/></html>
+ <html><html-template location="component://party/template/party/editGeoLocation.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -1197,7 +1197,7 @@ under the License.
<set field="title" value="${uiLabelMap.MyPortalCustRequestNotificationMailCreation}"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://party/templates/email/CreatePartyNotification.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://party/template/email/CreatePartyNotification.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -1272,7 +1272,7 @@ under the License.
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/contactmechtemplates/${postalAddressTemplate}"/>
+ <html-template location="component://party/template/party/contactmechtemplates/${postalAddressTemplate}"/>
</html>
</platform-specific>
</widgets>
@@ -1283,13 +1283,13 @@ under the License.
<actions>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<set field="postalAddressTemplateSuffix" value=".fo.ftl"/>
- <set field="addressTemplatePath" value="${sys:getProperty('ofbiz.home')}/applications/party/webapp/partymgr/party/contactmechtemplates/"/>
+ <set field="addressTemplatePath" value="${sys:getProperty('ofbiz.home')}/applications/party/template/party/contactmechtemplates/"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy"/>
</actions>
<widgets>
<platform-specific>
<xsl-fo>
- <html-template location="component://party/webapp/partymgr/party/contactmechtemplates/${postalAddressTemplate}"/>
+ <html-template location="component://party/template/party/contactmechtemplates/${postalAddressTemplate}"/>
</xsl-fo>
</platform-specific>
</widgets>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml?rev=1740464&r1=1740463&r2=1740464&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml Fri Apr 22 08:33:46 2016
@@ -69,7 +69,7 @@ under the License.
<decorator-screen name="PaymentMethodDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://party/webapp/partymgr/party/editcreditcard.ftl"/></html>
+ <html><html-template location="component://party/template/party/editcreditcard.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -89,7 +89,7 @@ under the License.
<decorator-screen name="PaymentMethodDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://party/webapp/partymgr/party/editgiftcard.ftl"/></html>
+ <html><html-template location="component://party/template/party/editgiftcard.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -109,7 +109,7 @@ under the License.
<decorator-screen name="PaymentMethodDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://party/webapp/partymgr/party/editeftaccount.ftl"/></html>
+ <html><html-template location="component://party/template/party/editeftaccount.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>

Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=1740464&r1=1740463&r2=1740464&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Fri Apr 22 08:33:46 2016
@@ -142,7 +142,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/Contact.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/Contact.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -174,7 +174,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/PaymentMethods.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -194,7 +194,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/Attributes.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/Attributes.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -214,7 +214,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/AvsSettings.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/AvsSettings.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -229,7 +229,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/Cart.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/Cart.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -245,7 +245,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/LoyaltyPoints.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -265,7 +265,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/UserLogin.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/UserLogin.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -286,7 +286,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/Visits.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/Visits.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -338,7 +338,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/FinAccounts.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/FinAccounts.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -379,7 +379,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/SerializedInventory.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -436,7 +436,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/Content.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/Content.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -456,7 +456,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/ContentList.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/ContentList.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -476,7 +476,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/Notes.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/Notes.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -590,7 +590,7 @@
<service service-name="getWorkEffortAssignedTasks"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://party/webapp/partymgr/party/profileblocks/mytasks.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://party/template/party/profileblocks/mytasks.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -626,7 +626,7 @@
<widgets>
<platform-specific>
<html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/ProductStores.ftl"/>
+ <html-template location="component://party/template/party/profileblocks/ProductStores.ftl"/>
</html>
</platform-specific>
</widgets>

Modified: ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml?rev=1740464&r1=1740463&r2=1740464&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml Fri Apr 22 08:33:46 2016
@@ -107,7 +107,7 @@ under the License.
</condition>
<widgets>
<platform-specific>
- <html><html-template location="component://party/webapp/partymgr/visit/visitdetail.ftl"/></html>
+ <html><html-template location="component://party/template/visit/visitdetail.ftl"/></html>
</platform-specific>
</widgets>
<fail-widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1740464&r1=1740463&r2=1740464&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Fri Apr 22 08:33:46 2016
@@ -710,7 +710,7 @@ under the License.
</condition>
<widgets>
<platform-specific>
- <html><html-template location="component://party/webapp/partymgr/party/editcontactmech.ftl"/></html>
+ <html><html-template location="component://party/template/party/editcontactmech.ftl"/></html>
</platform-specific>
</widgets>
<fail-widgets>
@@ -839,7 +839,7 @@ under the License.
</condition>
<widgets>
<platform-specific>
- <html><html-template location="component://party/webapp/partymgr/visit/showvisits.ftl"/></html>
+ <html><html-template location="component://party/template/visit/showvisits.ftl"/></html>
</platform-specific>
</widgets>
<fail-widgets>
@@ -870,7 +870,7 @@ under the License.
</condition>
<widgets>
<platform-specific>
- <html><html-template location="component://party/webapp/partymgr/visit/visitdetail.ftl"/></html>
+ <html><html-template location="component://party/template/visit/visitdetail.ftl"/></html>
</platform-specific>
</widgets>
<fail-widgets>