OFBiz › OFBiz - Commits

svn commit: r640252 - in /ofbiz/trunk/framework/webtools: webapp/webtools/cache/ webapp/webtools/component/ webapp/webtools/datafile/ webapp/webtools/entity/ webapp/webtools/period/ widget/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r640252 - in /ofbiz/trunk/framework/webtools: webapp/webtools/cache/ webapp/webtools/component/ webapp/webtools/datafile/ webapp/webtools/entity/ webapp/webtools/period/ widget/

Author: jleroux
Date: Sun Mar 23 13:20:59 2008
New Revision: 640252

URL: http://svn.apache.org/viewvc?rev=640252&view=rev
Log:
A patch from Marco Risaliti "New Styles For Framework applications" (https://issues.apache.org/jira/browse/OFBIZ-1619) - OFBIZ-1619

Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp
ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl
ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml
ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml
ofbiz/trunk/framework/webtools/widget/LogScreens.xml
ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl Sun Mar 23 13:20:59 2008
@@ -26,7 +26,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.PageTitleEditUtilCache}</li>
+ <li class="h3">${uiLabelMap.PageTitleEditUtilCache}</li>
</ul>
<br class="clear"/>
</div>
@@ -110,4 +110,4 @@

<@displayButtonBar/>
</div>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl Sun Mar 23 13:20:59 2008
@@ -28,7 +28,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.PageTitleFindUtilCache}</li>
+ <li class="h3">${uiLabelMap.PageTitleFindUtilCache}</li>
</ul>
<br class="clear"/>
</div>
@@ -90,4 +90,4 @@

<@displayButtonBar/>
</div>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl Sun Mar 23 13:20:59 2008
@@ -26,7 +26,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.PageTitleFindUtilCacheElements}</li>
+ <li class="h3">${uiLabelMap.PageTitleFindUtilCacheElements}</li>
</ul>
<br class="clear"/>
</div>
@@ -73,4 +73,4 @@

<@displayButtonBar/>
</div>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl Sun Mar 23 13:20:59 2008
@@ -21,7 +21,7 @@
<div id="stats-bins-history" class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsComponentsLoaded}</li>
+ <li class="h3">${uiLabelMap.WebtoolsComponentsLoaded}</li>
</ul>
<br class="clear"/>
</div>
@@ -71,4 +71,4 @@
<#else>
<div class="screenlet-body">${uiLabelMap.WebtoolsComponentsNoComponents}.</div>
</#if>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl Sun Mar 23 13:20:59 2008
@@ -19,7 +19,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsDataFileMainTitle}</li>
+ <li class="h3">${uiLabelMap.WebtoolsDataFileMainTitle}</li>
</ul>
<br class="clear"/>
</div>
@@ -160,4 +160,4 @@
<h3>You do not have permission to use this page (DATAFILE_MAINT needed)</h3>
</#if>
</div>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl Sun Mar 23 13:20:59 2008
@@ -19,7 +19,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsEntityDataMaintenance}</li>
+ <li class="h3">${uiLabelMap.WebtoolsEntityDataMaintenance}</li>
</ul>
<br class="clear"/>
</div>
@@ -47,7 +47,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsEntitiesAlpha}</li>
+ <li class="h3">${uiLabelMap.WebtoolsEntitiesAlpha}</li>
</ul>
<br class="clear"/>
</div>
@@ -111,4 +111,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl Sun Mar 23 13:20:59 2008
@@ -19,7 +19,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsSqlProcessor}</li>
+ <li class="h3">${uiLabelMap.WebtoolsSqlProcessor}</li>
</ul>
<br class="clear"/>
</div>
@@ -67,7 +67,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsResults}</li>
+ <li class="h3">${uiLabelMap.WebtoolsResults}</li>
</ul>
<br class="clear"/>
</div>
@@ -98,4 +98,4 @@
</table>
</#if>
</div>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl Sun Mar 23 13:20:59 2008
@@ -19,7 +19,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsFindValues}</li>
+ <li class="h3">${uiLabelMap.WebtoolsFindValues}</li>
</ul>
<br class="clear"/>
</div>
@@ -38,7 +38,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsToFindAll} ${entityName}, ${uiLabelMap.WebtoolsLeaveAllEntriesBlank}.</li>
+ <li class="h3">${uiLabelMap.WebtoolsToFindAll} ${entityName}, ${uiLabelMap.WebtoolsLeaveAllEntriesBlank}.</li>
</ul>
<br class="clear"/>
</div>
@@ -106,7 +106,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsFindValuesResults}</li>
+ <li class="h3">${uiLabelMap.WebtoolsFindValuesResults}</li>
</ul>
<br class="clear"/>
</div>
@@ -155,4 +155,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp Sun Mar 23 13:20:59 2008
@@ -24,7 +24,7 @@
response.setContentType("text/html");
%>

-<div class='head3'><b>Please specify the helperName to induce from:</b></div>
+<div class='h3'><b>Please specify the helperName to induce from:</b></div>
<form action='' method="post">
<input type='TEXT' class='inputBox' size='40' name='helperName'>
<input type=SUBMIT value='Induce!'>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Sun Mar 23 13:20:59 2008
@@ -35,7 +35,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsViewValue}</li>
+ <li class="h3">${uiLabelMap.WebtoolsViewValue}</li>
</ul>
<br class="clear"/>
</div>
@@ -259,4 +259,4 @@
</#if>
</div>
<br class="clear"/>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl Sun Mar 23 13:20:59 2008
@@ -19,7 +19,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsRelations}</li>
+ <li class="h3">${uiLabelMap.WebtoolsRelations}</li>
</ul>
<br class="clear"/>
</div>
@@ -60,4 +60,4 @@
<h3>${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18}.</h3>
</#if>
</div>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl Sun Mar 23 13:20:59 2008
@@ -25,7 +25,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3">${uiLabelMap.WebtoolsShowOnlyPeriodsWithOrganization}</li>
+ <li class="h3">${uiLabelMap.WebtoolsShowOnlyPeriodsWithOrganization}</li>
</ul>
<br class="clear"/>
</div>
@@ -293,4 +293,4 @@
</div>
<#else>
<h3>${uiLabelMap.WebtoolsPermissionPeriod}.</h3>
-</#if>
\ No newline at end of file
+</#if>

Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Sun Mar 23 13:20:59 2008
@@ -55,7 +55,6 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<actions>
- <set field="title" value="XML Export from DataSource(s)"/>
<set field="titleProperty" value="PageTitleEntityExportAll"/>
<set field="parameters.TRANSACTION_TIMEOUT" value="7200"/>
<set field="results" from-field="parameters.results"/>
@@ -63,9 +62,22 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/EntityExportAll.ftl"/></html>
- </platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.PageTitleEntityExportAll}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/entity/EntityExportAll.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -80,7 +92,6 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<actions>
- <set field="title" value="XML Import Dir"/>
<set field="titleProperty" value="PageTitleEntityImportDir"/>
<set field="parameters.TRANSACTION_TIMEOUT" value="7200"/>

@@ -89,9 +100,22 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/EntityImportDir.ftl"/></html>
- </platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.PageTitleEntityImportDir}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/entity/EntityImportDir.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -106,7 +130,6 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<actions>
- <set field="title" value="XML Import"/>
<set field="titleProperty" value="PageTitleEntityImport"/>
<set field="parameters.TRANSACTION_TIMEOUT" value="7200"/>

@@ -115,9 +138,22 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/EntityImport.ftl"/></html>
- </platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.PageTitleEntityImport}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/entity/EntityImport.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -132,7 +168,6 @@
<if-has-permission permission="ENTITY_MAINT"/>
</condition>
<actions>
- <set field="title" value="XML Import"/>
<set field="titleProperty" value="PageTitleEntityImportReaders"/>
<set field="parameters.TRANSACTION_TIMEOUT" value="7200"/>

@@ -141,9 +176,22 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/EntityImportReaders.ftl"/></html>
- </platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.PageTitleEntityImportReaders}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/entity/EntityImportReaders.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -370,15 +418,28 @@
</condition>
<actions>
<property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="titleProperty" value="WebtoolsCheckUpdateDatabase"/>
- <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.bsh"/>
+ <set field="titleProperty" value="WebtoolsCheckUpdateDatabase"/>
+ <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.bsh"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/entity/CheckDb.ftl"/></html>
- </platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.WebtoolsCheckUpdateDatabase}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/entity/CheckDb.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -416,7 +477,24 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/entity/xmldsdump.ftl"/></html></platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.WebtoolsCheckUpdateDatabase}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html>
+ <html-template location="component://webtools/webapp/webtools/entity/xmldsdump.ftl"/>
+ </html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -432,16 +510,28 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
- <html>
- <html-template location="component://webtools/webapp/webtools/entity/minervaObjects.ftl"/>
- </html>
- </platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="Minerva Connection Objects"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html>
+ <html-template location="component://webtools/webapp/webtools/entity/minervaObjects.ftl"/>
+ </html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
</screens>
-

Modified: ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml Sun Mar 23 13:20:59 2008
@@ -21,7 +21,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="EntitySyncStatus" type="list" list-name="entitySyncList" target=""
- paginate-target="EntitySyncStatus" view-size="20">
+ paginate-target="EntitySyncStatus" view-size="20" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="EntitySync" list-name="entitySyncList" use-cache="false">

@@ -49,7 +49,8 @@
</field>
</form>

- <form name="EntitySyncLoadOffline" type="single" target="loadOfflineEntitySyncData" title="">
+ <form name="EntitySyncLoadOffline" type="single" target="loadOfflineEntitySyncData" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="loadOfflineEntitySyncData"/>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>

Modified: ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml Sun Mar 23 13:20:59 2008
@@ -25,20 +25,17 @@
<actions>
</actions>
<widgets>
- 
+ 
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

<decorator-section name="body">
<section>
<widgets>
<container style="button-bar">
- <label style="h1">${uiLabelMap.${labelTitleProperty}}</label>
- </container>
- <container style="button-bar">
<link target="EntitySyncStatus" style="smallSubmit" text="${uiLabelMap.CommonRefresh}"/>
</container>

- 
+ 
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -54,22 +51,44 @@
<screen name="EntitySyncStatus">
<section>
<actions>
- <set field="title" value="Entity Sync Status"/>
<set field="titleProperty" value="PageTitleEntitySyncStatus"/>
- <set field="labelTitleProperty" value="PageTitleEntitySyncStatus"/>
</actions>
<widgets>
<decorator-screen name="GenericDecorator">
<decorator-section name="body">
- <include-form name="EntitySyncStatus" location="component://webtools/widget/EntitySyncForms.xml"/>
- <container style="button-bar">
- <label style="h1">${uiLabelMap.WebtoolsLoadOfflineData}</label>
- </container>
- <include-form name="EntitySyncLoadOffline" location="component://webtools/widget/EntitySyncForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.PageTitleEntitySyncStatus}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EntitySyncStatus" location="component://webtools/widget/EntitySyncForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.WebtoolsLoadOfflineData}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EntitySyncLoadOffline" location="component://webtools/widget/EntitySyncForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
</screens>
+

Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Sun Mar 23 13:20:59 2008
@@ -58,7 +58,7 @@
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
- <container style="head3">
+ <container style="h3">
<label text="${uiLabelMap.WebtoolsDebuggingLevelFormDescription}"/>
</container>
</container>
@@ -72,7 +72,7 @@
</container>
<container style="screenlet">
<container style="screenlet-title-bar">
- <container style="head3">
+ <container style="h3">
<label text="${uiLabelMap.WebtoolsAddLoggerFormDescription}"/>
</container>
</container>
@@ -86,7 +86,7 @@
</container>
<container style="screenlet">
<container style="screenlet-title-bar">
- <container style="head3">
+ <container style="h3">
<label text="${uiLabelMap.WebtoolsLoggerListFormDescription}"/>
</container>
</container>
@@ -119,7 +119,7 @@
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
- <container style="head3">
+ <container style="h3">
<label text="${uiLabelMap.WebtoolsViewLog}"/>
</container>
</container>

Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Sun Mar 23 13:20:59 2008
@@ -80,7 +80,24 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/workflow/readxpdl.ftl"/></html></platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.WebtoolsReadXPDLFile}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html>
+ <html-template location="component://webtools/webapp/webtools/workflow/readxpdl.ftl"/>
+ </html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -97,7 +114,24 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://webtools/webapp/webtools/workflow/workflowMonitor.ftl"/></html></platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.WebtoolsActiveWorkflowMonitor}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html>
+ <html-template location="component://webtools/webapp/webtools/workflow/workflowMonitor.ftl"/>
+ </html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=640252&r1=640251&r2=640252&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Sun Mar 23 13:20:59 2008
@@ -137,7 +137,7 @@
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
- <container style="head3">
+ <container style="h3">
<label text="${uiLabelMap.WebtoolsMessage11}"/>
</container>
</container>
@@ -167,7 +167,7 @@
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
- <label style="head3">${uiLabelMap.PageTitleRunService}</label>
+ <label style="h3">${uiLabelMap.PageTitleRunService}</label>
</container>
<container style="screenlet-body">
<include-form name="runService" location="component://webtools/webapp/webtools/service/ServiceForms.xml"/>
@@ -190,7 +190,7 @@
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
- <label style="head3">${uiLabelMap.WebtoolsMessage12}</label>
+ <label style="h3">${uiLabelMap.WebtoolsMessage12}</label>
</container>
<container style="screenlet-body">
<platform-specific>
@@ -216,7 +216,7 @@
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
- <label style="head3">${uiLabelMap.PageTitleScheduleJob}</label>
+ <label style="h3">${uiLabelMap.PageTitleScheduleJob}</label>
</container>
<container style="screenlet-body">
<platform-specific>