Author: hansbak
Date: Mon Mar 11 07:35:16 2013
New Revision: 1455024
URL: http://svn.apache.org/r1455024
Log:
make the webtools screens use the decorator location from web.xml
Modified:
ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.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/MiscScreens.xml
ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
Modified: ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml?rev=1455024&r1=1455023&r2=1455024&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml Mon Mar 11
07:35:16 2013
@@ -31,7 +31,7 @@ under the License.
<script
location="component://webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonArtifactDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <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>
</decorator-section>
Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=1455024&r1=1455023&r2=1455024&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Mon Mar 11 07:35:16
2013
@@ -35,7 +35,7 @@ under the License.
<script
location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntitySQLProcessor.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonEntityDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonEntityDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://webtools/webapp/webtools/entity/EntitySQLProcessor.ftl"/></html>
@@ -54,7 +54,7 @@ under the License.
<set field="results" from-field="parameters.results"/>
</actions>
<widgets>
- <decorator-screen name="CommonImportExportDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonImportExportDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
<platform-specific>
@@ -76,7 +76,7 @@ under the License.
<set field="messages" from-field="parameters.messages"/>
</actions>
<widgets>
- <decorator-screen name="CommonImportExportDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonImportExportDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
<platform-specific>
@@ -98,7 +98,7 @@ under the License.
<set field="messages" from-field="parameters.messages"/>
</actions>
<widgets>
- <decorator-screen name="CommonImportExportDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonImportExportDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
<platform-specific>
@@ -120,7 +120,7 @@ under the License.
<set field="messages" from-field="parameters.messages"/>
</actions>
<widgets>
- <decorator-screen name="CommonImportExportDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonImportExportDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
<platform-specific>
@@ -141,7 +141,7 @@ under the License.
<script
location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonEntityDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonEntityDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template
location="component://webtools/webapp/webtools/entity/EntityMaint.ftl"/></html>
@@ -166,7 +166,7 @@ under the License.
<set field="tabButtonItem" value="entitymaint"/>
</actions>
<widgets>
- <decorator-screen name="CommonEntityDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonEntityDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
@@ -212,7 +212,7 @@ under the License.
<set field="tabButtonItem" value="entitymaint"/>
</actions>
<widgets>
- <decorator-screen name="CommonEntityDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <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>
@@ -237,7 +237,7 @@ under the License.
<set field="tabButtonItem" value="entitymaint"/>
</actions>
<widgets>
- <decorator-screen name="CommonEntityDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <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>
@@ -359,7 +359,7 @@ under the License.
<set field="tabButtonItem" value="entityEoModelBundle"/>
</actions>
<widgets>
- <decorator-screen name="CommonImportExportDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonImportExportDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
<include-form name="EntityEoModelBundle"
location="component://webtools/widget/EntityForms.xml"/>
@@ -379,7 +379,7 @@ under the License.
<script
location="component://webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonEntityDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <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>
@@ -401,7 +401,7 @@ under the License.
<script
location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonEntityDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonEntityDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
<label>${uiLabelMap.WebtoolsNotePerformanceResultsMayVary}</label>
@@ -426,7 +426,7 @@ under the License.
<script
location="component://webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonImportExportDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <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>
@@ -445,7 +445,7 @@ under the License.
<set field="labelTitleProperty" value="ConnectionPoolStatus"/>
</actions>
<widgets>
- <decorator-screen name="CommonEntityDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <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>
Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml?rev=1455024&r1=1455023&r2=1455024&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml Mon Mar 11
07:35:16 2013
@@ -28,7 +28,7 @@
<set field="headerItem" value="Geos"/>
</actions>
<widgets>
- <decorator-screen name="CommonGeoManagementDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonGeoManagementDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="no-clear">
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
@@ -58,7 +58,7 @@
<entity-one entity-name="Geo" value-field="geo"/>
</actions>
<widgets>
- <decorator-screen name="CommonGeoManagementDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonGeoManagementDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.WebtoolsGeoEdit}">
<include-form name="EditGeo"
location="component://webtools/widget/GeoManagementForms.xml"/>
@@ -118,7 +118,7 @@
<set field="asm_responseName" value="geoList"/>
</actions>
<widgets>
- <decorator-screen name="CommonGeoManagementDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonGeoManagementDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template
location="component://common/webcommon/includes/setMultipleSelectJs.ftl"/></html></platform-specific>
<screenlet
title="${uiLabelMap.WebtoolsGeosLinkExplained}">
Modified: ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml?rev=1455024&r1=1455023&r2=1455024&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml Mon Mar 11
07:35:16 2013
@@ -32,7 +32,7 @@ under the License.
<script
location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/LabelManager.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonArtifactDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonArtifactDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=1455024&r1=1455023&r2=1455024&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Mon Mar 11 07:35:16
2013
@@ -28,7 +28,7 @@ under the License.
<set field="tabButtonItem" value="viewents"/>
</actions>
<widgets>
- <decorator-screen name="CommonArtifactDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonArtifactDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template
location="component://webtools/webapp/webtools/component/viewComponents.ftl"/></html></platform-specific>
</decorator-section>
@@ -46,7 +46,7 @@ under the License.
<script
location="component://webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonImportExportDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <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>
Modified: ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml?rev=1455024&r1=1455023&r2=1455024&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml Mon Mar 11
07:35:16 2013
@@ -29,7 +29,7 @@ under the License.
<set field="title" value="${uiLabelMap[titleProperty]}"
global="true"/>
</actions>
<widgets>
- <decorator-screen name="CommonConfigurationDecorator"
location="component://webtools/widget/CommonScreens.xml">
+ <decorator-screen name="CommonConfigurationDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
