Author: deepak
Date: Fri May 20 18:52:54 2016
New Revision: 1744783
URL: http://svn.apache.org/viewvc?rev=1744783&view=rev
Log:
(OFBIZ-7021) Renamed framework common component ftl file name from lower camel
case to upper camel case pattern.
Added:
ofbiz/trunk/framework/common/template/ChangePassword.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/changePassword.ftl
ofbiz/trunk/framework/common/template/Error.fo.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/error.fo.ftl
ofbiz/trunk/framework/common/template/ForgotPassword.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/forgotPassword.ftl
ofbiz/trunk/framework/common/template/GetSecurityQuestion.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/getSecurityQuestion.ftl
ofbiz/trunk/framework/common/template/Login.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/login.ftl
ofbiz/trunk/framework/common/template/ViewBlocked.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/viewBlocked.ftl
ofbiz/trunk/framework/common/template/includes/AjaxAutocompleteOptions.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/ajaxAutocompleteOptions.ftl
ofbiz/trunk/framework/common/template/includes/CcMonths.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/ccmonths.ftl
ofbiz/trunk/framework/common/template/includes/CcTypes.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/cctypes.ftl
ofbiz/trunk/framework/common/template/includes/CcYears.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/ccyears.ftl
ofbiz/trunk/framework/common/template/includes/CloseHtmlBody.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/closehtmlbody.ftl
ofbiz/trunk/framework/common/template/includes/CommonMacros.ftl
- copied, changed from r1744780,
ofbiz/trunk/framework/common/template/includes/commonMacros.ftl
ofbiz/trunk/framework/common/template/includes/Countries.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/countries.ftl
ofbiz/trunk/framework/common/template/includes/GenericLink.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/genericLink.ftl
ofbiz/trunk/framework/common/template/includes/GeoLocation.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/geolocation.ftl
ofbiz/trunk/framework/common/template/includes/HelpLink.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/helplink.ftl
ofbiz/trunk/framework/common/template/includes/HtmlFooterForAjax.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/htmlfooter-for-ajax.ftl
ofbiz/trunk/framework/common/template/includes/HtmlHeaderForAjax.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/htmlheader-for-ajax.ftl
ofbiz/trunk/framework/common/template/includes/HtmlTemplate.ftl
- copied unchanged from r1744782,
ofbiz/trunk/framework/common/template/includes/htmlTemplate.ftl
ofbiz/trunk/framework/common/template/includes/InsertDropDown.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/insertDropDown.ftl
ofbiz/trunk/framework/common/template/includes/ListLocales.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/listLocales.ftl
ofbiz/trunk/framework/common/template/includes/ListTimezones.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/listTimezones.ftl
ofbiz/trunk/framework/common/template/includes/ListVisualThemes.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/listVisualThemes.ftl
ofbiz/trunk/framework/common/template/includes/Lookup.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/lookup.ftl
ofbiz/trunk/framework/common/template/includes/LookupFooter.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/lookupFooter.ftl
ofbiz/trunk/framework/common/template/includes/Messages.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/messages.ftl
ofbiz/trunk/framework/common/template/includes/MinimalDecorator.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/minimal-decorator.ftl
ofbiz/trunk/framework/common/template/includes/OpenHtmlBody.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/openhtmlbody.ftl
ofbiz/trunk/framework/common/template/includes/ReportTemplate.fo.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/reportTemplate.fo.ftl
ofbiz/trunk/framework/common/template/includes/SetDependentDropdownValuesJs.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/setDependentDropdownValuesJs.ftl
ofbiz/trunk/framework/common/template/includes/SetMultipleSelectJs.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/setMultipleSelectJs.ftl
ofbiz/trunk/framework/common/template/includes/SetMultipleSelectJsList.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/setMultipleSelectJsList.ftl
ofbiz/trunk/framework/common/template/includes/Simple.fo.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/simple.fo.ftl
ofbiz/trunk/framework/common/template/includes/Simple.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/simple.ftl
ofbiz/trunk/framework/common/template/includes/States.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/states.ftl
ofbiz/trunk/framework/common/template/includes/TimeDuration.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/timeDuration.ftl
ofbiz/trunk/framework/common/template/includes/fo/BasicFooter.fo.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/fo/basic-footer.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/BasicHeader.fo.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/fo/basic-header.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/End.fo.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/fo/end.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/Pm-11x17.fo.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/fo/pm-11x17.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/Pm-iso216.fo.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/fo/pm-iso216.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/Pm-legal.fo.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/fo/pm-legal.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/Pm-letter.fo.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/includes/fo/pm-letter.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/Start.fo.ftl
- copied, changed from r1744780,
ofbiz/trunk/framework/common/template/includes/fo/start.fo.ftl
ofbiz/trunk/framework/common/template/portal/ListPortalPortlets.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/portal/listPortalPortlets.ftl
ofbiz/trunk/framework/common/template/portal/ShowPortlet.ftl
- copied unchanged from r1744780,
ofbiz/trunk/framework/common/template/portal/showPortlet.ftl
Removed:
ofbiz/trunk/framework/common/template/changePassword.ftl
ofbiz/trunk/framework/common/template/error.fo.ftl
ofbiz/trunk/framework/common/template/forgotPassword.ftl
ofbiz/trunk/framework/common/template/getSecurityQuestion.ftl
ofbiz/trunk/framework/common/template/includes/ajaxAutocompleteOptions.ftl
ofbiz/trunk/framework/common/template/includes/ccmonths.ftl
ofbiz/trunk/framework/common/template/includes/cctypes.ftl
ofbiz/trunk/framework/common/template/includes/ccyears.ftl
ofbiz/trunk/framework/common/template/includes/closehtmlbody.ftl
ofbiz/trunk/framework/common/template/includes/commonMacros.ftl
ofbiz/trunk/framework/common/template/includes/countries.ftl
ofbiz/trunk/framework/common/template/includes/fo/basic-footer.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/basic-header.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/end.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/pm-11x17.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/pm-iso216.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/pm-legal.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/pm-letter.fo.ftl
ofbiz/trunk/framework/common/template/includes/fo/start.fo.ftl
ofbiz/trunk/framework/common/template/includes/genericLink.ftl
ofbiz/trunk/framework/common/template/includes/geolocation.ftl
ofbiz/trunk/framework/common/template/includes/helplink.ftl
ofbiz/trunk/framework/common/template/includes/htmlTemplate.ftl
ofbiz/trunk/framework/common/template/includes/htmlfooter-for-ajax.ftl
ofbiz/trunk/framework/common/template/includes/htmlheader-for-ajax.ftl
ofbiz/trunk/framework/common/template/includes/insertDropDown.ftl
ofbiz/trunk/framework/common/template/includes/listLocales.ftl
ofbiz/trunk/framework/common/template/includes/listTimezones.ftl
ofbiz/trunk/framework/common/template/includes/listVisualThemes.ftl
ofbiz/trunk/framework/common/template/includes/lookup.ftl
ofbiz/trunk/framework/common/template/includes/lookupFooter.ftl
ofbiz/trunk/framework/common/template/includes/messages.ftl
ofbiz/trunk/framework/common/template/includes/minimal-decorator.ftl
ofbiz/trunk/framework/common/template/includes/openhtmlbody.ftl
ofbiz/trunk/framework/common/template/includes/reportTemplate.fo.ftl
ofbiz/trunk/framework/common/template/includes/setDependentDropdownValuesJs.ftl
ofbiz/trunk/framework/common/template/includes/setMultipleSelectJs.ftl
ofbiz/trunk/framework/common/template/includes/setMultipleSelectJsList.ftl
ofbiz/trunk/framework/common/template/includes/simple.fo.ftl
ofbiz/trunk/framework/common/template/includes/simple.ftl
ofbiz/trunk/framework/common/template/includes/states.ftl
ofbiz/trunk/framework/common/template/includes/timeDuration.ftl
ofbiz/trunk/framework/common/template/login.ftl
ofbiz/trunk/framework/common/template/portal/listPortalPortlets.ftl
ofbiz/trunk/framework/common/template/portal/showPortlet.ftl
ofbiz/trunk/framework/common/template/viewBlocked.ftl
Modified:
ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.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/EditShoppingList.ftl
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
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/webtools/template/tempexpr/TempExprMacros.ftl
ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.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/template/Header.ftl
ofbiz/trunk/themes/bluelight/template/Header.ftl
ofbiz/trunk/themes/bluelight/template/Messages.ftl
ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml
ofbiz/trunk/themes/droppingcrumbs/template/Header.ftl
ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
ofbiz/trunk/themes/flatgrey/template/Header.ftl
ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml
ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml
ofbiz/trunk/themes/tomahawk/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Fri May 20
18:52:54 2016
@@ -169,7 +169,7 @@ under the License.
<set field="salesRepPartyList" type="List"
from-field="parameters.partyIds"/>
<script
location="component://accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy"/>
- <!-- asmslect parameters, must be prefixed by asm_ for
setMultipleSelectJs.ftl -->
+ <!-- asmslect parameters, must be prefixed by asm_ for
SetMultipleSelectJs.ftl -->
<set field="asm_multipleSelectForm" value="CommissionRun"/>
<set field="asm_multipleSelect"
value="CommissionRun_partyId"/>
<set field="asm_formSize" value="700"/>
@@ -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/template/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/data/helpdata/HELP_OFBizDocumentationSystem.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
---
ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
(original)
+++
ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
Fri May 20 18:52:54 2016
@@ -69,7 +69,7 @@
screen, you need to do the following:
<orderedlist>
<listitem>
- <para>In the helplink.ftl un-comment the ${helpTopic} variable
so it will appear at the
+ <para>In the HelpLink.ftl un-comment the ${helpTopic} variable
so it will appear at the
top right hand of your screen.
</para>
</listitem>
Modified:
ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
---
ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
(original)
+++
ofbiz/trunk/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
Fri May 20 18:52:54 2016
@@ -63,7 +63,7 @@
Si vous voulez créer un nouveau menu d'aide pour un écran, vous
aurez besoin de faire ce qui suit :
<orderedlist>
<listitem>
- <para>Dans le helplink.ftl dé-commentez la variable
${helpTopic} ce qui la fera apparaître en haut à droite de votre
écran.</para>
+ <para>Dans le HelpLink.ftl dé-commentez la variable
${helpTopic} ce qui la fera apparaître en haut à droite de votre
écran.</para>
</listitem>
<listitem>
<para>Dans le composant spécifique data/helpData, créez le
fichier HELP_${helpTopic}.xml. Vous pourrez trouver un fichier d'exemple comme
HELP_ACCOUNTING_main.xml</para>
Modified:
ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
(original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml Fri
May 20 18:52:54 2016
@@ -50,7 +50,7 @@
<if-empty field="parties"/>
</condition>
<actions>
- <!-- fields for
setDependentDropdownValuesJs.ftl -->
+ <!-- fields for
SetDependentDropdownValuesJs.ftl -->
<set field="dependentForm"
value="NewCustomer"/>
<set field="paramKey"
value="countryGeoId"/>
<set field="mainId"
value="USER_COUNTRY"/>
@@ -62,7 +62,7 @@
<set field="selectedDependentOption"
value="_none_"/>
</actions>
<widgets>
-
<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/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml
(original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml Fri
May 20 18:52:54 2016
@@ -45,7 +45,7 @@
<widgets>
<section>
<actions>
- <!-- fields for
setDependentDropdownValuesJs.ftl, it's a try on generalization, if you need an
example with more than one dropdown in a form have a look at
EditProductPriceRules screen -->
+ <!-- fields for
SetDependentDropdownValuesJs.ftl, it's a try on generalization, if you need an
example with more than one dropdown in a form have a look at
EditProductPriceRules screen -->
<set field="dependentForm"
value="NewOrganization"/>
<set field="paramKey" value="countryGeoId"/>
<set field="mainId" value="USER_COUNTRY"/>
@@ -57,7 +57,7 @@
<set field="selectedDependentOption"
value="_none_"/>
</actions>
<widgets>
- <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/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/manufacturing/widget/manufacturing/RoutingScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
Fri May 20 18:52:54 2016
@@ -101,7 +101,7 @@ under the License.
<widgets>
<decorator-screen name="CommonManufacturingDecorator"
location="${parameters.commonManufacturingDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template
location="component://common/template/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/marketing/widget/sfa/AccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Fri May 20
18:52:54 2016
@@ -100,7 +100,7 @@ under the License.
<screenlet
title="${uiLabelMap.PageTitleCreateAccount}">
<platform-specific>
<html>
- <html-template
location="component://common/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl
(original)
+++ ofbiz/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl
Fri May 20 18:52:54 2016
@@ -119,7 +119,7 @@ under the License.
<#if paginateEcommerceStyle??>
<@paginationControls/>
<#else>
- <#include "component://common/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Fri
May 20 18:52:54 2016
@@ -55,7 +55,7 @@ under the License.
</container>
</decorator-section>
<decorator-section name="search-options">
- <platform-specific><html><html-template
location="component://common/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
Fri May 20 18:52:54 2016
@@ -184,7 +184,7 @@ under the License.
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.groovy"/>
- <!-- asmslect parameters, must be prefixed by asm_ for
setMultipleSelectJs.ftl -->
+ <!-- asmslect parameters, must be prefixed by asm_ for
SetMultipleSelectJs.ftl -->
<!--set field="asm_multipleSelectForm"
value="addAdditionalPartyForm"/>
<set field="asm_multipleSelect" value="additionalRoleTypeId"/>
<set field="asm_formSize" value="700"/>
@@ -196,7 +196,7 @@ under the License.
<widgets>
<decorator-screen name="CommonOrderCheckoutDecorator">
<decorator-section name="body">
- <platform-specific><html><html-template
location="component://common/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Fri May
20 18:52:54 2016
@@ -248,7 +248,7 @@ under the License.
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy"/>
<script
location="component://content/webapp/content/WEB-INF/actions/print/FindPrinters.groovy"/>
- <!-- asmslect parameters, must be prefixed by asm_ for
setMultipleSelectJs.ftl -->
+ <!-- asmslect parameters, must be prefixed by asm_ for
SetMultipleSelectJs.ftl -->
<set field="asm_multipleSelectForm" value="lookuporder"/>
<set field="asm_multipleSelect" value="roleTypeId"/>
<set field="asm_formSize" value="1000"/>
@@ -260,7 +260,7 @@ under the License.
<widgets>
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
- <platform-specific><html><html-template
location="component://common/template/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/EditShoppingList.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/party/EditShoppingList.ftl?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/template/party/EditShoppingList.ftl
(original)
+++ ofbiz/trunk/applications/party/template/party/EditShoppingList.ftl Fri May
20 18:52:54 2016
@@ -177,7 +177,7 @@ under the License.
<div class="screenlet-body">
<#if shoppingListItemDatas?has_content>
<#-- Pagination -->
- <#include "component://common/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri May 20
18:52:54 2016
@@ -452,7 +452,7 @@ under the License.
<widgets>
<platform-specific>
<html>
- <html-template
location="component://common/template/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/template/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/template/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/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri
May 20 18:52:54 2016
@@ -870,7 +870,7 @@ under the License.
<decorator-section name="body">
<platform-specific>
<html>
- <html-template
location="component://common/template/includes/setDependentDropdownValuesJs.ftl"/>
+ <html-template
location="component://common/template/includes/SetDependentDropdownValuesJs.ftl"/>
<html-template
location="component://product/template/facility/EditContactMech.ftl"/>
</html>
</platform-specific>
Copied: ofbiz/trunk/framework/common/template/includes/CommonMacros.ftl (from
r1744780, ofbiz/trunk/framework/common/template/includes/commonMacros.ftl)
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/CommonMacros.ftl?p2=ofbiz/trunk/framework/common/template/includes/CommonMacros.ftl&p1=ofbiz/trunk/framework/common/template/includes/commonMacros.ftl&r1=1744780&r2=1744783&rev=1744783&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/commonMacros.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/CommonMacros.ftl Fri May 20
18:52:54 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/template/includes/commonMacros.ftl"/>
+<#include "component://common/template/includes/CommonMacros.ftl"/>
-->
<#assign
Copied: ofbiz/trunk/framework/common/template/includes/fo/Start.fo.ftl (from
r1744780, 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?p2=ofbiz/trunk/framework/common/template/includes/fo/Start.fo.ftl&p1=ofbiz/trunk/framework/common/template/includes/fo/start.fo.ftl&r1=1744780&r2=1744783&rev=1744783&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/fo/start.fo.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/fo/Start.fo.ftl Fri May 20
18:52:54 2016
@@ -33,10 +33,10 @@ under the License.
<#include pageMaster/>
</#list>
<#else>
- <#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"/>
+ <#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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Fri May 20 18:52:54
2016
@@ -25,7 +25,7 @@ under the License.
<screen name="states">
<section>
<widgets>
- <platform-specific><html><html-template
location="component://common/template/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/template/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/template/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/template/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/template/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/template/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/template/includes/htmlheader-for-ajax.ftl" />
+ <html-template
location="component://common/template/includes/HtmlHeaderForAjax.ftl" />
</html>
</platform-specific>
<decorator-section-include name="body" />
<platform-specific>
<html>
- <html-template
location="component://common/template/includes/htmlfooter-for-ajax.ftl" />
+ <html-template
location="component://common/template/includes/HtmlFooterForAjax.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/template/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/template/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/template/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/template/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/template/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/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>
+ <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/MinimalDecorator.ftl"/></xml>
+ <text><html-template
location="component://common/template/includes/MinimalDecorator.ftl"/></text>
+ <csv><html-template
location="component://common/template/includes/MinimalDecorator.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/template/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/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"/>
+ <html-template
location="component://common/template/includes/fo/Start.fo.ftl"/>
+ <html-template
location="component://common/template/includes/fo/BasicHeader.fo.ftl"/>
+ <html-template
location="component://common/template/includes/fo/BasicFooter.fo.ftl"/>
</xsl-fo>
</platform-specific>
<decorator-section-include name="body"/>
- <platform-specific><xsl-fo><html-template
location="component://common/template/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/template/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/template/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/template/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/template/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/template/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/template/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/template/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/template/viewBlocked.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://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/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/HelpScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/HelpScreens.xml Fri May 20 18:52:54 2016
@@ -30,17 +30,17 @@ under the License.
<field-map field-name="userPrefGroupTypeId"
value="GLOBAL_PREFERENCES"/>
</service>
<set field="userPreferences"
from-field="prefResult.userPrefMap" global="true"/>
- <set field="lookupType" value="HELP"/>
+ <set field="lookupType" value="HELP"/>
<set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" global="true"/>
<service service-name="getVisualThemeResources">
<field-map field-name="visualThemeId"/>
<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/template/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/template/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/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Fri May 20 18:52:54
2016
@@ -109,7 +109,7 @@ under the License.
<decorator-section name="body">
<platform-specific>
<html>
- <html-template
location="component://common/template/includes/listLocales.ftl"/>
+ <html-template
location="component://common/template/includes/ListLocales.ftl"/>
</html>
</platform-specific>
</decorator-section>
@@ -155,7 +155,7 @@ under the License.
<decorator-section name="body">
<platform-specific>
<html>
- <html-template
location="component://common/template/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/template/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/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Fri May 20
18:52:54 2016
@@ -35,7 +35,7 @@ under the License.
-->
<platform-specific>
<html>
- <html-template
location="component://common/template/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/template/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/webtools/template/tempexpr/TempExprMacros.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl
(original)
+++ ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl Fri May
20 18:52:54 2016
@@ -23,7 +23,7 @@ your template file:
<#include "component://common/template/includes/empExprMacros.ftl"/>
-->
-<#include "component://common/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml Fri May 20
18:52:54 2016
@@ -159,7 +159,7 @@
<set field="noId" value="true"/><!-- see
CommonGeoManagementDecorator -->
- <!-- asmslect parameters, must be prefixed by asm_ for
setMultipleSelectJs.ftl -->
+ <!-- asmslect parameters, must be prefixed by asm_ for
SetMultipleSelectJs.ftl -->
<set field="asm_multipleSelectForm" value="LinkGeos"/>
<set field="asm_multipleSelect" value="LinkGeos_geoIds"/>
<set field="asm_formSize" value="700"/>
@@ -178,7 +178,7 @@
<widgets>
<decorator-screen name="CommonGeoManagementDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template
location="component://common/template/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/widget/config/freemarkerImports.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/config/freemarkerImports.properties?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/config/freemarkerImports.properties (original)
+++ ofbiz/trunk/framework/widget/config/freemarkerImports.properties Fri May 20
18:52:54 2016
@@ -17,4 +17,4 @@
# under the License.
###############################################################################
-htmlTemplate=component://common/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Fri May 20
18:52:54 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/template/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/template/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/template/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/template/includes/openhtmlbody.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://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/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml Fri May 20
18:52:54 2016
@@ -61,7 +61,7 @@ under the License.
<decorator-section name="body">
<platform-specific>
<html>
- <html-template
location="component://common/template/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/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml Fri May 20
18:52:54 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/template/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/template/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/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
(original)
+++
ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
Fri May 20 18:52:54 2016
@@ -54,7 +54,7 @@ under the License.
</container>
<section>
<actions>
- <!-- fields for
setDependentDropdownValuesJs.ftl, it's a try on generalization,
+ <!-- fields for
SetDependentDropdownValuesJs.ftl, it's a try on generalization,
if you need an example with
more than one dropdown in a form have a look at
EditProductPriceRules screen
in PriceScreens.xml-->
<set field="dependentForm"
value="DropDownFieldsExampleForm"/>
@@ -68,7 +68,7 @@ under the License.
<set
field="selectedDependentOption" from-field="postalAddress.stateProvinceGeoId"
default-value="_none_"/><!-- postalAddress.stateProvinceGeoId does not make
much sense here, only to get the idea -->
<set field="focusFieldName"
value="DateTimeFieldsExampleForm_field1_i18n"/>
- <!-- asmselect parameters, must be
prefixed by asm_ for setMultipleSelectJs.ftl -->
+ <!-- asmselect parameters, must be
prefixed by asm_ for SetMultipleSelectJs.ftl -->
<set
field="asm_multipleSelectForm" value="DropDownMultipleFieldExampleForm"/>
<set field="asm_multipleSelect"
value="DropDownMultipleFieldExampleForm_countryGeoIdMultiple"/>
<set field="asm_formSize"
value="600"/>
@@ -76,8 +76,8 @@ under the License.
<set field="asm_sortable"
value="false"/>
</actions>
<widgets>
-
<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>
+
<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/template/Header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/template/Header.ftl?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/template/Header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/template/Header.ftl Fri May 20 18:52:54 2016
@@ -171,7 +171,7 @@ under the License.
<#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? &&
helpTopic??-->
<#if parameters.componentName?? &&
requestAttributes._CURRENT_VIEW_?? && helpTopic??>
- <#include "component://common/template/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/template/Header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/template/Header.ftl?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/template/Header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/template/Header.ftl Fri May 20 18:52:54 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/template/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/template/Messages.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/template/Messages.ftl?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/template/Messages.ftl (original)
+++ ofbiz/trunk/themes/bluelight/template/Messages.ftl Fri May 20 18:52:54 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/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml
(original)
+++ ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml Fri May
20 18:52:54 2016
@@ -63,6 +63,6 @@ under the License.
<VisualThemeResource visualThemeId="DROPPINGCRUMBS"
resourceTypeEnumId="VT_FTR_TMPLT_LOC"
resourceValue="component://droppingcrumbs/template/Footer.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="DROPPINGCRUMBS"
resourceTypeEnumId="VT_NAV_OPEN_TMPLT"
resourceValue="component://droppingcrumbs/template/AppBarOpen.ftl"
sequenceId="01"/>
<VisualThemeResource visualThemeId="DROPPINGCRUMBS"
resourceTypeEnumId="VT_NAV_CLOSE_TMPLT"
resourceValue="component://droppingcrumbs/template/AppBarClose.ftl"
sequenceId="01"/>
- <VisualThemeResource visualThemeId="DROPPINGCRUMBS"
resourceTypeEnumId="VT_MSG_TMPLT_LOC"
resourceValue="component://common/template/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/template/Header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/template/Header.ftl?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/template/Header.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/template/Header.ftl Fri May 20 18:52:54
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/template/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=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
+++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Fri May 20 18:52:54
2016
@@ -61,7 +61,7 @@ under the License.
<!-- ftl references -->
<VisualThemeResource visualThemeId="FLAT_GREY"
resourceTypeEnumId="VT_HDR_TMPLT_LOC"
resourceValue="component://flatgrey/template/Header.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_MSG_TMPLT_LOC"
resourceValue="component://common/template/includes/Messages.ftl"
sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY"
resourceTypeEnumId="VT_FTR_TMPLT_LOC"
resourceValue="component://flatgrey/template/Footer.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY"
resourceTypeEnumId="VT_NAV_TMPLT_LOC"
resourceValue="component://flatgrey/template/AppBar.ftl" sequenceId="01"/>
</entity-engine-xml>
Modified: ofbiz/trunk/themes/flatgrey/template/Header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/template/Header.ftl?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/template/Header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/template/Header.ftl Fri May 20 18:52:54 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/template/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/template/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>
