Re: svn commit: r1098406 - in /ofbiz/trunk/framework/webtools: webapp/webtools/datafile/ webapp/webtools/entity/ webapp/webtools/service/ widget/

Sun, 01 May 2011 14:10:51 -0700

I don't like some of these changes. Removing the unnecessary screenlets was a good idea. Removing the page title is a bad idea, and it doesn't follow layout best practices: 

https://cwiki.apache.org/OFBADMIN/user-interface-layout-best-practices.html

https://localhost:8443/webtools/control/WebtoolsLayoutDemo

-Adrian

On 5/1/2011 1:38 PM, bus...@apache.org wrote:

Author: buscob
Date: Sun May  1 20:38:38 2011
New Revision: 1098406

URL: http://svn.apache.org/viewvc?rev=1098406&view=rev
Log:
No funtional changes only layout.
Screenlet title bars and H1 titles have been removed when they simply duplicate 
the tab menu.
Fixed some missing tab menu highlighting.




Modified:
     ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
     ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl
     ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl
     ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl
     ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
     
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.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/xmldsdump.ftl
     
ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
     ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
     ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
     ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml
     ofbiz/trunk/framework/webtools/widget/LogScreens.xml
     ofbiz/trunk/framework/webtools/widget/Menus.xml
     ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
     ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml

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=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl 
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl 
Sun May  1 20:38:38 2011
@@ -16,15 +16,6 @@ KIND, either express or implied.  See th
  specific language governing permissions and limitations
  under the License.
  -->
-<div class="screenlet">
-<div class="screenlet-title-bar">
-<ul>
-<li class="h3">${uiLabelMap.WebtoolsDataFileMainTitle}</li>
-</ul>
-<br class="clear"/>
-</div>
-<div class="screenlet-body">
-<br />
      <p>${uiLabelMap.WebtoolsDataFileMessage1}.</p>
      <br />
      <#if security.hasPermission("DATAFILE_MAINT", session)>
@@ -159,5 +150,3 @@ under the License.
      <#else>
        <h3>You do not have permission to use this page (DATAFILE_MAINT 
needed)</h3>
      </#if>
-</div>
-</div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl Sun May  
1 20:38:38 2011
@@ -16,7 +16,6 @@ KIND, either express or implied.  See th
  specific language governing permissions and limitations
  under the License.
  -->
-<div>
      <h3>${uiLabelMap.WebtoolsCheckUpdateDatabase}</h3>
      <form method="post" action="${encodeURLCheckDb}">
          <input type="hidden" name="option" value="checkupdatetables"/>
@@ -111,9 +110,8 @@ under the License.
          ${uiLabelMap.WebtoolsGroupName}:<input type="text" name="groupName" 
value="${groupName}" size="40"/>
          <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
      </form>
-<hr />
-</div>
  <#if miters?has_content>
+<hr />
      <ul>
          <#list miters as miter>
              <li>${miter}</li>

Modified: 
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl 
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl 
Sun May  1 20:38:38 2011
@@ -17,11 +17,7 @@ specific language governing permissions
  under the License.
  -->

-<h1>${uiLabelMap.WebtoolsExportFromDataSource}</h1>
-<br />
-<p>
-    ${uiLabelMap.WebtoolsXMLExportInfo}
-</p>
+<p>${uiLabelMap.WebtoolsXMLExportInfo}</p>
  <#if results?has_content>
      <hr />
      <h2>${uiLabelMap.WebtoolsResults}:</h2>
@@ -29,10 +25,7 @@ under the License.
          <p>${result}</p>
      </#list>
  </#if>
-
  <hr />
-
-<h2>${uiLabelMap.WebtoolsExport}:</h2>
  <form method="post" action="<@ofbizUrl>entityExportAll</@ofbizUrl>">
      ${uiLabelMap.WebtoolsOutputDirectory}:<input type="text" size="60" name="outpath" 
value="${outpath?if_exists}" /><br />
      ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" 
value="${txTimeout?default('7200')}" name="txTimeout"/><br />

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl 
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl Sun 
May  1 20:38:38 2011
@@ -17,12 +17,8 @@ specific language governing permissions
  under the License.
  -->

-<h1>${uiLabelMap.WebtoolsImportToDataSource}</h1>
-<br />
  <p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
  <hr />
-<h2>${uiLabelMap.WebtoolsImport}:</h2>
-<br />

    <form method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>">
      ${uiLabelMap.WebtoolsAbsoluteFileNameOrUrl}:<br />

Modified: 
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl 
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl 
Sun May  1 20:38:38 2011
@@ -17,11 +17,8 @@ specific language governing permissions
  under the License.
  -->

-<h1>${uiLabelMap.WebtoolsImportToDataSource}</h1>
-<br />
  <p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
  <hr />
-<h2>${uiLabelMap.WebtoolsImport}:</h2>

    <form method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>">
      ${uiLabelMap.WebtoolsAbsolutePath}:<br />

Modified: 
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl 
(original)
+++ 
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl 
Sun May  1 20:38:38 2011
@@ -17,12 +17,8 @@ specific language governing permissions
  under the License.
  -->

-<h1>${uiLabelMap.WebtoolsImportToDataSource}</h1>
-<br />
  <p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
  <hr />
-<h2>${uiLabelMap.WebtoolsImport}:</h2>
-
    <form method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>">
      Enter Readers (comma separated, no spaces; from entityengine.xml and 
ofbiz-component.xml files; common ones include seed,ext,demo):<br />
      <input type="text" size="60" name="readers" 
value="${readers?default("seed")}"/><br />

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=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl 
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl Sun 
May  1 20:38:38 2011
@@ -16,14 +16,6 @@ KIND, either express or implied.  See th
  specific language governing permissions and limitations
  under the License.
  -->
-<div class="screenlet">
-<div class="screenlet-title-bar">
-<ul>
-<li class="h3">${uiLabelMap.WebtoolsEntityDataMaintenance}</li>
-</ul>
-<br class="clear"/>
-</div>
-<div class="screenlet-body">
      <div>
         <form action="<@ofbizUrl>/entitymaint</@ofbizUrl>">
            <b>${uiLabelMap.CommonGroup}:</b>
@@ -35,29 +27,21 @@ under the License.
            </select>
            <b>${uiLabelMap.WebtoolsEntityName}:</b>
            <input type= "text" name= "filterByEntityName" 
value="${parameters.filterByEntityName?if_exists}"/>
-<input type="submit"/>
+<input type="submit" value="${uiLabelMap.CommonApply}"/>
         </form>
      </div>
-<p><b><u>${uiLabelMap.CommonNote}</u></b></p>
-<p>
-<b>${uiLabelMap.WebtoolsCreate}</b>  = 
${uiLabelMap.CommonCreateNew}&nbsp;&nbsp;
-<b>${uiLabelMap.WebtoolsReln}</b>  = 
${uiLabelMap.WebtoolsViewRelations}&nbsp;&nbsp;
-<b>${uiLabelMap.WebtoolsFind}</b>  = 
${uiLabelMap.WebtoolsFindRecord}&nbsp;&nbsp;
-<b>${uiLabelMap.WebtoolsAll}</b>  = 
${uiLabelMap.WebtoolsFindAllRecords}&nbsp;&nbsp;
-</p>
-<br />
      <#assign firstChar = "x">
      <#assign anchor="">
      <#assign alt_row = false>
      <#assign right_col = false>
-
-<#list entitiesList as entity>
+<div class="button-bar">
+<#list entitiesList as entity>
          <#if entity.entityName?substring(0, 1) != firstChar>
-<#assign firstChar = entity.entityName?substring(0, 1)>
-<a href="#Entity_${firstChar}">${firstChar}</a>&nbsp;
+<#assign firstChar = entity.entityName?substring(0, 1)>
+<a href="#Entity_${firstChar}">${firstChar}</a>&nbsp;
          </#if>
-</#list>
-<br /><br />
+</#list>
+</div>
      <div class="screenlet">
        <div class="screenlet-title-bar">
          <ul>
@@ -103,12 +87,12 @@ under the License.
                  </#if>
                <#else>
                  <#if entity.entityPermissionCreate == 'Y'>
-<a 
href='<@ofbizUrl>ViewGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsCreate}</a>
+<a href='<@ofbizUrl>ViewGeneric?entityName=${entity.entityName}</@ofbizUrl>' 
title='${uiLabelMap.CommonCreateNew}'>${uiLabelMap.WebtoolsCreate}</a>
                  </#if>
                  <#if entity.entityPermissionView == 'Y'>
-<a 
href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsReln}</a>
-<a 
href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsFind}</a>
-<a 
href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>'>${uiLabelMap.WebtoolsAll}</a>
+<a href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>' 
title='${uiLabelMap.WebtoolsViewRelations}'>${uiLabelMap.WebtoolsReln}</a>
+<a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>' 
title='${uiLabelMap.WebtoolsFindRecord}'>${uiLabelMap.WebtoolsFind}</a>
+<a 
href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&amp;find=true&amp;VIEW_SIZE=50&amp;VIEW_INDEX=0</@ofbizUrl>'
 title='${uiLabelMap.WebtoolsFindAllRecords}'>${uiLabelMap.WebtoolsAll}</a>
                  </#if>
                </#if>
              </td>
@@ -124,5 +108,3 @@ under the License.
          </table>
        </div>
      </div>
-</div>
-</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=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl 
(original)
+++ 
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl 
Sun May  1 20:38:38 2011
@@ -16,14 +16,6 @@ KIND, either express or implied.  See th
  specific language governing permissions and limitations
  under the License.
  -->
-<div class="screenlet">
-<div class="screenlet-title-bar">
-<ul>
-<li class="h3">${uiLabelMap.WebtoolsSqlProcessor}</li>
-</ul>
-<br class="clear"/>
-</div>
-<div class="screenlet-body">
      <form method="post" action="EntitySQLProcessor" name="EntitySQLCommand">
        <table class="basic-table" cellspacing="0">
          <tr>
@@ -62,8 +54,7 @@ under the License.
          </tr>
        </table>
      </form>
-</div>
-</div>
+
  <div class="screenlet">
    <div class="screenlet-title-bar">
      <ul>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl 
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl Sun May 
 1 20:38:38 2011
@@ -34,9 +34,6 @@ under the License.
      <a href="<@ofbizUrl>xmldsdump</@ofbizUrl>" 
class="smallSubmit">${uiLabelMap.WebtoolsUnCheckAll}</a>
    </div>
  </#macro>
-
-<h1>${uiLabelMap.PageTitleEntityExport}</h1>
-<br />
  <p>${uiLabelMap.WebtoolsXMLExportInfo}</p>
  <hr />


Modified: 
ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl 
(original)
+++ 
ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl 
Sun May  1 20:38:38 2011
@@ -363,14 +363,11 @@ under the License.
          </#if>
        </div>
      </form>
-<br />
    </#if>

    <div class="screenlet">
-<div class="screenlet-title-bar">
-<h3>${uiLabelMap.WebtoolsServicesListFor} 
${dispatcherName?default(uiLabelMap.CommonNA)} (${servicesFoundCount} 
${uiLabelMap.CommonFound})</h3>
-</div>
      <div class="screenlet-body">
+<label>${uiLabelMap.WebtoolsServicesListFor} 
${dispatcherName?default(uiLabelMap.CommonNA)} (${servicesFoundCount} 
${uiLabelMap.CommonFound})</label>
        <table class="basic-table hover-bar" cellspacing='0'>
          <tr class="header-row">
            <td>${uiLabelMap.WebtoolsServiceName}</td>

Modified: ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CacheScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CacheScreens.xml Sun May  1 20:38:38 
2011
@@ -36,7 +36,7 @@ under the License.
                                  <if-has-permission permission="UTIL_CACHE" 
action="_VIEW"/>
                              </condition>
                              <widgets>
-<screenlet title="${uiLabelMap.PageTitleFindUtilCache}">
+<screenlet>
                                      <label>${uiLabelMap.WebtoolsMemory} 
${uiLabelMap.WebtoolsTotalMemory} ${memory} ${uiLabelMap.WebtoolsFreeMemory} 
${freeMemory} ${uiLabelMap.WebtoolsUsedMemory} ${usedMemory}
                                          ${uiLabelMap.WebtoolsMaxMemory} 
${maxMemory}</label>
                                      <include-menu name="FindCache" 
location="component://webtools/widget/Menus.xml"/>

Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Sun May  1 20:38:38 
2011
@@ -56,7 +56,7 @@ under the License.
              <widgets>
                  <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
-<screenlet title="${uiLabelMap.PageTitleEntityExportAll}">
+<screenlet>
                              <platform-specific>
                                  <html><html-template 
location="component://webtools/webapp/webtools/entity/EntityExportAll.ftl"/></html>
                              </platform-specific>
@@ -78,7 +78,7 @@ under the License.
              <widgets>
                  <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
-<screenlet title="${uiLabelMap.PageTitleEntityImportDir}">
+<screenlet>
                              <platform-specific>
                                  <html><html-template 
location="component://webtools/webapp/webtools/entity/EntityImportDir.ftl"/></html>
                              </platform-specific>
@@ -100,7 +100,7 @@ under the License.
              <widgets>
                  <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
-<screenlet title="${uiLabelMap.PageTitleEntityImport}">
+<screenlet>
                              <platform-specific>
                                  <html><html-template 
location="component://webtools/webapp/webtools/entity/EntityImport.ftl"/></html>
                              </platform-specific>
@@ -122,7 +122,7 @@ under the License.
              <widgets>
                  <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
-<screenlet title="${uiLabelMap.PageTitleEntityImportReaders}">
+<screenlet>
                              <platform-specific>
                                  <html><html-template 
location="component://webtools/webapp/webtools/entity/EntityImportReaders.ftl"/></html>
                              </platform-specific>
@@ -163,9 +163,10 @@ under the License.
                  <property-map resource="WebtoolsUiLabels" 
map-name="uiLabelMap"/>
                  <set field="title" value="${uiLabelMap.WebtoolsFindValues} 
${uiLabelMap.WebtoolsForEntity}: ${entityName}"/>
                  <set field="commonDisplaying" 
value="${uiLabelMap.CommonDisplaying}"/>
+<set field="tabButtonItem" value="entitymaint"/>
              </actions>
              <widgets>
-<decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+<decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
                          <decorator-screen name="FindScreenDecorator" 
location="component://common/widget/CommonScreens.xml">
                              <decorator-section name="menu-bar">
@@ -208,9 +209,10 @@ under the License.
                  <script 
location="component://webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy"/>
                  <property-map resource="WebtoolsUiLabels" 
map-name="uiLabelMap"/>
                  <set field="title" value="${uiLabelMap.WebtoolsViewValue}: 
${entityName}"/>
+<set field="tabButtonItem" value="entitymaint"/>
              </actions>
              <widgets>
-<decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+<decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
                          <platform-specific>
                              <html><html-template 
location="component://webtools/webapp/webtools/entity/ViewGeneric.ftl"/></html>
@@ -232,9 +234,10 @@ under the License.
                  <script 
location="component://webtools/webapp/webtools/WEB-INF/actions/entity/ViewRelations.groovy"/>
                  <property-map resource="WebtoolsUiLabels" 
map-name="uiLabelMap"/>
                  <set field="title" value="${uiLabelMap.WebtoolsRelations}: 
${entityName}"/>
+<set field="tabButtonItem" value="entitymaint"/>
              </actions>
              <widgets>
-<decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+<decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
                          <platform-specific>
                              <html><html-template 
location="component://webtools/webapp/webtools/entity/ViewRelations.ftl"/></html>
@@ -358,7 +361,9 @@ under the License.
              <widgets>
                  <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
-<include-form name="EntityEoModelBundle" 
location="component://webtools/widget/EntityForms.xml"/>
+<screenlet>
+<include-form name="EntityEoModelBundle" 
location="component://webtools/widget/EntityForms.xml"/>
+</screenlet>
                      </decorator-section>
                  </decorator-screen>
              </widgets>
@@ -376,7 +381,7 @@ under the License.
              <widgets>
                  <decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
-<screenlet title="${uiLabelMap.WebtoolsCheckUpdateDatabase}">
+<screenlet>
                              <platform-specific><html><html-template 
location="component://webtools/webapp/webtools/entity/CheckDb.ftl"/></html></platform-specific>
                          </screenlet>
                      </decorator-section>
@@ -392,12 +397,13 @@ under the License.
              <actions>
                  <set field="headerItem" value="main"/>
                  <set field="titleProperty" value="WebtoolsPerformanceTests"/>
+<set field="tabButtonItem" value="entityPerformanceTest"/>
                  <script 
location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.groovy"/>
              </actions>
              <widgets>
-<decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+<decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
-<screenlet title="${uiLabelMap.WebtoolsEntityEnginePerformanceTests}">
+<screenlet>
                              
<label>${uiLabelMap.WebtoolsNotePerformanceResultsMayVary}</label>
                              <include-form name="ListPerformanceResults" 
location="component://webtools/widget/EntityForms.xml"/>
                          </screenlet>
@@ -422,7 +428,7 @@ under the License.
              <widgets>
                  <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
-<screenlet title="${uiLabelMap.WebtoolsCheckUpdateDatabase}">
+<screenlet>
                              <platform-specific><html><html-template 
location="component://webtools/webapp/webtools/entity/xmldsdump.ftl"/></html></platform-specific>
                          </screenlet>
                      </decorator-section>

Modified: ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml Sun May  1 
20:38:38 2011
@@ -58,9 +58,9 @@ under the License.
                  <decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                      <decorator-section name="body">
                          <container style="button-bar">
-<link target="EntitySyncStatus" style="smallSubmit" 
text="${uiLabelMap.CommonRefresh}"/>
+<link target="EntitySyncStatus" style="buttontext refresh" 
text="${uiLabelMap.CommonRefresh}"/>
                          </container>
-<screenlet title="${uiLabelMap.PageTitleEntitySyncStatus}">
+<screenlet>
                              <include-form name="EntitySyncStatus" 
location="component://webtools/widget/EntitySyncForms.xml"/>
                          </screenlet>
                          <screenlet 
title="${uiLabelMap.WebtoolsLoadOfflineData}">

Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Sun May  1 20:38:38 
2011
@@ -65,7 +65,7 @@ under the License.
              <widgets>
                  <decorator-screen name="log-decorator">
                      <decorator-section name="body">
-<screenlet title="${uiLabelMap.PageTitleServiceList}">
+<screenlet>
                              <include-form name="ListServices" 
location="component://webtools/widget/ServiceForms.xml"/>
                          </screenlet>
                      </decorator-section>
@@ -112,7 +112,7 @@ under the License.
               <widgets>
                   <decorator-screen name="log-decorator">
                       <decorator-section name="body">
-<screenlet title="${uiLabelMap.WebtoolsViewLog}">
+<screenlet>
                               <container style="button-bar">
                                   <link target="LogView" text="${uiLabelMap.CommonRefresh}" 
style="buttontext refresh"/>
                               </container>

Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Sun May  1 20:38:38 2011
@@ -24,7 +24,7 @@ under the License.
          <menu-item name="logging" title="${uiLabelMap.WebtoolsLogging}">
              <link target="LogView"/>
          </menu-item>
-<menu-item name="cache" title="${uiLabelMap.WebtoolsCacheDebugTools}">
+<menu-item name="cache" title="${uiLabelMap.WebtoolsCacheMaintenance}">
              <link target="FindUtilCache"/>
          </menu-item>
          <menu-item name="artifact" title="${uiLabelMap.WebtoolsArtifactInfo}">

Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Sun May  1 20:38:38 
2011
@@ -42,12 +42,15 @@ under the License.
              <actions>
                  <set field="headerItem" value="main"/>
                  <set field="titleProperty" value="WebtoolsDataFileMainTitle"/>
+<set field="tabButtonItem" value="data"/>
                  <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-section name="body">
-<platform-specific><html><html-template 
location="component://webtools/webapp/webtools/datafile/viewdatafile.ftl"/></html></platform-specific>
+<screenlet>
+<platform-specific><html><html-template 
location="component://webtools/webapp/webtools/datafile/viewdatafile.ftl"/></html></platform-specific>
+</screenlet>
                      </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=1098406&r1=1098405&r2=1098406&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Sun May  1 
20:38:38 2011
@@ -31,15 +31,11 @@ under the License.
              <widgets>
                  <decorator-screen name="CommonServiceDecorator" 
location="${parameters.mainDecoratorLocation}">
                      <decorator-section name="body">
-<section>
-<widgets>
-<platform-specific>
-<html>
-<html-template 
location="component://webtools/webapp/webtools/service/availableservices.ftl"/>
-</html>
-</platform-specific>
-</widgets>
-</section>
+<platform-specific>
+<html>
+<html-template 
location="component://webtools/webapp/webtools/service/availableservices.ftl"/>
+</html>
+</platform-specific>
                      </decorator-section>
                  </decorator-screen>
              </widgets>
@@ -127,7 +123,7 @@ under the License.
              <widgets>
                  <decorator-screen name="CommonServiceDecorator" 
location="${parameters.mainDecoratorLocation}">
                      <decorator-section name="body">
-<screenlet title="${uiLabelMap.PageTitleRunService}">
+<screenlet>
                              <include-form name="runService" 
location="component://webtools/widget/ServiceForms.xml"/>
                          </screenlet>
                      </decorator-section>

Reply via email to