From 5063287ddf3b7cfbfd94f2ee3fc5a952ff12b4e5 Mon Sep 17 00:00:00 2001 From: Deepak Dixit Date: Mon, 11 Apr 2016 12:57:45 +0000 Subject: [PATCH] (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. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738581 13f79535-47bb-0310-9956-ffa450edef68 --- .../widget/ofbizsetup/CommonScreens.xml | 2 +- .../artifactinfo/ArtifactInfo.ftl | 0 .../cert/viewbrowsercerts.ftl | 0 .../datafile/viewdatafile.ftl | 0 .../webtools => template}/entity/CheckDb.ftl | 0 .../entity/ConnectionPoolStatus.ftl | 0 .../entity/EntityExportAll.ftl | 0 .../entity/EntityImport.ftl | 0 .../entity/EntityImportDir.ftl | 0 .../entity/EntityImportReaders.ftl | 0 .../entity/EntityMaint.ftl | 0 .../entity/EntityRef.ftl | 0 .../entity/EntityRefList.ftl | 0 .../entity/EntityRefMain.ftl | 0 .../entity/EntityRefReport.fo.ftl | 0 .../entity/EntitySQLProcessor.ftl | 0 .../entity/FindGeneric.ftl | 0 .../entity/ListGeneric.ftl | 0 .../entity/ModelGroupWriter.jsp | 0 .../entity/ModelInduceFromDb.jsp | 0 .../entity/ModelWriter.jsp | 0 .../entity/ProgramExport.ftl | 0 .../entity/ViewGeneric.ftl | 0 .../entity/ViewRelations.ftl | 0 .../entity/dataMySql.jsp | 0 .../entity/droptablesMySql.jsp | 0 .../entity/droptablesplain.jsp | 0 .../entity/tablesMySql.jsp | 0 .../entity/xmldsdump.ftl | 0 .../entity/xmldsrawdump.jsp | 0 .../webtools => template}/geo/GeoLocation.ftl | 0 .../labelmanager/SearchLabels.ftl | 0 .../labelmanager/UpdateLabel.ftl | 0 .../labelmanager/ViewFile.ftl | 0 .../labelmanager/ViewHardcodedLabels.ftl | 0 .../labelmanager/ViewLabels.ftl | 0 .../labelmanager/ViewReferences.ftl | 0 .../webtools => template}/log/logContent.ftl | 0 .../{webapp/webtools => template}/main.ftl | 0 .../{webapp/webtools => template}/ping.ftl | 0 .../service/availableservices.ftl | 0 .../service/serviceResult.ftl | 0 .../service/setServiceParameter.ftl | 0 .../service/setServiceParameterSync.ftl | 0 .../webtools => template}/service/threads.ftl | 0 .../webtools => template}/showDateTime.ftl | 0 .../tempexpr/tempExprMacros.ftl | 0 .../tempexpr/tempExprMaint.ftl | 2 +- .../webapp/webtools/WEB-INF/controller.xml | 4 +-- .../webtools/widget/ArtifactInfoScreens.xml | 2 +- framework/webtools/widget/CommonScreens.xml | 11 +++--- framework/webtools/widget/EntityScreens.xml | 34 +++++++++---------- .../webtools/widget/GeoManagementScreens.xml | 2 +- .../webtools/widget/LabelManagerScreens.xml | 12 +++---- framework/webtools/widget/LogScreens.xml | 2 +- framework/webtools/widget/MiscScreens.xml | 2 +- framework/webtools/widget/ServiceScreens.xml | 10 +++--- framework/webtools/widget/TempExprScreens.xml | 2 +- 58 files changed, 42 insertions(+), 43 deletions(-) rename framework/webtools/{webapp/webtools => template}/artifactinfo/ArtifactInfo.ftl (100%) rename framework/webtools/{webapp/webtools => template}/cert/viewbrowsercerts.ftl (100%) rename framework/webtools/{webapp/webtools => template}/datafile/viewdatafile.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/CheckDb.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/ConnectionPoolStatus.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/EntityExportAll.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/EntityImport.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/EntityImportDir.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/EntityImportReaders.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/EntityMaint.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/EntityRef.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/EntityRefList.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/EntityRefMain.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/EntityRefReport.fo.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/EntitySQLProcessor.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/FindGeneric.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/ListGeneric.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/ModelGroupWriter.jsp (100%) rename framework/webtools/{webapp/webtools => template}/entity/ModelInduceFromDb.jsp (100%) rename framework/webtools/{webapp/webtools => template}/entity/ModelWriter.jsp (100%) rename framework/webtools/{webapp/webtools => template}/entity/ProgramExport.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/ViewGeneric.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/ViewRelations.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/dataMySql.jsp (100%) rename framework/webtools/{webapp/webtools => template}/entity/droptablesMySql.jsp (100%) rename framework/webtools/{webapp/webtools => template}/entity/droptablesplain.jsp (100%) rename framework/webtools/{webapp/webtools => template}/entity/tablesMySql.jsp (100%) rename framework/webtools/{webapp/webtools => template}/entity/xmldsdump.ftl (100%) rename framework/webtools/{webapp/webtools => template}/entity/xmldsrawdump.jsp (100%) rename framework/webtools/{webapp/webtools => template}/geo/GeoLocation.ftl (100%) rename framework/webtools/{webapp/webtools => template}/labelmanager/SearchLabels.ftl (100%) rename framework/webtools/{webapp/webtools => template}/labelmanager/UpdateLabel.ftl (100%) rename framework/webtools/{webapp/webtools => template}/labelmanager/ViewFile.ftl (100%) rename framework/webtools/{webapp/webtools => template}/labelmanager/ViewHardcodedLabels.ftl (100%) rename framework/webtools/{webapp/webtools => template}/labelmanager/ViewLabels.ftl (100%) rename framework/webtools/{webapp/webtools => template}/labelmanager/ViewReferences.ftl (100%) rename framework/webtools/{webapp/webtools => template}/log/logContent.ftl (100%) rename framework/webtools/{webapp/webtools => template}/main.ftl (100%) rename framework/webtools/{webapp/webtools => template}/ping.ftl (100%) rename framework/webtools/{webapp/webtools => template}/service/availableservices.ftl (100%) rename framework/webtools/{webapp/webtools => template}/service/serviceResult.ftl (100%) rename framework/webtools/{webapp/webtools => template}/service/setServiceParameter.ftl (100%) rename framework/webtools/{webapp/webtools => template}/service/setServiceParameterSync.ftl (100%) rename framework/webtools/{webapp/webtools => template}/service/threads.ftl (100%) rename framework/webtools/{webapp/webtools => template}/showDateTime.ftl (100%) rename framework/webtools/{webapp/webtools => template}/tempexpr/tempExprMacros.ftl (100%) rename framework/webtools/{webapp/webtools => template}/tempexpr/tempExprMaint.ftl (99%) diff --git a/applications/commonext/widget/ofbizsetup/CommonScreens.xml b/applications/commonext/widget/ofbizsetup/CommonScreens.xml index 61908efa6b..5f942d12cc 100644 --- a/applications/commonext/widget/ofbizsetup/CommonScreens.xml +++ b/applications/commonext/widget/ofbizsetup/CommonScreens.xml @@ -148,7 +148,7 @@ - + diff --git a/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl b/framework/webtools/template/artifactinfo/ArtifactInfo.ftl similarity index 100% rename from framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl rename to framework/webtools/template/artifactinfo/ArtifactInfo.ftl diff --git a/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl b/framework/webtools/template/cert/viewbrowsercerts.ftl similarity index 100% rename from framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl rename to framework/webtools/template/cert/viewbrowsercerts.ftl diff --git a/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl b/framework/webtools/template/datafile/viewdatafile.ftl similarity index 100% rename from framework/webtools/webapp/webtools/datafile/viewdatafile.ftl rename to framework/webtools/template/datafile/viewdatafile.ftl diff --git a/framework/webtools/webapp/webtools/entity/CheckDb.ftl b/framework/webtools/template/entity/CheckDb.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/CheckDb.ftl rename to framework/webtools/template/entity/CheckDb.ftl diff --git a/framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl b/framework/webtools/template/entity/ConnectionPoolStatus.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl rename to framework/webtools/template/entity/ConnectionPoolStatus.ftl diff --git a/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl b/framework/webtools/template/entity/EntityExportAll.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/EntityExportAll.ftl rename to framework/webtools/template/entity/EntityExportAll.ftl diff --git a/framework/webtools/webapp/webtools/entity/EntityImport.ftl b/framework/webtools/template/entity/EntityImport.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/EntityImport.ftl rename to framework/webtools/template/entity/EntityImport.ftl diff --git a/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl b/framework/webtools/template/entity/EntityImportDir.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/EntityImportDir.ftl rename to framework/webtools/template/entity/EntityImportDir.ftl diff --git a/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl b/framework/webtools/template/entity/EntityImportReaders.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl rename to framework/webtools/template/entity/EntityImportReaders.ftl diff --git a/framework/webtools/webapp/webtools/entity/EntityMaint.ftl b/framework/webtools/template/entity/EntityMaint.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/EntityMaint.ftl rename to framework/webtools/template/entity/EntityMaint.ftl diff --git a/framework/webtools/webapp/webtools/entity/EntityRef.ftl b/framework/webtools/template/entity/EntityRef.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/EntityRef.ftl rename to framework/webtools/template/entity/EntityRef.ftl diff --git a/framework/webtools/webapp/webtools/entity/EntityRefList.ftl b/framework/webtools/template/entity/EntityRefList.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/EntityRefList.ftl rename to framework/webtools/template/entity/EntityRefList.ftl diff --git a/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl b/framework/webtools/template/entity/EntityRefMain.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/EntityRefMain.ftl rename to framework/webtools/template/entity/EntityRefMain.ftl diff --git a/framework/webtools/webapp/webtools/entity/EntityRefReport.fo.ftl b/framework/webtools/template/entity/EntityRefReport.fo.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/EntityRefReport.fo.ftl rename to framework/webtools/template/entity/EntityRefReport.fo.ftl diff --git a/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl b/framework/webtools/template/entity/EntitySQLProcessor.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl rename to framework/webtools/template/entity/EntitySQLProcessor.ftl diff --git a/framework/webtools/webapp/webtools/entity/FindGeneric.ftl b/framework/webtools/template/entity/FindGeneric.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/FindGeneric.ftl rename to framework/webtools/template/entity/FindGeneric.ftl diff --git a/framework/webtools/webapp/webtools/entity/ListGeneric.ftl b/framework/webtools/template/entity/ListGeneric.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/ListGeneric.ftl rename to framework/webtools/template/entity/ListGeneric.ftl diff --git a/framework/webtools/webapp/webtools/entity/ModelGroupWriter.jsp b/framework/webtools/template/entity/ModelGroupWriter.jsp similarity index 100% rename from framework/webtools/webapp/webtools/entity/ModelGroupWriter.jsp rename to framework/webtools/template/entity/ModelGroupWriter.jsp diff --git a/framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp b/framework/webtools/template/entity/ModelInduceFromDb.jsp similarity index 100% rename from framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp rename to framework/webtools/template/entity/ModelInduceFromDb.jsp diff --git a/framework/webtools/webapp/webtools/entity/ModelWriter.jsp b/framework/webtools/template/entity/ModelWriter.jsp similarity index 100% rename from framework/webtools/webapp/webtools/entity/ModelWriter.jsp rename to framework/webtools/template/entity/ModelWriter.jsp diff --git a/framework/webtools/webapp/webtools/entity/ProgramExport.ftl b/framework/webtools/template/entity/ProgramExport.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/ProgramExport.ftl rename to framework/webtools/template/entity/ProgramExport.ftl diff --git a/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl b/framework/webtools/template/entity/ViewGeneric.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/ViewGeneric.ftl rename to framework/webtools/template/entity/ViewGeneric.ftl diff --git a/framework/webtools/webapp/webtools/entity/ViewRelations.ftl b/framework/webtools/template/entity/ViewRelations.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/ViewRelations.ftl rename to framework/webtools/template/entity/ViewRelations.ftl diff --git a/framework/webtools/webapp/webtools/entity/dataMySql.jsp b/framework/webtools/template/entity/dataMySql.jsp similarity index 100% rename from framework/webtools/webapp/webtools/entity/dataMySql.jsp rename to framework/webtools/template/entity/dataMySql.jsp diff --git a/framework/webtools/webapp/webtools/entity/droptablesMySql.jsp b/framework/webtools/template/entity/droptablesMySql.jsp similarity index 100% rename from framework/webtools/webapp/webtools/entity/droptablesMySql.jsp rename to framework/webtools/template/entity/droptablesMySql.jsp diff --git a/framework/webtools/webapp/webtools/entity/droptablesplain.jsp b/framework/webtools/template/entity/droptablesplain.jsp similarity index 100% rename from framework/webtools/webapp/webtools/entity/droptablesplain.jsp rename to framework/webtools/template/entity/droptablesplain.jsp diff --git a/framework/webtools/webapp/webtools/entity/tablesMySql.jsp b/framework/webtools/template/entity/tablesMySql.jsp similarity index 100% rename from framework/webtools/webapp/webtools/entity/tablesMySql.jsp rename to framework/webtools/template/entity/tablesMySql.jsp diff --git a/framework/webtools/webapp/webtools/entity/xmldsdump.ftl b/framework/webtools/template/entity/xmldsdump.ftl similarity index 100% rename from framework/webtools/webapp/webtools/entity/xmldsdump.ftl rename to framework/webtools/template/entity/xmldsdump.ftl diff --git a/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp b/framework/webtools/template/entity/xmldsrawdump.jsp similarity index 100% rename from framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp rename to framework/webtools/template/entity/xmldsrawdump.jsp diff --git a/framework/webtools/webapp/webtools/geo/GeoLocation.ftl b/framework/webtools/template/geo/GeoLocation.ftl similarity index 100% rename from framework/webtools/webapp/webtools/geo/GeoLocation.ftl rename to framework/webtools/template/geo/GeoLocation.ftl diff --git a/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl b/framework/webtools/template/labelmanager/SearchLabels.ftl similarity index 100% rename from framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl rename to framework/webtools/template/labelmanager/SearchLabels.ftl diff --git a/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl b/framework/webtools/template/labelmanager/UpdateLabel.ftl similarity index 100% rename from framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl rename to framework/webtools/template/labelmanager/UpdateLabel.ftl diff --git a/framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl b/framework/webtools/template/labelmanager/ViewFile.ftl similarity index 100% rename from framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl rename to framework/webtools/template/labelmanager/ViewFile.ftl diff --git a/framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl b/framework/webtools/template/labelmanager/ViewHardcodedLabels.ftl similarity index 100% rename from framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl rename to framework/webtools/template/labelmanager/ViewHardcodedLabels.ftl diff --git a/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl b/framework/webtools/template/labelmanager/ViewLabels.ftl similarity index 100% rename from framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl rename to framework/webtools/template/labelmanager/ViewLabels.ftl diff --git a/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl b/framework/webtools/template/labelmanager/ViewReferences.ftl similarity index 100% rename from framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl rename to framework/webtools/template/labelmanager/ViewReferences.ftl diff --git a/framework/webtools/webapp/webtools/log/logContent.ftl b/framework/webtools/template/log/logContent.ftl similarity index 100% rename from framework/webtools/webapp/webtools/log/logContent.ftl rename to framework/webtools/template/log/logContent.ftl diff --git a/framework/webtools/webapp/webtools/main.ftl b/framework/webtools/template/main.ftl similarity index 100% rename from framework/webtools/webapp/webtools/main.ftl rename to framework/webtools/template/main.ftl diff --git a/framework/webtools/webapp/webtools/ping.ftl b/framework/webtools/template/ping.ftl similarity index 100% rename from framework/webtools/webapp/webtools/ping.ftl rename to framework/webtools/template/ping.ftl diff --git a/framework/webtools/webapp/webtools/service/availableservices.ftl b/framework/webtools/template/service/availableservices.ftl similarity index 100% rename from framework/webtools/webapp/webtools/service/availableservices.ftl rename to framework/webtools/template/service/availableservices.ftl diff --git a/framework/webtools/webapp/webtools/service/serviceResult.ftl b/framework/webtools/template/service/serviceResult.ftl similarity index 100% rename from framework/webtools/webapp/webtools/service/serviceResult.ftl rename to framework/webtools/template/service/serviceResult.ftl diff --git a/framework/webtools/webapp/webtools/service/setServiceParameter.ftl b/framework/webtools/template/service/setServiceParameter.ftl similarity index 100% rename from framework/webtools/webapp/webtools/service/setServiceParameter.ftl rename to framework/webtools/template/service/setServiceParameter.ftl diff --git a/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl b/framework/webtools/template/service/setServiceParameterSync.ftl similarity index 100% rename from framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl rename to framework/webtools/template/service/setServiceParameterSync.ftl diff --git a/framework/webtools/webapp/webtools/service/threads.ftl b/framework/webtools/template/service/threads.ftl similarity index 100% rename from framework/webtools/webapp/webtools/service/threads.ftl rename to framework/webtools/template/service/threads.ftl diff --git a/framework/webtools/webapp/webtools/showDateTime.ftl b/framework/webtools/template/showDateTime.ftl similarity index 100% rename from framework/webtools/webapp/webtools/showDateTime.ftl rename to framework/webtools/template/showDateTime.ftl diff --git a/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl b/framework/webtools/template/tempexpr/tempExprMacros.ftl similarity index 100% rename from framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl rename to framework/webtools/template/tempexpr/tempExprMacros.ftl diff --git a/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl b/framework/webtools/template/tempexpr/tempExprMaint.ftl similarity index 99% rename from framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl rename to framework/webtools/template/tempexpr/tempExprMaint.ftl index a277d2ecb5..77178b582f 100644 --- a/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl +++ b/framework/webtools/template/tempexpr/tempExprMaint.ftl @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<#include "component://webtools/webapp/webtools/tempexpr/tempExprMacros.ftl"/> +<#include "component://webtools/template/tempexpr/tempExprMacros.ftl"/>

${title}

<#if temporalExpression?has_content> <#-- Edit existing expression --> diff --git a/framework/webtools/webapp/webtools/WEB-INF/controller.xml b/framework/webtools/webapp/webtools/WEB-INF/controller.xml index 67ff13bd1a..5801686837 100644 --- a/framework/webtools/webapp/webtools/WEB-INF/controller.xml +++ b/framework/webtools/webapp/webtools/WEB-INF/controller.xml @@ -609,8 +609,8 @@ under the License. - - + + diff --git a/framework/webtools/widget/ArtifactInfoScreens.xml b/framework/webtools/widget/ArtifactInfoScreens.xml index 5e16e9a333..f8d8faafb0 100644 --- a/framework/webtools/widget/ArtifactInfoScreens.xml +++ b/framework/webtools/widget/ArtifactInfoScreens.xml @@ -33,7 +33,7 @@ under the License. - + diff --git a/framework/webtools/widget/CommonScreens.xml b/framework/webtools/widget/CommonScreens.xml index 8b58bc3c2d..4ff0afe5e5 100644 --- a/framework/webtools/widget/CommonScreens.xml +++ b/framework/webtools/widget/CommonScreens.xml @@ -23,6 +23,7 @@ under the License.
+ @@ -35,8 +36,6 @@ under the License. - - @@ -58,7 +57,7 @@ under the License. - + @@ -67,14 +66,14 @@ under the License.
- +
- +
@@ -87,7 +86,7 @@ under the License. - + diff --git a/framework/webtools/widget/EntityScreens.xml b/framework/webtools/widget/EntityScreens.xml index 48e551df47..64d5812e0d 100644 --- a/framework/webtools/widget/EntityScreens.xml +++ b/framework/webtools/widget/EntityScreens.xml @@ -39,7 +39,7 @@ under the License. - + @@ -59,7 +59,7 @@ under the License. - + @@ -82,7 +82,7 @@ under the License. - + @@ -104,7 +104,7 @@ under the License. - + @@ -126,7 +126,7 @@ under the License. - + @@ -148,7 +148,7 @@ under the License. - + @@ -219,12 +219,12 @@ under the License. - + - + @@ -251,7 +251,7 @@ under the License. - + @@ -276,7 +276,7 @@ under the License. - + @@ -301,7 +301,7 @@ under the License. - + @@ -329,7 +329,7 @@ under the License. - + @@ -355,7 +355,7 @@ under the License. - + @@ -379,7 +379,7 @@ under the License. - + @@ -418,7 +418,7 @@ under the License. - + @@ -465,7 +465,7 @@ under the License. - + @@ -484,7 +484,7 @@ under the License. - + diff --git a/framework/webtools/widget/GeoManagementScreens.xml b/framework/webtools/widget/GeoManagementScreens.xml index ecbebb30fe..d4973a07c6 100644 --- a/framework/webtools/widget/GeoManagementScreens.xml +++ b/framework/webtools/widget/GeoManagementScreens.xml @@ -64,7 +64,7 @@ - + diff --git a/framework/webtools/widget/LabelManagerScreens.xml b/framework/webtools/widget/LabelManagerScreens.xml index 807915d1d4..f052476045 100644 --- a/framework/webtools/widget/LabelManagerScreens.xml +++ b/framework/webtools/widget/LabelManagerScreens.xml @@ -36,15 +36,15 @@ under the License. - + - + @@ -71,7 +71,7 @@ under the License. - + @@ -93,7 +93,7 @@ under the License. - + @@ -116,7 +116,7 @@ under the License. - + diff --git a/framework/webtools/widget/LogScreens.xml b/framework/webtools/widget/LogScreens.xml index e387286ec6..64d2417a63 100644 --- a/framework/webtools/widget/LogScreens.xml +++ b/framework/webtools/widget/LogScreens.xml @@ -115,7 +115,7 @@ under the License. - + diff --git a/framework/webtools/widget/MiscScreens.xml b/framework/webtools/widget/MiscScreens.xml index d5b640d8c6..09e11843a0 100644 --- a/framework/webtools/widget/MiscScreens.xml +++ b/framework/webtools/widget/MiscScreens.xml @@ -33,7 +33,7 @@ under the License. - + diff --git a/framework/webtools/widget/ServiceScreens.xml b/framework/webtools/widget/ServiceScreens.xml index 4449e5fe1f..2158963292 100644 --- a/framework/webtools/widget/ServiceScreens.xml +++ b/framework/webtools/widget/ServiceScreens.xml @@ -33,7 +33,7 @@ under the License. - + @@ -112,7 +112,7 @@ under the License. - + @@ -172,7 +172,7 @@ under the License. - + @@ -194,7 +194,7 @@ under the License. - + @@ -215,7 +215,7 @@ under the License. - + diff --git a/framework/webtools/widget/TempExprScreens.xml b/framework/webtools/widget/TempExprScreens.xml index 91b06182f1..5b183cf960 100644 --- a/framework/webtools/widget/TempExprScreens.xml +++ b/framework/webtools/widget/TempExprScreens.xml @@ -99,7 +99,7 @@ under the License. - +