You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/04/11 14:57:46 UTC
svn commit: r1738581 - in /ofbiz/trunk:
applications/commonext/widget/ofbizsetup/ framework/webtools/template/
framework/webtools/template/artifactinfo/ framework/webtools/template/cert/
framework/webtools/template/datafile/ framework/webtools/template...
Author: deepak
Date: Mon Apr 11 12:57:45 2016
New Revision: 1738581
URL: http://svn.apache.org/viewvc?rev=1738581&view=rev
Log:
(OFBIZ-6824) Apply slightly modified patch from jira issue, updated path for ping.ftl and showDateTime.ftl in controller.xml
============================================================
relocate .ftl files in the framework/webtools component
============================================================
Thanks Pierre Smits for your contribution.
Added:
ofbiz/trunk/framework/webtools/template/
ofbiz/trunk/framework/webtools/template/artifactinfo/
- copied from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/
ofbiz/trunk/framework/webtools/template/cert/
- copied from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/cert/
ofbiz/trunk/framework/webtools/template/datafile/
- copied from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/datafile/
ofbiz/trunk/framework/webtools/template/entity/
- copied from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/entity/
ofbiz/trunk/framework/webtools/template/geo/
- copied from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/geo/
ofbiz/trunk/framework/webtools/template/labelmanager/
- copied from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/
ofbiz/trunk/framework/webtools/template/log/
- copied from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/log/
ofbiz/trunk/framework/webtools/template/main.ftl
- copied unchanged from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
ofbiz/trunk/framework/webtools/template/ping.ftl
- copied unchanged from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/ping.ftl
ofbiz/trunk/framework/webtools/template/service/
- copied from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/service/
ofbiz/trunk/framework/webtools/template/showDateTime.ftl
- copied unchanged from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/showDateTime.ftl
ofbiz/trunk/framework/webtools/template/tempexpr/
- copied from r1738580, ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/
Removed:
ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/
ofbiz/trunk/framework/webtools/webapp/webtools/cert/
ofbiz/trunk/framework/webtools/webapp/webtools/datafile/
ofbiz/trunk/framework/webtools/webapp/webtools/entity/
ofbiz/trunk/framework/webtools/webapp/webtools/geo/
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/
ofbiz/trunk/framework/webtools/webapp/webtools/log/
ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/ping.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/service/
ofbiz/trunk/framework/webtools/webapp/webtools/showDateTime.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/
Modified:
ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMaint.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml
ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml
ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml
ofbiz/trunk/framework/webtools/widget/LogScreens.xml
ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml Mon Apr 11 12:57:45 2016
@@ -148,7 +148,7 @@
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEntityExportAll}">
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/EntityExportAll.ftl"/></html>
+ <html><html-template location="component://webtools/template/entity/EntityExportAll.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
Modified: ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMaint.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMaint.ftl?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMaint.ftl (original)
+++ ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMaint.ftl Mon Apr 11 12:57:45 2016
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#include "component://webtools/webapp/webtools/tempexpr/tempExprMacros.ftl"/>
+<#include "component://webtools/template/tempexpr/tempExprMacros.ftl"/>
<h1>${title}</h1>
<#if temporalExpression?has_content>
<#-- Edit existing expression -->
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Mon Apr 11 12:57:45 2016
@@ -609,8 +609,8 @@ under the License.
<!-- View Mappings -->
<view-map name="main" type="screen" page="component://webtools/widget/CommonScreens.xml#main"/>
- <view-map name="ping" type="ftl" page="component://webtools/webapp/webtools/ping.ftl"/>
- <view-map name="showDateTime" type="ftl" page="component://webtools/webapp/webtools/showDateTime.ftl"/>
+ <view-map name="ping" type="ftl" page="component://webtools/template/ping.ftl"/>
+ <view-map name="showDateTime" type="ftl" page="component://webtools/template/showDateTime.ftl"/>
<view-map name="entityref" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityRef"/>
<view-map name="entityref_list" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityRefList"/>
Modified: ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml Mon Apr 11 12:57:45 2016
@@ -33,7 +33,7 @@ under the License.
<widgets>
<decorator-screen name="CommonArtifactDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/artifactinfo/ArtifactInfo.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Mon Apr 11 12:57:45 2016
@@ -23,6 +23,7 @@ under the License.
<screen name="main-decorator">
<section>
<actions>
+ <set field="activeApp" value="webtools" global="true"/>
<!-- base/top/specific map first, then more common map added for shared labels -->
<property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/>
@@ -35,8 +36,6 @@ under the License.
<!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
- <set field="activeApp" value="webtools" global="true"/>
- <!-- <set field="appheaderTemplate" value="component://webtools/webapp/webtools/includes/appheader.ftl" global="true"/> -->
<!-- Help link actions -->
<set field="helpTopic" value="${groovy: webappName.toUpperCase() + '_' + requestAttributes._CURRENT_VIEW_}"/>
<set field="applicationMenuLocation" value="component://webtools/widget/Menus.xml" global="true"/>
@@ -58,7 +57,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/main.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/main.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -67,14 +66,14 @@ under the License.
<screen name="printStart">
<section>
<widgets>
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/print/printStart.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/printStart.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
<screen name="printDone">
<section>
<widgets>
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/print/printDone.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/printDone.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -87,7 +86,7 @@ under the License.
<widgets>
<decorator-screen name="CommonConfigurationDecorator" location="component://webtools/widget/CommonScreens.xml">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/cert/viewbrowsercerts.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/cert/viewbrowsercerts.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Mon Apr 11 12:57:45 2016
@@ -39,7 +39,7 @@ under the License.
<decorator-section name="body">
<include-form name="EntitySQLCommand" location="component://webtools/widget/EntityForms.xml"/>
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/EntitySQLProcessor.ftl"/></html>
+ <html><html-template location="component://webtools/template/entity/EntitySQLProcessor.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -59,7 +59,7 @@ under the License.
<decorator-section name="body">
<screenlet>
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/EntityExportAll.ftl"/></html>
+ <html><html-template location="component://webtools/webapp/template/EntityExportAll.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -82,7 +82,7 @@ under the License.
</screenlet>
<screenlet>
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/ProgramExport.ftl"/></html>
+ <html><html-template location="component://webtools/template/entity/ProgramExport.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -104,7 +104,7 @@ under the License.
<decorator-section name="body">
<screenlet>
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/EntityImportDir.ftl"/></html>
+ <html><html-template location="component://webtools/template/entity/EntityImportDir.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -126,7 +126,7 @@ under the License.
<decorator-section name="body">
<screenlet>
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/EntityImport.ftl"/></html>
+ <html><html-template location="component://webtools/template/entity/EntityImport.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -148,7 +148,7 @@ under the License.
<decorator-section name="body">
<screenlet>
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/EntityImportReaders.ftl"/></html>
+ <html><html-template location="component://webtools/template/entity/EntityImportReaders.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -219,12 +219,12 @@ under the License.
</decorator-section>
<decorator-section name="search-options">
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/FindGeneric.ftl"/></html>
+ <html><html-template location="component://webtools/template/entity/FindGeneric.ftl"/></html>
</platform-specific>
</decorator-section>
<decorator-section name="search-results">
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/ListGeneric.ftl"/></html>
+ <html><html-template location="component://webtools/template/entity/ListGeneric.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -251,7 +251,7 @@ under the License.
<decorator-screen name="CommonEntityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/ViewGeneric.ftl"/></html>
+ <html><html-template location="component://webtools/template/entity/ViewGeneric.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -276,7 +276,7 @@ under the License.
<decorator-screen name="CommonEntityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/ViewRelations.ftl"/></html>
+ <html><html-template location="component://webtools/template/entity/ViewRelations.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -301,7 +301,7 @@ under the License.
<widgets>
<platform-specific>
<html>
- <html-template location="component://webtools/webapp/webtools/entity/EntityRef.ftl"/>
+ <html-template location="component://webtools/template/entity/EntityRef.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -329,7 +329,7 @@ under the License.
<widgets>
<platform-specific>
<html>
- <html-template location="component://webtools/webapp/webtools/entity/EntityRefMain.ftl"/>
+ <html-template location="component://webtools/template/entity/EntityRefMain.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -355,7 +355,7 @@ under the License.
<widgets>
<platform-specific>
<html>
- <html-template location="component://webtools/webapp/webtools/entity/EntityRefList.ftl"/>
+ <html-template location="component://webtools/template/entity/EntityRefList.ftl"/>
</html>
</platform-specific>
</widgets>
@@ -379,7 +379,7 @@ under the License.
<widgets>
<platform-specific>
<xsl-fo>
- <html-template location="component://webtools/webapp/webtools/entity/EntityRefReport.fo.ftl"/>
+ <html-template location="component://webtools/template/entity/EntityRefReport.fo.ftl"/>
</xsl-fo>
</platform-specific>
</widgets>
@@ -418,7 +418,7 @@ under the License.
<decorator-screen name="CommonEntityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/entity/CheckDb.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/entity/CheckDb.ftl"/></html></platform-specific>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -465,7 +465,7 @@ under the License.
<decorator-screen name="CommonImportExportDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/entity/xmldsdump.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/entity/xmldsdump.ftl"/></html></platform-specific>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -484,7 +484,7 @@ under the License.
<decorator-screen name="CommonEntityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl"/></html>
+ <html><html-template location="component://webtools/template/entity/ConnectionPoolStatus.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml Mon Apr 11 12:57:45 2016
@@ -64,7 +64,7 @@
</screenlet>
<screenlet title="${uiLabelMap.CommonMap}">
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/geo/GeoLocation.ftl"/></html>
+ <html><html-template location="component://webtools/template/geo/GeoLocation.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
Modified: ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml Mon Apr 11 12:57:45 2016
@@ -36,15 +36,15 @@ under the License.
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/SearchLabels.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/labelmanager/SearchLabels.ftl"/></html></platform-specific>
</decorator-section>
<decorator-section name="search-results">
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewLabels.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/labelmanager/ViewLabels.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
<!--
<screenlet id="ViewHardcodedLabelsPanel" title="${uiLabelMap.WebtoolsLabelManagerHardcoded}" collapsible="false">
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/labelmanager/ViewHardcodedLabels.ftl"/></html></platform-specific>
</screenlet>
-->
</decorator-section>
@@ -71,7 +71,7 @@ under the License.
<container style="h1">
<label text="${uiLabelMap.WebtoolsLabelManagerAddNew}"/>
</container>
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/UpdateLabel.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/labelmanager/UpdateLabel.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -93,7 +93,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewReferences.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/labelmanager/ViewReferences.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -116,7 +116,7 @@ under the License.
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet id="ViewFilePanel" title="${uiLabelMap.WebtoolsLabelManagerViewFile}">
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewFile.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/labelmanager/ViewFile.ftl"/></html></platform-specific>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Mon Apr 11 12:57:45 2016
@@ -115,7 +115,7 @@ under the License.
<label>${logFileName}</label>
</container>
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/log/logContent.ftl"/></html>
+ <html><html-template location="component://webtools/template/log/logContent.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Mon Apr 11 12:57:45 2016
@@ -33,7 +33,7 @@ under the License.
<decorator-screen name="CommonImportExportDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/datafile/viewdatafile.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/datafile/viewdatafile.ftl"/></html></platform-specific>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Mon Apr 11 12:57:45 2016
@@ -33,7 +33,7 @@ under the License.
<decorator-section name="body">
<platform-specific>
<html>
- <html-template location="component://webtools/webapp/webtools/service/availableservices.ftl"/>
+ <html-template location="component://webtools/template/service/availableservices.ftl"/>
</html>
</platform-specific>
</decorator-section>
@@ -112,7 +112,7 @@ under the License.
</screenlet>
<screenlet title="${uiLabelMap.WebtoolsGeneralJavaThreads}">
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/service/threads.ftl"/></html>
+ <html><html-template location="component://webtools/template/service/threads.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -172,7 +172,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.WebtoolsStep2ServiceParameters}">
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/service/setServiceParameter.ftl"/></html>
+ <html><html-template location="component://webtools/template/service/setServiceParameter.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -194,7 +194,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleScheduleJob}">
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/service/setServiceParameterSync.ftl"/></html>
+ <html><html-template location="component://webtools/template/service/setServiceParameterSync.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -215,7 +215,7 @@ under the License.
<decorator-screen name="CommonServiceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/service/serviceResult.ftl"/></html>
+ <html><html-template location="component://webtools/template/service/serviceResult.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml?rev=1738581&r1=1738580&r2=1738581&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml Mon Apr 11 12:57:45 2016
@@ -99,7 +99,7 @@ under the License.
<decorator-section name="body">
<include-menu name="TempExprTabBar" location="component://webtools/widget/Menus.xml"/>
<platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/tempexpr/tempExprMaint.ftl"/></html>
+ <html><html-template location="component://webtools/template/tempexpr/tempExprMaint.ftl"/></html>
</platform-specific>
<section>
<condition>