svn commit: r1806091 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget
Locked
svn commit: r1806091 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget
 
|
Author: nmalin
Date: Thu Aug 24 21:55:06 2017 New Revision: 1806091 URL: http://svn.apache.org/viewvc?rev=1806091&view=rev Log: Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme) Third step, move macro ftl libraries and ftl template present on framework common to common theme At this step, the common-theme is forced like the common component previously. Main common screens present on CommonScreens.xml, LookupScreens.xml and HelpScreens.xml are moved to common screen with a forced rewrite to common-theme Warning this commit is going to follow with a other commit for CommonScreens.xml because LookupScreens.xml and HelpScreens.xml are recreated on common-theme, but to keep the history of CommonScreens.xml it was moved entirely, the second commit restore it with redirect call. Added: ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/InitTheme.groovy (with props) ofbiz/ofbiz-framework/trunk/themes/common/template/ ofbiz/ofbiz-framework/trunk/themes/common/template/ChangePassword.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/common/template/ChangePassword.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/ForgotPassword.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/common/template/ForgotPassword.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/GetSecurityQuestion.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/common/template/GetSecurityQuestion.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/JsLanguageFilesMapping.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/common/template/JsLanguageFilesMapping.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/Login.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/common/template/Login.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/ViewBlocked.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/common/template/ViewBlocked.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/includes/ - copied from r1806090, ofbiz/ofbiz-framework/trunk/framework/common/template/includes/ ofbiz/ofbiz-framework/trunk/themes/common/template/macro/ ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvFormMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/CsvFormMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvScreenMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/CsvScreenMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvTreeMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/CsvTreeMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoFormMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/FoFormMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoScreenMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/FoScreenMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoTreeMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/FoTreeMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/HtmlFormMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlMenuMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/HtmlMenuMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/HtmlScreenMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlTreeMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/HtmlTreeMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextFormMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/TextFormMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextScreenMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/TextScreenMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextTreeMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/TextTreeMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsFormMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/XlsFormMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsScreenMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/XlsScreenMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsTreeMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/XlsTreeMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlFormMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/XmlFormMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlScreenMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/XmlScreenMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlTreeMacroLibrary.ftl - copied unchanged from r1806090, ofbiz/ofbiz-framework/trunk/framework/widget/templates/XmlTreeMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/portal/ - copied from r1806090, ofbiz/ofbiz-framework/trunk/framework/common/template/portal/ ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml - copied, changed from r1806090, ofbiz/ofbiz-framework/trunk/framework/common/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/themes/common/widget/HelpScreens.xml (with props) ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml (with props) Removed: ofbiz/ofbiz-framework/trunk/framework/common/template/ ofbiz/ofbiz-framework/trunk/framework/common/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/framework/widget/templates/ Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/AccountScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditGeoLocation.ftl ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/ofbiz-framework/trunk/framework/base/config/AutoImportTemplate.ftl ofbiz/ofbiz-framework/trunk/framework/common/widget/HelpScreens.xml ofbiz/ofbiz-framework/trunk/framework/common/widget/LookupScreens.xml ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml ofbiz/ofbiz-framework/trunk/framework/common/widget/flotScreens.xml ofbiz/ofbiz-framework/trunk/framework/webtools/template/geo/GeoLocation.ftl ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml ofbiz/ofbiz-framework/trunk/framework/webtools/widget/ServiceScreens.xml ofbiz/ofbiz-framework/trunk/framework/widget/config/widget.properties ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Messages.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/includes/CommonMacros.ftl ofbiz/ofbiz-framework/trunk/themes/common/template/includes/fo/Start.fo.ftl ofbiz/ofbiz-framework/trunk/themes/flatgrey/data/FlatGreyThemeData.xml ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl ofbiz/ofbiz-framework/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Thu Aug 24 21:55:06 2017 @@ -182,7 +182,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-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> <section> <widgets> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> Modified: ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/ProfileScreens.xml Thu Aug 24 21:55:06 2017 @@ -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-theme/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/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml Thu Aug 24 21:55:06 2017 @@ -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-theme/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/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Thu Aug 24 21:55:06 2017 @@ -104,7 +104,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-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> <section> <widgets> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/AccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/AccountScreens.xml Thu Aug 24 21:55:06 2017 @@ -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-theme/template/includes/SetDependentDropdownValuesJs.ftl"/> </html> </platform-specific> <include-form name="NewAccount" location="component://marketing/widget/sfa/forms/AccountForms.xml"/> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Thu Aug 24 21:55:06 2017 @@ -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-theme/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/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Thu Aug 24 21:55:06 2017 @@ -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-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> <platform-specific> <html><html-template location="component://order/template/entry/SetAdditionalParty.ftl"/></html> </platform-specific> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Thu Aug 24 21:55:06 2017 @@ -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-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> <platform-specific> <html><html-template location="component://order/template/order/FindOrders.ftl"/></html> </platform-specific> Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditGeoLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditGeoLocation.ftl?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditGeoLocation.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditGeoLocation.ftl Thu Aug 24 21:55:06 2017 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#include "component://common/template/includes/GoogleGeoLocation.ftl"/> +<#include "component://common-theme/template/includes/GoogleGeoLocation.ftl"/> <body onload="load()"> <center> Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml Thu Aug 24 21:55:06 2017 @@ -41,7 +41,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" 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-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> <section> <!-- do check for PARTYMGR, _VIEW permission --> <condition> @@ -460,7 +460,7 @@ under the License. <widgets> <platform-specific> <html> - <html-template location="component://common/template/includes/SetDependentDropdownValuesJs.ftl"/> + <html-template location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/> <html-template location="component://party/template/party/EditContactMech.ftl"/> </html> </platform-specific> @@ -703,7 +703,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-theme/template/includes/SetDependentDropdownValuesJs.ftl"/></html></platform-specific> <screenlet title="${uiLabelMap.PartyCreateNewCustomer}"> <include-form name="NewUser" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> @@ -748,7 +748,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-theme/template/includes/SetDependentDropdownValuesJs.ftl"/></html></platform-specific> <screenlet title="${uiLabelMap.PartyCreateNewProspect}"> <include-form name="NewUser" location="component://party/widget/partymgr/PartyForms.xml"/> </screenlet> @@ -793,7 +793,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-theme/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/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml Thu Aug 24 21:55:06 2017 @@ -839,7 +839,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-theme/template/includes/SetDependentDropdownValuesJs.ftl"/> <html-template location="component://product/template/facility/EditContactMech.ftl"/> </html> </platform-specific> Modified: ofbiz/ofbiz-framework/trunk/framework/base/config/AutoImportTemplate.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/config/AutoImportTemplate.ftl?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/config/AutoImportTemplate.ftl (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/config/AutoImportTemplate.ftl Thu Aug 24 21:55:06 2017 @@ -17,5 +17,5 @@ specific language governing permissions under the License. --> -<#include "component://widget/templates/HtmlFormMacroLibrary.ftl" ignore_missing=true /> -<#include "component://common/template/includes/HtmlTemplate.ftl" ignore_missing=true /> +<#include "component://common-theme/template/macro/HtmlFormMacroLibrary.ftl" ignore_missing=true /> +<#include "component://common-theme/template/includes/HtmlTemplate.ftl" ignore_missing=true /> Added: ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/InitTheme.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/InitTheme.groovy?rev=1806091&view=auto ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/InitTheme.groovy (added) +++ ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/InitTheme.groovy Thu Aug 24 21:55:06 2017 @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.ofbiz.base.util.UtilProperties + +def globalContext = context.globalContext; +if (!globalContext.userPreferences) { + Map userPreferencesResult = run service: 'getUserPreferenceGroup', with: ['userPrefGroupTypeId': 'GLOBAL_PREFERENCES'] + globalContext.userPreferences = userPreferencesResult.userPrefMap +} + +if (!globalContext.generalProperties) { + globalContext.generalProperties = UtilProperties.getResourceBundleMap('general', context.locale, context) +} + +if (!globalContext.visualThemeId) { + globalContext.visualThemeId = userPreferences.VISUAL_THEME ? userPreferences.VISUAL_THEME : generalProperties.VISUAL_THEME +} + +if (!globalContext.themeResources) { + Map themeResourcesResult = run service: 'getVisualThemeResources', with: ['visualThemeId': globalContext.visualThemeId] + globalContext.themeResources = themeResourcesResult.themeResources + if (globalContext.layoutSettings) { + globalContext.layoutSettings.putAll(themeResourcesResult.themeResources) + } else { + globalContext.layoutSettings = themeResourcesResult.themeResources + } +} +context.globalContext = globalContext Propchange: ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/InitTheme.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/InitTheme.groovy ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/InitTheme.groovy ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/ofbiz-framework/trunk/framework/common/widget/HelpScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/HelpScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/widget/HelpScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/widget/HelpScreens.xml Thu Aug 24 21:55:06 2017 @@ -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/template/includes/Messages.ftl"/> + <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common-theme/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-theme/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-theme/template/includes/LookupFooter.ftl"/></html></platform-specific> </widgets> </section> </screen> Modified: ofbiz/ofbiz-framework/trunk/framework/common/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/LookupScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/widget/LookupScreens.xml Thu Aug 24 21:55:06 2017 @@ -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-theme/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/template/includes/listCompanies.ftl"/></html> + <html><html-template location="component://common-theme/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/template/includes/ListTimezones.ftl"/> + <html-template location="component://common-theme/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-theme/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-theme/template/includes/TimeDuration.ftl"/> </html> </platform-specific> </decorator-section> Modified: ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml Thu Aug 24 21:55:06 2017 @@ -35,7 +35,7 @@ under the License. --> <platform-specific> <html> - <html-template location="component://common/template/portal/ShowPortlet.ftl" /> + <html-template location="component://common-theme/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-theme/template/portal/ListPortalPortlets.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/ofbiz-framework/trunk/framework/common/widget/flotScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/flotScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/widget/flotScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/widget/flotScreens.xml Thu Aug 24 21:55:06 2017 @@ -27,7 +27,7 @@ under the License. </actions> <widgets> <platform-specific> - <html><html-template location="component://common/template/includes/flotCharts/${chartType}.ftl"/></html> + <html><html-template location="component://common-theme/template/includes/flotCharts/${chartType}.ftl"/></html> </platform-specific> </widgets> </section> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/geo/GeoLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/geo/GeoLocation.ftl?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/template/geo/GeoLocation.ftl (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/geo/GeoLocation.ftl Thu Aug 24 21:55:06 2017 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#include "component://common/template/includes/GoogleGeoLocation.ftl"/> +<#include "component://common-theme/template/includes/GoogleGeoLocation.ftl"/> <body onload="load()"> <center> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl Thu Aug 24 21:55:06 2017 @@ -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/template/includes/empExprMacros.ftl"/> +<#include "component://common-theme/template/includes/empExprMacros.ftl"/> --> -<#include "component://common/template/includes/CommonMacros.ftl"/> +<#include "component://common-theme/template/includes/CommonMacros.ftl"/> <#assign occurrenceList = Static["org.apache.ofbiz.service.calendar.ExpressionUiHelper"].getOccurrenceList() Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml Thu Aug 24 21:55:06 2017 @@ -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-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> <screenlet title="${uiLabelMap.WebtoolsGeosLinkExplained}"> <include-form name="LinkGeos" location="component://webtools/widget/GeoManagementForms.xml"/> </screenlet> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/widget/ServiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/widget/ServiceScreens.xml?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/widget/ServiceScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/widget/ServiceScreens.xml Thu Aug 24 21:55:06 2017 @@ -58,7 +58,7 @@ under the License. <include-screen name="JobManagerLockEnable"/> <section> <widgets> - <platform-specific><html><html-template location="component://common/template/includes/ServerHour24HourFormatJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common-theme/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/ofbiz-framework/trunk/framework/widget/config/widget.properties URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/config/widget.properties?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/config/widget.properties (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/config/widget.properties Thu Aug 24 21:55:06 2017 @@ -77,48 +77,48 @@ widget.link.default.layered-modal.height # # html output screen.name=html -screen.screenrenderer=component://widget/templates/HtmlScreenMacroLibrary.ftl -screen.formrenderer=component://widget/templates/HtmlFormMacroLibrary.ftl -screen.menurenderer=component://widget/templates/HtmlMenuMacroLibrary.ftl -screen.treerenderer=component://widget/templates/HtmlTreeMacroLibrary.ftl +screen.screenrenderer=component://common-theme/template/macro/HtmlScreenMacroLibrary.ftl +screen.formrenderer=component://common-theme/template/macro/HtmlFormMacroLibrary.ftl +screen.menurenderer=component://common-theme/template/macro/HtmlMenuMacroLibrary.ftl +screen.treerenderer=component://common-theme/template/macro/HtmlTreeMacroLibrary.ftl screen.encoder=html screen.compress=false screen.default.contenttype=UTF-8 screen.default.encoding=none # text output screentext.name=text -screentext.screenrenderer=component://widget/templates/TextScreenMacroLibrary.ftl -screentext.formrenderer=component://widget/templates/TextFormMacroLibrary.ftl -screentext.treerenderer=component://widget/templates/TextTreeMacroLibrary.ftl +screentext.screenrenderer=component://common-theme/template/macro/TextScreenMacroLibrary.ftl +screentext.formrenderer=component://common-theme/template/macro/TextFormMacroLibrary.ftl +screentext.treerenderer=component://common-theme/template/macro/TextTreeMacroLibrary.ftl screentext.default.contenttype=UTF-8 screentext.default.encoding=none # xml output screenxml.name=xml -screenxml.screenrenderer=component://widget/templates/XmlScreenMacroLibrary.ftl -screenxml.formrenderer=component://widget/templates/XmlFormMacroLibrary.ftl -screenxml.treerenderer=component://widget/templates/XmlTreeMacroLibrary.ftl +screenxml.screenrenderer=component://common-theme/template/macro/XmlScreenMacroLibrary.ftl +screenxml.formrenderer=component://common-theme/template/macro/XmlFormMacroLibrary.ftl +screenxml.treerenderer=component://common-theme/template/macro/XmlTreeMacroLibrary.ftl screenxml.encoder=xml screenxml.default.contenttype=UTF-8 screenxml.default.encoding=none # xls output screenxls.name=xls -screenxls.screenrenderer=component://widget/templates/XlsScreenMacroLibrary.ftl -screenxls.formrenderer=component://widget/templates/XlsFormMacroLibrary.ftl -screenxls.treerenderer=component://widget/templates/XlsTreeMacroLibrary.ftl +screenxls.screenrenderer=component://common-theme/template/macro/XlsScreenMacroLibrary.ftl +screenxls.formrenderer=component://common-theme/template/macro/XlsFormMacroLibrary.ftl +screenxls.treerenderer=component://common-theme/template/macro/XlsTreeMacroLibrary.ftl screenxls.encoder=html screenxls.default.contenttype=application/vnd.ms-excel screenxls.default.encoding=none # fo output screenfop.name=xsl-fo -screenfop.screenrenderer=component://widget/templates/FoScreenMacroLibrary.ftl -screenfop.formrenderer=component://widget/templates/FoFormMacroLibrary.ftl -screenfop.treerenderer=component://widget/templates/FoTreeMacroLibrary.ftl +screenfop.screenrenderer=component://common-theme/template/macro/FoScreenMacroLibrary.ftl +screenfop.formrenderer=component://common-theme/template/macro/FoFormMacroLibrary.ftl +screenfop.treerenderer=component://common-theme/template/macro/FoTreeMacroLibrary.ftl screenfop.default.contenttype=application/pdf screenfop.default.encoding=none # csv output screencsv.name=csv -screencsv.screenrenderer=component://widget/templates/CsvScreenMacroLibrary.ftl -screencsv.formrenderer=component://widget/templates/CsvFormMacroLibrary.ftl -screencsv.treerenderer=component://widget/templates/CsvTreeMacroLibrary.ftl +screencsv.screenrenderer=component://common-theme/template/macro/CsvScreenMacroLibrary.ftl +screencsv.formrenderer=component://common-theme/template/macro/CsvFormMacroLibrary.ftl +screencsv.treerenderer=component://common-theme/template/macro/CsvTreeMacroLibrary.ftl screencsv.default.contenttype=UTF-8 screencsv.default.encoding=none Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl Thu Aug 24 21:55:06 2017 @@ -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-theme/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/ofbiz-framework/trunk/themes/bluelight/template/Messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Messages.ftl?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Messages.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Messages.ftl Thu Aug 24 21:55:06 2017 @@ -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-theme/template/includes/Messages.ftl" /> </div> </#if> Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/includes/CommonMacros.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/includes/CommonMacros.ftl?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/common/template/includes/CommonMacros.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/common/template/includes/CommonMacros.ftl Thu Aug 24 21:55:06 2017 @@ -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-theme/template/includes/CommonMacros.ftl"/> --> <#assign Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/includes/fo/Start.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/includes/fo/Start.fo.ftl?rev=1806091&r1=1806090&r2=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/common/template/includes/fo/Start.fo.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/common/template/includes/fo/Start.fo.ftl Thu Aug 24 21:55:06 2017 @@ -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-theme/template/includes/fo/Pm-11x17.fo.ftl"/> + <#include "component://common-theme/template/includes/fo/Pm-iso216.fo.ftl"/> + <#include "component://common-theme/template/includes/fo/Pm-legal.fo.ftl"/> + <#include "component://common-theme/template/includes/fo/Pm-letter.fo.ftl"/> </#if> </fo:layout-master-set> <#assign masterReference = (layoutSettings.masterReference)?default("letter-portrait")/> Copied: ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml (from r1806090, ofbiz/ofbiz-framework/trunk/framework/common/widget/CommonScreens.xml) URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml?p2=ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml&p1=ofbiz/ofbiz-framework/trunk/framework/common/widget/CommonScreens.xml&r1=1806090&r2=1806091&rev=1806091&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml Thu Aug 24 21:55:06 2017 @@ -25,45 +25,36 @@ 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-theme/template/includes/States.ftl"/></html></platform-specific> </widgets> </section> </screen> <screen name="countries"> <section> - <actions> - <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-theme/template/includes/Countries.ftl"/></html></platform-specific> </widgets> </section> </screen> <screen name="cctypes"> <section> - <actions> - <script location="component://common/groovyScripts/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-theme/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-theme/template/includes/CcMonths.ftl"/></html></platform-specific> </widgets> </section> </screen> <screen name="ccyears"> <section> - <actions> - <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-theme/template/includes/CcYears.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -89,26 +80,23 @@ 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-theme/template/includes/GenericLink.ftl"/></html></platform-specific> </widgets> </section> </screen> <!-- decorator used in creating a response to an ajax request --> <screen name="AjaxGlobalDecorator"> <section> - <actions> - <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true" /> - </actions> <widgets> <platform-specific> <html> - <html-template location="component://common/template/includes/HtmlHeaderForAjax.ftl" /> + <html-template location="component://common-theme/template/includes/HtmlHeaderForAjax.ftl" /> </html> </platform-specific> <decorator-section-include name="body" /> <platform-specific> <html> - <html-template location="component://common/template/includes/HtmlFooterForAjax.ftl" /> + <html-template location="component://common-theme/template/includes/HtmlFooterForAjax.ftl" /> </html> </platform-specific> </widgets> @@ -126,7 +114,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-theme/template/includes/AjaxAutocompleteOptions.ftl" /></html> </platform-specific> </decorator-section> </decorator-screen> @@ -379,7 +367,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-theme/template/includes/Messages.ftl"/> </actions> <widgets> <section> @@ -387,7 +375,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-theme/template/includes/Lookup.ftl" /></html></platform-specific> </widgets> </section> <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific> @@ -416,7 +404,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-theme/template/includes/LookupFooter.ftl"/></html></platform-specific> </widgets> </section> </widgets> @@ -434,7 +422,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-theme/template/includes/AjaxAutocompleteOptions.ftl" /> </html> </platform-specific> </decorator-section> @@ -455,7 +443,6 @@ under the License. <!-- The default (global) java scripts --> <!-- jQuery part --> <!-- Load available JS Language Files --> - <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/> <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.apache.ofbiz.common.JsLanguageFilesMapping.datejs.getFilePath(initialLocaleComplete)}" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.apache.ofbiz.common.JsLanguageFilesMapping.jquery.getFilePath(initialLocaleComplete)}" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.apache.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true"/> @@ -488,12 +475,12 @@ 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/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> - <xls><html-template location="component://common/template/includes/Simple.xls.ftl"/></xls> + <html><html-template location="component://common-theme/template/includes/Simple.ftl"/></html> + <xsl-fo><html-template location="component://common-theme/template/includes/Simple.fo.ftl"/></xsl-fo> + <xml><html-template location="component://common-theme/template/includes/MinimalDecorator.ftl"/></xml> + <text><html-template location="component://common-theme/template/includes/MinimalDecorator.ftl"/></text> + <csv><html-template location="component://common-theme/template/includes/MinimalDecorator.ftl"/></csv> + <xls><html-template location="component://common-theme/template/includes/Simple.xls.ftl"/></xls> </platform-specific> </widgets> </section> @@ -508,7 +495,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-theme/template/includes/ReportTemplate.fo.ftl"/></xsl-fo></platform-specific> </widgets> </section> </screen> @@ -522,13 +509,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/BasicHeader.fo.ftl"/> - <html-template location="component://common/template/includes/fo/BasicFooter.fo.ftl"/> + <html-template location="component://common-theme/template/includes/fo/Start.fo.ftl"/> + <html-template location="component://common-theme/template/includes/fo/BasicHeader.fo.ftl"/> + <html-template location="component://common-theme/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-theme/template/includes/fo/End.fo.ftl"/></xsl-fo></platform-specific> </widgets> </section> </screen> @@ -537,13 +524,12 @@ under the License. <screen name="FoError"> <section> <actions> - <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="logoImageUrl" value="/images/ofbiz_logo.gif"/> </actions> <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-theme/template/Error.fo.ftl"/></xsl-fo></platform-specific> --> </decorator-section> </decorator-screen> </widgets> @@ -560,7 +546,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-theme/template/Login.ftl"/> </actions> <widgets /> </section> @@ -587,22 +573,12 @@ under the License. <screen name="requirePasswordChange"> <section> - <actions> - <set field="userLoginId" from-field="parameters.USERNAME"/> - <entity-and entity-name="UserLoginSecurityQuestion" list="securityQuestions"> - <field-map field-name="userLoginId" /> - </entity-and> - <set field="questionEnumId" from-field="securityQuestions[0].questionEnumId" /> - <entity-one entity-name="Enumeration" value-field="securityQuestion"> - <field-map field-name="enumId" from-field="questionEnumId" /> - </entity-one> - </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <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-theme/template/ChangePassword.ftl"/> </actions> <widgets /> </section> @@ -622,7 +598,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-theme/template/ForgotPassword.ftl"/> </actions> <widgets /> </section> @@ -652,7 +628,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-theme/template/GetSecurityQuestion.ftl"/> </actions> <widgets /> </section> @@ -672,7 +648,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-theme/template/ForgotPassword.ftl"/> </actions> <widgets /> </section> @@ -687,11 +663,8 @@ under the License. <screen name="EventMessages"> <section> - <actions> - <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-theme/template/includes/Messages.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -730,7 +703,7 @@ under the License. <screen name="help"> <section> <actions> - <set field="titleProperty" value="PageTitleHelp"></set> + <set field="titleProperty" value="PageTitleHelp"/> <property-map resource="CommonHelpUiLabels" map-name="uiLabelMap" global="true"/> <set field="helpText" value="${uiLabelMap[parameters.topic]}" default-value="${uiLabelMap.HelpNotFound}"/> </actions> @@ -748,12 +721,12 @@ under the License. <screen name="viewBlocked"> <section> <actions> - <set field="titleProperty" value="PageTitleViewBlocked"></set> + <set field="titleProperty" value="PageTitleViewBlocked"/> <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-theme/template/ViewBlocked.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -765,7 +738,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-theme/template/includes/GeoLocation.ftl"/></html> </platform-specific> </widgets> </section> Added: ofbiz/ofbiz-framework/trunk/themes/common/widget/HelpScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/HelpScreens.xml?rev=1806091&view=auto ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/common/widget/HelpScreens.xml (added) +++ ofbiz/ofbiz-framework/trunk/themes/common/widget/HelpScreens.xml Thu Aug 24 21:55:06 2017 @@ -0,0 +1,208 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + <screen name="LookupHelpDecorator"> + <section> + <actions> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> + <service service-name="getUserPreferenceGroup" result-map="prefResult"> + <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="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-theme/template/includes/Messages.ftl"/> + </actions> + <widgets> + <platform-specific><html><html-template location="component://common-theme/template/includes/Lookup.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific> + <container style="contentarea"> + <container id="column-container"> + <!-- by default will render left-bar only if leftbarScreen value not empty --> + <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/> + <container id="content-main-section" style="${MainColumnStyle}"> + <decorator-section-include name="body"/> + </container> + </container> + </container> + <container style="clear"></container> + + <platform-specific><html><html-template location="component://common-theme/template/includes/LookupFooter.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> + + <screen name="ShowHelp"> + <section> + <condition> + <and> + <if-compare field="parameters.helpTopic" operator="equals" value="navigateHelp"/> + <if-empty field="parameters.portalPageId"/> + </and> + </condition> + <widgets> + <include-screen name="navigateHelp"/> + </widgets> + <fail-widgets> + <section> + <condition> + <if-empty field="parameters.portalPageId"/> + </condition> + <actions> + <entity-condition entity-name="ContentAssoc" list="contentAssocs"> + <condition-list> + <condition-expr field-name="mapKey" from-field="parameters.helpTopic"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/> + <condition-list combine="or"> + <condition-expr field-name="thruDate" operator="greater-equals" from-field="nowTimestamp"/> + <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/> + </condition-list> + </condition-list> + <order-by field-name="sequenceNum"/> + </entity-condition> + <set field="contentId" from-field="contentAssocs[0].contentIdTo"/> + <entity-one entity-name="Content" value-field="content"/> + </actions> + <widgets> + <section> + <condition> + <if-empty field="content"/> + </condition> + <widgets> + <include-screen name="navigateHelp"/> + </widgets> + <fail-widgets> + <decorator-screen name="LookupHelpDecorator"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.CommonExtHelpTitle}" navigation-menu-name="lookupMenu"> + <include-menu name="lookupMenu" location="component://content/widget/content/ContentMenus.xml"/> + <iterate-section entry="contentAssoc" list="contentAssocs"> + <section> + <actions> + <set field="contentId" from-field="contentAssoc.contentIdTo"/> + </actions> + <widgets> + <include-screen name="showDocumentHelp" /> + </widgets> + </section> + </iterate-section> + </screenlet> + </decorator-section> + </decorator-screen> + </fail-widgets> + </section> + </widgets> + <fail-widgets> + <section> + <actions> + <!-- Read portalPage to retrieve helpContentId, + if portalPage.originalPortalPageId is not null retrieve originalPortalPage--> + <entity-one entity-name="PortalPage" value-field="portalPageTmp" use-cache="true"/> + <set field="originalPortalPageId" from-field="portalPageTmp.originalPortalPageId" default-value="${parameters.portalPageId}"/> + <entity-one entity-name="PortalPage" value-field="portalPage" use-cache="true"> + <field-map field-name="portalPageId" from-field="originalPortalPageId"/> + </entity-one> + </actions> + <widgets> + <decorator-screen name="LookupHelpDecorator"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.CommonExtHelpTitle}" navigation-menu-name="lookupMenu"> + <include-menu name="lookupMenu" location="component://content/widget/content/ContentMenus.xml"/> + <content content-id="${portalPage.helpContentId}"/> + </screenlet> + <screenlet title="${uiLabelMap.CommonSelectPortletToHelp}"> + <include-form name="PortletList" location="component://common/widget/PortalPageForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </fail-widgets> + </section> + </fail-widgets> + </section> + </screen> + + <screen name="showDocumentHelp"> + <section> + <actions> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/> + <set field="contentId" from-field="parameters.contentId" default-value="${contentId}"/> + <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"/> + </actions> + <widgets> + <container id="Document"> + <content content-id="${contentId}" /> + </container> + </widgets> + </section> + </screen> + + <screen name="navigateHelp"> + <section> + <actions> + <set field="titleProperty" value="PageTitleNavigateContent"/> + <entity-condition entity-name="ContentAssoc" list="contentAssoc"> + <condition-list> + <condition-expr field-name="contentId" value="HELP_ROOT"/> + <condition-expr field-name="contentAssocTypeId" value="TREE_CHILD"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/> + <condition-list combine="or"> + <condition-expr field-name="thruDate" operator="greater-equals" from-field="nowTimestamp"/> + <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/> + </condition-list> + </condition-list> + <order-by field-name="sequenceNum"/> + </entity-condition> + <set field="contentId" from-field="parameters.contentId" default-value="HELP_ROOT"/> + </actions> + <widgets> + <decorator-screen name="LookupHelpDecorator"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.PageTitleNavigateContent}" > + <container style="left-border"> + <container id="EditDocumentTree"/> + <platform-specific><html><html-template location="component://content/template/content/DisplayContentNav.ftl"/></html></platform-specific> + </container> + <container style="leftonly"> + <include-screen name="showDocumentHelp"/> + </container> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> Propchange: ofbiz/ofbiz-framework/trunk/themes/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/ofbiz-framework/trunk/themes/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/themes/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |