svn commit: r1740497 - in /ofbiz/trunk: applications/accounting/widget
Locked
svn commit: r1740497 - in /ofbiz/trunk: applications/accounting/widget
 
|
Author: deepak
Date: Fri Apr 22 12:28:46 2016 New Revision: 1740497 URL: http://svn.apache.org/viewvc?rev=1740497&view=rev Log: (OFBIZ-6823) relocate .ftl files in the framework/common component Thanks Pierre for your contribution. Added: ofbiz/trunk/framework/common/template/changePassword.ftl - copied unchanged from r1740441, ofbiz/trunk/framework/common/webcommon/changePassword.ftl ofbiz/trunk/framework/common/template/error.fo.ftl - copied unchanged from r1740441, ofbiz/trunk/framework/common/webcommon/error.fo.ftl ofbiz/trunk/framework/common/template/forgotPassword.ftl - copied unchanged from r1740441, ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl ofbiz/trunk/framework/common/template/getSecurityQuestion.ftl - copied unchanged from r1740441, ofbiz/trunk/framework/common/webcommon/getSecurityQuestion.ftl ofbiz/trunk/framework/common/template/includes/ - copied from r1740441, ofbiz/trunk/framework/common/webcommon/includes/ ofbiz/trunk/framework/common/template/login.ftl - copied unchanged from r1740441, ofbiz/trunk/framework/common/webcommon/login.ftl ofbiz/trunk/framework/common/template/portal/ - copied from r1740441, ofbiz/trunk/framework/common/webcommon/portal/ ofbiz/trunk/framework/common/template/viewBlocked.ftl - copied unchanged from r1740441, ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl Removed: ofbiz/trunk/framework/common/webcommon/changePassword.ftl ofbiz/trunk/framework/common/webcommon/error.fo.ftl ofbiz/trunk/framework/common/webcommon/forgotPassword.ftl ofbiz/trunk/framework/common/webcommon/getSecurityQuestion.ftl ofbiz/trunk/framework/common/webcommon/includes/ ofbiz/trunk/framework/common/webcommon/login.ftl ofbiz/trunk/framework/common/webcommon/portal/ ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl Modified: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml ofbiz/trunk/applications/party/template/party/editGeoLocation.ftl ofbiz/trunk/applications/party/template/party/editShoppingList.ftl ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/framework/common/template/includes/commonMacros.ftl ofbiz/trunk/framework/common/template/includes/fo/start.fo.ftl ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/framework/common/widget/HelpScreens.xml ofbiz/trunk/framework/common/widget/LookupScreens.xml ofbiz/trunk/framework/common/widget/PortalPageScreens.xml ofbiz/trunk/framework/common/widget/SecurityScreens.xml ofbiz/trunk/framework/common/widget/flotScreens.xml ofbiz/trunk/framework/webtools/template/geo/GeoLocation.ftl ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMacros.ftl ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml ofbiz/trunk/framework/widget/config/freemarkerImports.properties ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml ofbiz/trunk/themes/bizznesstime/includes/header.ftl ofbiz/trunk/themes/bluelight/includes/header.ftl ofbiz/trunk/themes/bluelight/includes/messages.ftl ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml ofbiz/trunk/themes/flatgrey/includes/header.ftl ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Modified: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Fri Apr 22 12:28:46 2016 @@ -181,7 +181,7 @@ under the License. <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://common/webcommon/includes/setMultipleSelectJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setMultipleSelectJs.ftl"/></html></platform-specific> <section> <widgets> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml (original) +++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml Fri Apr 22 12:28:46 2016 @@ -62,7 +62,7 @@ <set field="selectedDependentOption" value="_none_"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> <screenlet title="${uiLabelMap.PartyCreateNewCustomer}"> <include-form name="NewCustomer" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/> </screenlet> Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml (original) +++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml Fri Apr 22 12:28:46 2016 @@ -57,7 +57,7 @@ <set field="selectedDependentOption" value="_none_"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> <screenlet title="${uiLabelMap.SetupCreateNewOrganization}"> <include-form name="NewOrganization" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/> </screenlet> Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Fri Apr 22 12:28:46 2016 @@ -100,7 +100,7 @@ under the License. <screenlet title="${uiLabelMap.PageTitleCreateAccount}"> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/> + <html-template location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/> </html> </platform-specific> <include-form name="NewAccount" location="component://marketing/widget/sfa/forms/AccountForms.xml"/> Modified: ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl (original) +++ ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl Fri Apr 22 12:28:46 2016 @@ -119,7 +119,7 @@ under the License. <#if paginateEcommerceStyle??> <@paginationControls/> <#else> - <#include "component://common/webcommon/includes/htmlTemplate.ftl"/> + <#include "component://common/template/includes/htmlTemplate.ftl"/> <#assign commonUrl = "category?category_id="+ (parameters.category_id!) + "&"/> <#--assign viewIndex = viewIndex - 1/--> <#assign viewIndexFirst = 0/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Fri Apr 22 12:28:46 2016 @@ -55,7 +55,7 @@ under the License. </container> </decorator-section> <decorator-section name="search-options"> - <platform-specific><html><html-template location="component://common/webcommon/includes/setMultipleSelectJsList.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setMultipleSelectJsList.ftl"/></html></platform-specific> <include-form name="FindRequests" location="component://order/widget/ordermgr/CustRequestForms.xml"/> </decorator-section> <decorator-section name="search-results"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Fri Apr 22 12:28:46 2016 @@ -196,7 +196,7 @@ under the License. <widgets> <decorator-screen name="CommonOrderCheckoutDecorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://common/webcommon/includes/setMultipleSelectJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setMultipleSelectJs.ftl"/></html></platform-specific> <platform-specific> <html><html-template location="component://order/template/entry/setAdditionalParty.ftl"/></html> </platform-specific> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Fri Apr 22 12:28:46 2016 @@ -260,7 +260,7 @@ under the License. <widgets> <decorator-screen name="CommonOrderViewDecorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://common/webcommon/includes/setMultipleSelectJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setMultipleSelectJs.ftl"/></html></platform-specific> <platform-specific> <html><html-template location="component://order/template/order/findOrders.ftl"/></html> </platform-specific> Modified: ofbiz/trunk/applications/party/template/party/editGeoLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/party/editGeoLocation.ftl?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/party/template/party/editGeoLocation.ftl (original) +++ ofbiz/trunk/applications/party/template/party/editGeoLocation.ftl Fri Apr 22 12:28:46 2016 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#include "component://common/webcommon/includes/GoogleGeoLocation.ftl"/> +<#include "component://common/template/includes/GoogleGeoLocation.ftl"/> <body onload="load()"> <center> Modified: ofbiz/trunk/applications/party/template/party/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/party/editShoppingList.ftl?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/party/template/party/editShoppingList.ftl (original) +++ ofbiz/trunk/applications/party/template/party/editShoppingList.ftl Fri Apr 22 12:28:46 2016 @@ -177,7 +177,7 @@ under the License. <div class="screenlet-body"> <#if shoppingListItemDatas?has_content> <#-- Pagination --> - <#include "component://common/webcommon/includes/htmlTemplate.ftl"/> + <#include "component://common/template/includes/htmlTemplate.ftl"/> <#assign commonUrl = "editShoppingList?partyId=" + partyId + "&shoppingListId="+(shoppingListId!)+"&"/> <#assign viewIndexFirst = 0/> <#assign viewIndexPrevious = viewIndex - 1/> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri Apr 22 12:28:46 2016 @@ -452,7 +452,7 @@ under the License. <widgets> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/> + <html-template location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/> <html-template location="component://party/template/party/editcontactmech.ftl"/> </html> </platform-specific> @@ -694,7 +694,7 @@ under the License. <set field="focusFieldName" value="NewUser_USER_PARTY_ID"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> <screenlet title="${uiLabelMap.PartyCreateNewCustomer}"> <include-form name="NewUser" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> @@ -739,7 +739,7 @@ under the License. <set field="selectedDependentOption" value="_none_"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> <screenlet title="${uiLabelMap.PartyCreateNewProspect}"> <include-form name="NewUser" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> @@ -784,7 +784,7 @@ under the License. <set field="selectedDependentOption" value="_none_"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> <screenlet title="${uiLabelMap.PartyCreateNewEmployee}"> <include-form name="NewUser" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Apr 22 12:28:46 2016 @@ -870,7 +870,7 @@ under the License. <decorator-section name="body"> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/> + <html-template location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/> <html-template location="component://product/template/facility/EditContactMech.ftl"/> </html> </platform-specific> Modified: ofbiz/trunk/framework/common/template/includes/commonMacros.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/commonMacros.ftl?rev=1740497&r1=1740441&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/common/template/includes/commonMacros.ftl (original) +++ ofbiz/trunk/framework/common/template/includes/commonMacros.ftl Fri Apr 22 12:28:46 2016 @@ -20,7 +20,7 @@ under the License. <#-- To use these macros in your template, insert the following line in your template file: -<#include "component://common/webcommon/includes/commonMacros.ftl"/> +<#include "component://common/template/includes/commonMacros.ftl"/> --> <#assign Modified: ofbiz/trunk/framework/common/template/includes/fo/start.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/fo/start.fo.ftl?rev=1740497&r1=1740441&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/common/template/includes/fo/start.fo.ftl (original) +++ ofbiz/trunk/framework/common/template/includes/fo/start.fo.ftl Fri Apr 22 12:28:46 2016 @@ -33,10 +33,10 @@ under the License. <#include pageMaster/> </#list> <#else> - <#include "component://common/webcommon/includes/fo/pm-11x17.fo.ftl"/> - <#include "component://common/webcommon/includes/fo/pm-iso216.fo.ftl"/> - <#include "component://common/webcommon/includes/fo/pm-legal.fo.ftl"/> - <#include "component://common/webcommon/includes/fo/pm-letter.fo.ftl"/> + <#include "component://common/template/includes/fo/pm-11x17.fo.ftl"/> + <#include "component://common/template/includes/fo/pm-iso216.fo.ftl"/> + <#include "component://common/template/includes/fo/pm-legal.fo.ftl"/> + <#include "component://common/template/includes/fo/pm-letter.fo.ftl"/> </#if> </fo:layout-master-set> <#assign masterReference = (layoutSettings.masterReference)?default("letter-portrait")/> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Fri Apr 22 12:28:46 2016 @@ -25,7 +25,7 @@ under the License. <screen name="states"> <section> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/states.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/states.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -35,7 +35,7 @@ under the License. <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/countries.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/countries.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -46,14 +46,14 @@ under the License. <script location="component://common/webcommon/WEB-INF/actions/includes/CcTypes.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/cctypes.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/cctypes.ftl"/></html></platform-specific> </widgets> </section> </screen> <screen name="ccmonths"> <section> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/ccmonths.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/ccmonths.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -63,7 +63,7 @@ under the License. <set field="thisDate" from-field="nowTimestamp"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/ccyears.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/ccyears.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -89,7 +89,7 @@ under the License. <screen name="genericLink"> <section> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/genericLink.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/genericLink.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -102,13 +102,13 @@ under the License. <widgets> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/htmlheader-for-ajax.ftl" /> + <html-template location="component://common/template/includes/htmlheader-for-ajax.ftl" /> </html> </platform-specific> <decorator-section-include name="body" /> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/htmlfooter-for-ajax.ftl" /> + <html-template location="component://common/template/includes/htmlfooter-for-ajax.ftl" /> </html> </platform-specific> </widgets> @@ -126,7 +126,7 @@ under the License. <decorator-screen name="AjaxGlobalDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://common/webcommon/includes/ajaxAutocompleteOptions.ftl" /></html> + <html><html-template location="component://common/template/includes/ajaxAutocompleteOptions.ftl" /></html> </platform-specific> </decorator-section> </decorator-screen> @@ -375,7 +375,7 @@ under the License. <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/> - <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/messages.ftl"/> + <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/template/includes/messages.ftl"/> </actions> <widgets> <section> @@ -383,7 +383,7 @@ under the License. <if-compare value="layer" operator="not-equals" field="parameters.presentation"/> </condition> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/lookup.ftl" /></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/lookup.ftl" /></html></platform-specific> </widgets> </section> <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific> @@ -412,7 +412,7 @@ under the License. <if-compare value="layer" operator="not-equals" field="parameters.presentation"/> </condition> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/lookupFooter.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/lookupFooter.ftl"/></html></platform-specific> </widgets> </section> </widgets> @@ -430,7 +430,7 @@ under the License. <decorator-section name="body"> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/ajaxAutocompleteOptions.ftl" /> + <html-template location="component://common/template/includes/ajaxAutocompleteOptions.ftl" /> </html> </platform-specific> </decorator-section> @@ -483,11 +483,11 @@ under the License. <widgets> <!-- render header --> <platform-specific> - <html><html-template location="component://common/webcommon/includes/simple.ftl"/></html> - <xsl-fo><html-template location="component://common/webcommon/includes/simple.fo.ftl"/></xsl-fo> - <xml><html-template location="component://common/webcommon/includes/minimal-decorator.ftl"/></xml> - <text><html-template location="component://common/webcommon/includes/minimal-decorator.ftl"/></text> - <csv><html-template location="component://common/webcommon/includes/minimal-decorator.ftl"/></csv> + <html><html-template location="component://common/template/includes/simple.ftl"/></html> + <xsl-fo><html-template location="component://common/template/includes/simple.fo.ftl"/></xsl-fo> + <xml><html-template location="component://common/template/includes/minimal-decorator.ftl"/></xml> + <text><html-template location="component://common/template/includes/minimal-decorator.ftl"/></text> + <csv><html-template location="component://common/template/includes/minimal-decorator.ftl"/></csv> </platform-specific> </widgets> </section> @@ -502,7 +502,7 @@ under the License. <property-to-field resource="fop.properties" field="defaultFontFamily" property="fop.font.family" default="NotoSans"/> </actions> <widgets> - <platform-specific><xsl-fo><html-template location="component://common/webcommon/includes/reportTemplate.fo.ftl"/></xsl-fo></platform-specific> + <platform-specific><xsl-fo><html-template location="component://common/template/includes/reportTemplate.fo.ftl"/></xsl-fo></platform-specific> </widgets> </section> </screen> @@ -516,13 +516,13 @@ under the License. <widgets> <platform-specific> <xsl-fo> - <html-template location="component://common/webcommon/includes/fo/start.fo.ftl"/> - <html-template location="component://common/webcommon/includes/fo/basic-header.fo.ftl"/> - <html-template location="component://common/webcommon/includes/fo/basic-footer.fo.ftl"/> + <html-template location="component://common/template/includes/fo/start.fo.ftl"/> + <html-template location="component://common/template/includes/fo/basic-header.fo.ftl"/> + <html-template location="component://common/template/includes/fo/basic-footer.fo.ftl"/> </xsl-fo> </platform-specific> <decorator-section-include name="body"/> - <platform-specific><xsl-fo><html-template location="component://common/webcommon/includes/fo/end.fo.ftl"/></xsl-fo></platform-specific> + <platform-specific><xsl-fo><html-template location="component://common/template/includes/fo/end.fo.ftl"/></xsl-fo></platform-specific> </widgets> </section> </screen> @@ -537,7 +537,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> -<!-- <platform-specific><xsl-fo><html-template location="component://common/webcommon/error.fo.ftl"/></xsl-fo></platform-specific> --> +<!-- <platform-specific><xsl-fo><html-template location="component://common/template/error.fo.ftl"/></xsl-fo></platform-specific> --> </decorator-section> </decorator-screen> </widgets> @@ -554,7 +554,7 @@ under the License. <decorator-section name="body"> <section> <actions> - <set field="loginTemplateLocation" from-field="layoutSettings.VT_LOGIN_TMPLT_LOC[0]" default-value="component://common/webcommon/login.ftl"/> + <set field="loginTemplateLocation" from-field="layoutSettings.VT_LOGIN_TMPLT_LOC[0]" default-value="component://common/template/login.ftl"/> </actions> <widgets /> </section> @@ -596,7 +596,7 @@ under the License. <decorator-section name="body"> <section> <actions> - <set field="changePasswordTemplateLocation" from-field="layoutSettings.VT_CHPWD_TMPLT_LOC[0]" default-value="component://common/webcommon/changePassword.ftl"/> + <set field="changePasswordTemplateLocation" from-field="layoutSettings.VT_CHPWD_TMPLT_LOC[0]" default-value="component://common/template/changePassword.ftl"/> </actions> <widgets /> </section> @@ -616,7 +616,7 @@ under the License. <decorator-section name="body"> <section> <actions> - <set field="forgotPasswordTemplateLocation" from-field="layoutSettings.VT_FGPWD_TMPLT_LOC[0]" default-value="component://common/webcommon/forgotPassword.ftl"/> + <set field="forgotPasswordTemplateLocation" from-field="layoutSettings.VT_FGPWD_TMPLT_LOC[0]" default-value="component://common/template/forgotPassword.ftl"/> </actions> <widgets /> </section> @@ -646,7 +646,7 @@ under the License. <decorator-section name="body"> <section> <actions> - <set field="getSecurityQuestionTemplateLocation" from-field="layoutSettings.VT_GSQUE_TMPLT_LOC[0]" default-value="component://common/webcommon/getSecurityQuestion.ftl"/> + <set field="getSecurityQuestionTemplateLocation" from-field="layoutSettings.VT_GSQUE_TMPLT_LOC[0]" default-value="component://common/template/getSecurityQuestion.ftl"/> </actions> <widgets /> </section> @@ -666,7 +666,7 @@ under the License. <decorator-section name="body"> <section> <actions> - <set field="forgotPasswordTemplateLocation" from-field="layoutSettings.VT_FGPWD_TMPLT_LOC[0]" default-value="component://common/webcommon/forgotPassword.ftl"/> + <set field="forgotPasswordTemplateLocation" from-field="layoutSettings.VT_FGPWD_TMPLT_LOC[0]" default-value="component://common/template/forgotPassword.ftl"/> </actions> <widgets /> </section> @@ -685,7 +685,7 @@ under the License. <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/messages.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -746,8 +746,8 @@ under the License. <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/viewBlocked.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/viewBlocked.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/messages.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -759,7 +759,7 @@ under the License. </actions> <widgets> <platform-specific> - <html><html-template location="component://common/webcommon/includes/geolocation.ftl"/></html> + <html><html-template location="component://common/template/includes/geolocation.ftl"/></html> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/framework/common/widget/HelpScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/HelpScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/HelpScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/HelpScreens.xml Fri Apr 22 12:28:46 2016 @@ -37,10 +37,10 @@ under the License. <field-map field-name="themeResources" from-field="layoutSettings"/> </service> <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/> - <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/messages.ftl"/> + <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/template/includes/messages.ftl"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/lookup.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/lookup.ftl"/></html></platform-specific> <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific> <container style="contentarea"> <container id="column-container"> @@ -53,7 +53,7 @@ under the License. </container> <container style="clear"></container> - <platform-specific><html><html-template location="component://common/webcommon/includes/lookupFooter.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/lookupFooter.ftl"/></html></platform-specific> </widgets> </section> </screen> Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Fri Apr 22 12:28:46 2016 @@ -109,7 +109,7 @@ under the License. <decorator-section name="body"> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/listLocales.ftl"/> + <html-template location="component://common/template/includes/listLocales.ftl"/> </html> </platform-specific> </decorator-section> @@ -135,7 +135,7 @@ under the License. <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://common/webcommon/includes/listCompanies.ftl"/></html> + <html><html-template location="component://common/template/includes/listCompanies.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -155,7 +155,7 @@ under the License. <decorator-section name="body"> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/listTimezones.ftl"/> + <html-template location="component://common/template/includes/listTimezones.ftl"/> </html> </platform-specific> </decorator-section> @@ -181,7 +181,7 @@ under the License. <decorator-section name="body"> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/listVisualThemes.ftl"/> + <html-template location="component://common/template/includes/listVisualThemes.ftl"/> </html> </platform-specific> </decorator-section> @@ -202,7 +202,7 @@ under the License. <decorator-section name="body"> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/timeDuration.ftl"/> + <html-template location="component://common/template/includes/timeDuration.ftl"/> </html> </platform-specific> </decorator-section> Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Fri Apr 22 12:28:46 2016 @@ -35,7 +35,7 @@ under the License. --> <platform-specific> <html> - <html-template location="component://common/webcommon/portal/showPortlet.ftl" /> + <html-template location="component://common/template/portal/showPortlet.ftl" /> </html> </platform-specific> </widgets> @@ -137,7 +137,7 @@ under the License. <screenlet title="${uiLabelMap.CommonPortalCategoryPage}: ${parameters.parentPortalPageId}"> <include-form name="PortletCategoryAndPortlet" location="component://common/widget/PortalPageForms.xml"/> </screenlet> - <platform-specific><html><html-template location="component://common/webcommon/portal/listPortalPortlets.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/portal/listPortalPortlets.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/framework/common/widget/SecurityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/SecurityScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/SecurityScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/SecurityScreens.xml Fri Apr 22 12:28:46 2016 @@ -343,7 +343,7 @@ under the License. <container style="widget-container"> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/ViewCertificate.ftl"/> + <html-template location="component://common/template/includes/ViewCertificate.ftl"/> </html> </platform-specific> </container> Modified: ofbiz/trunk/framework/common/widget/flotScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/flotScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/flotScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/flotScreens.xml Fri Apr 22 12:28:46 2016 @@ -27,7 +27,7 @@ under the License. </actions> <widgets> <platform-specific> - <html><html-template location="component://common/webcommon/includes/flotCharts/${chartType}.ftl"/></html> + <html><html-template location="component://common/template/includes/flotCharts/${chartType}.ftl"/></html> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/framework/webtools/template/geo/GeoLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/geo/GeoLocation.ftl?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/template/geo/GeoLocation.ftl (original) +++ ofbiz/trunk/framework/webtools/template/geo/GeoLocation.ftl Fri Apr 22 12:28:46 2016 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#include "component://common/webcommon/includes/GoogleGeoLocation.ftl"/> +<#include "component://common/template/includes/GoogleGeoLocation.ftl"/> <body onload="load()"> <center> Modified: ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMacros.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMacros.ftl?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMacros.ftl (original) +++ ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMacros.ftl Fri Apr 22 12:28:46 2016 @@ -20,10 +20,10 @@ under the License. <#-- To use these macros in your template, insert the following line in your template file: -<#include "component://common/webcommon/includes/tempExprMacros.ftl"/> +<#include "component://common/template/includes/tempExprMacros.ftl"/> --> -<#include "component://common/webcommon/includes/commonMacros.ftl"/> +<#include "component://common/template/includes/commonMacros.ftl"/> <#assign occurrenceList = Static["org.ofbiz.service.calendar.ExpressionUiHelper"].getOccurrenceList() Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml Fri Apr 22 12:28:46 2016 @@ -178,7 +178,7 @@ <widgets> <decorator-screen name="CommonGeoManagementDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://common/webcommon/includes/setMultipleSelectJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setMultipleSelectJs.ftl"/></html></platform-specific> <screenlet title="${uiLabelMap.WebtoolsGeosLinkExplained}"> <include-form name="LinkGeos" location="component://webtools/widget/GeoManagementForms.xml"/> </screenlet> Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Fri Apr 22 12:28:46 2016 @@ -58,7 +58,7 @@ under the License. <include-screen name="JobManagerLockEnable"/> <section> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/ServerHour24HourFormatJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/ServerHour24HourFormatJs.ftl"/></html></platform-specific> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> <include-form name="FindJobs" location="component://webtools/widget/ServiceForms.xml"/> Modified: ofbiz/trunk/framework/widget/config/freemarkerImports.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/config/freemarkerImports.properties?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/config/freemarkerImports.properties (original) +++ ofbiz/trunk/framework/widget/config/freemarkerImports.properties Fri Apr 22 12:28:46 2016 @@ -17,4 +17,4 @@ # under the License. ############################################################################### -htmlTemplate=component://common/webcommon/includes/htmlTemplate.ftl +htmlTemplate=component://common/template/includes/htmlTemplate.ftl Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Fri Apr 22 12:28:46 2016 @@ -75,7 +75,7 @@ under the License. </condition> <widgets> <platform-specific><html><html-template location="component://ecommerce/template/includes/headerHead.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://common/webcommon/includes/openhtmlbody.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/openhtmlbody.ftl"/></html></platform-specific> <!-- render header --> <container id="header"><platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific></container> @@ -86,7 +86,7 @@ under the License. <container id="div3" style="${MainColumnStyle}"> <!-- render messages --> - <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/messages.ftl"/></html></platform-specific> <decorator-section-include name="body"/> </container> @@ -95,7 +95,7 @@ under the License. <!-- render footer --> <container id="footer"><platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific></container> - <platform-specific><html><html-template location="component://common/webcommon/includes/closehtmlbody.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/closehtmlbody.ftl"/></html></platform-specific> </widgets> <fail-widgets> <label text="A Product Store has not been defined for this ecommerce site. A Product Store can be created using the ofbizsetup wizard."/> @@ -281,12 +281,12 @@ under the License. </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/template/includes/headerHead.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://common/webcommon/includes/openhtmlbody.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/openhtmlbody.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/messages.ftl"/></html></platform-specific> <decorator-section-include name="body"/> - <platform-specific><html><html-template location="component://common/webcommon/includes/closehtmlbody.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/closehtmlbody.ftl"/></html></platform-specific> </widgets> </section> </screen> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml Fri Apr 22 12:28:46 2016 @@ -61,7 +61,7 @@ under the License. <decorator-section name="body"> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/> + <html-template location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/> <html-template location="component://ecommerce/template/customer/editcontactmech.ftl"/> </html> </platform-specific> @@ -514,7 +514,7 @@ under the License. <decorator-section name="body"> <platform-specific> <html> - <html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/> + <html-template location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/> <html-template location="component://ecommerce/template/customer/newcustomer.ftl"/> </html> </platform-specific> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml Fri Apr 22 12:28:46 2016 @@ -522,7 +522,7 @@ under the License. <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonPaymentInformation.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/messages.ftl"/></html></platform-specific> <platform-specific><html><html-template location="component://ecommerce/template/order/ccinfo.ftl"/></html></platform-specific> </widgets> </section> @@ -542,7 +542,7 @@ under the License. <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonPaymentInformation.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/messages.ftl"/></html></platform-specific> <platform-specific><html><html-template location="component://ecommerce/template/order/eftinfo.ftl"/></html></platform-specific> </widgets> </section> @@ -562,7 +562,7 @@ under the License. <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonPaymentInformation.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/messages.ftl"/></html></platform-specific> <platform-specific><html><html-template location="component://ecommerce/template/order/gcinfo.ftl"/></html></platform-specific> </widgets> </section> Modified: ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml (original) +++ ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml Fri Apr 22 12:28:46 2016 @@ -76,8 +76,8 @@ under the License. <set field="asm_sortable" value="false"/> </actions> <widgets> - <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> - <platform-specific><html><html-template location="component://common/webcommon/includes/setMultipleSelectJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/template/includes/setMultipleSelectJs.ftl"/></html></platform-specific> <include-form name="DropDownFieldsExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/> <include-form name="DropDownMultipleFieldExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/> </widgets> Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original) +++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Fri Apr 22 12:28:46 2016 @@ -171,7 +171,7 @@ under the License. <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??--> <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??> - <#include "component://common/webcommon/includes/helplink.ftl" /> + <#include "component://common/template/includes/helplink.ftl" /> <span><a href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId!}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span> </#if> <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " "> Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/header.ftl (original) +++ ofbiz/trunk/themes/bluelight/includes/header.ftl Fri Apr 22 12:28:46 2016 @@ -188,7 +188,7 @@ under the License. </#if> <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??--> <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??> - <#include "component://common/webcommon/includes/helplink.ftl" /> + <#include "component://common/template/includes/helplink.ftl" /> <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId!}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> </#if> <#if userLogin??> Modified: ofbiz/trunk/themes/bluelight/includes/messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/messages.ftl?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/messages.ftl (original) +++ ofbiz/trunk/themes/bluelight/includes/messages.ftl Fri Apr 22 12:28:46 2016 @@ -19,6 +19,6 @@ under the License. <#if (errorMessage?has_content || errorMessageList?has_content || eventMessage?has_content || eventMessageList?has_content)> <div id="messages-container"> -<#include "component://common/webcommon/includes/messages.ftl" /> +<#include "component://common/template/includes/messages.ftl" /> </div> </#if> Modified: ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml (original) +++ ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml Fri Apr 22 12:28:46 2016 @@ -63,6 +63,6 @@ under the License. <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://droppingcrumbs/includes/footer.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://droppingcrumbs/includes/appbarOpen.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://droppingcrumbs/includes/appbarClose.ftl" sequenceId="01"/> - <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/> </entity-engine-xml> Modified: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original) +++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Fri Apr 22 12:28:46 2016 @@ -172,7 +172,7 @@ under the License. </#if> <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??--> <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??> - <#include "component://common/webcommon/includes/helplink.ftl" /> + <#include "component://common/template/includes/helplink.ftl" /> <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId!}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> </#if> <#if userLogin??> Modified: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original) +++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Fri Apr 22 12:28:46 2016 @@ -61,7 +61,7 @@ under the License. <!-- ftl references --> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://flatgrey/includes/header.ftl" sequenceId="01"/> - <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://flatgrey/includes/footer.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://flatgrey/includes/appbar.ftl" sequenceId="01"/> </entity-engine-xml> Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original) +++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Fri Apr 22 12:28:46 2016 @@ -136,7 +136,7 @@ under the License. <#if topLine.text??> <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url!)}${StringUtil.wrapString(externalKeyParam)}">${topLine.urlText!}</a></li> <#elseif topLine.dropDownList??> - <li><#include "component://common/webcommon/includes/insertDropDown.ftl"/></li> + <li><#include "component://common/template/includes/insertDropDown.ftl"/></li> <#else> <li>${topLine!}</li> </#if> @@ -150,7 +150,7 @@ under the License. </#if> <#---if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??--> <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??> - <#include "component://common/webcommon/includes/helplink.ftl" /> + <#include "component://common/template/includes/helplink.ftl" /> <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId!}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li> </#if> </ul> Modified: ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml (original) +++ ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml Fri Apr 22 12:28:46 2016 @@ -32,7 +32,7 @@ under the License. <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/header.ftl" sequenceId="01"/> - <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/> + <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/footer.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/includes/topappbar.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeSaphir.png" sequenceId="01"/> @@ -80,7 +80,7 @@ under the License. <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/header.ftl" sequenceId="01"/> - <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/> + <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/footer.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/includes/topappbar.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeRuby.png" sequenceId="01"/> @@ -124,7 +124,7 @@ under the License. <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/header.ftl" sequenceId="01"/> - <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/> + <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/footer.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/includes/topappbar.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeEmerald.png" sequenceId="01"/> @@ -167,7 +167,7 @@ under the License. <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/header.ftl" sequenceId="01"/> - <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/> + <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/footer.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/includes/topappbar.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeAmber.png" sequenceId="01"/> Modified: ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml (original) +++ ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml Fri Apr 22 12:28:46 2016 @@ -63,5 +63,5 @@ under the License. <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://tomahawk/includes/footer.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://tomahawk/includes/appbarOpen.ftl" sequenceId="01"/> <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://tomahawk/includes/appbarClose.ftl" sequenceId="01"/> - <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/> </entity-engine-xml> Modified: ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl?rev=1740497&r1=1740496&r2=1740497&view=diff ============================================================================== --- ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl (original) +++ ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Fri Apr 22 12:28:46 2016 @@ -74,7 +74,7 @@ under the License. <#if userLogin??> <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??--> <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??> - <#include "component://common/webcommon/includes/helplink.ftl" /> + <#include "component://common/template/includes/helplink.ftl" /> <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId!}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> </#if> <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |