svn commit: r540865 - in /ofbiz/trunk/specialpurpose/assetmaint: webapp/assetmaint/includes/ widget/ widget/forms/

Author: jleroux
Date: Wed May 23 00:08:08 2007
New Revision: 540865

URL: http://svn.apache.org/viewvc?view=rev&rev=540865
Log:
A patch from Ashish Vijaywargiya refactored by Adrian Crum "AssetMaint Component UI Improvement." (https://issues.apache.org/jira/browse/OFBIZ-981)

Modified:
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
    ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/LookupForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml

Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl?view=diff&rev=540865&r1=540864&r2=540865
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl Wed May 23 00:08:08 2007
@@ -16,77 +16,14 @@
     specific language governing permissions and limitations
     under the License.
 -->
-
-<#if (requestAttributes.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
-<#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
-<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
-<#assign contextPath = request.getContextPath()>
-
 <#if userLogin?has_content>
-<#assign unselectedClass = {"col" : "tabdownblock", "left" : "tabdownleft", "center" : "tabdowncenter", "right" : "tabdownright", "link" : "tablink"}>
-<#assign selectedClass = {"col" : "mainblock", "left" : "tabupleft", "center" : "tabupcenter", "right" : "tabupright", "link" : "tablinkselected"}>
-<#--Just for now Later fix -->
-<#assign class = selectedClass>
-
-<table align="center" width="100%" border="0" cellspacing="0" cellpadding="0">
-  <tr bgcolor="#FFFFFF">
-    <td><div class="appbarleft"></div></td>
-    <td height="15" width="100%">
-      <table width="100%" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <#if appbarItem?if_exists != "fixedAssets"><#assign class = unselectedClass><#else><#assign class = selectedClass></#if>
-          <td height="15" class="${class.col}">
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">                
-              <tr>
-                <td class="${class.left}"><a href="<@ofbizUrl>/findFixedAssets</@ofbizUrl>"  title="${uiLabelMap.AccountingFixedAssets}" class="${class.link}"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" width="10" height="15" border="0"></a></td>
-                <td nowrap="nowrap" class="${class.center}"><a href="<@ofbizUrl>/findFixedAssets</@ofbizUrl>" class="${class.link}">${uiLabelMap.AccountingFixedAssets}</a></td>
-                <td class="${class.right}"><a href="<@ofbizUrl>/findFixedAssets</@ofbizUrl>" title="${uiLabelMap.AccountingFixedAssets}" class="${class.link}"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" width="10" height="15" border="0"></a></td>
-              </tr>
-              <#if appbarItem?if_exists != "fixedAssets">            
-              <tr><td colspan="3" class="blackarea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"></td></tr>
-              <tr><td colspan="3" class="whitearea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"></td></tr>              
-              </#if>
-            </table>
-          </td>
-          <#if appbarItem?if_exists != "fixedAssetMaints"><#assign class = unselectedClass><#else><#assign class = selectedClass></#if>
-          <td height="15" class="${class.col}">
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">                
-              <tr>
-                <td class="${class.left}"><a href="<@ofbizUrl>/findFixedAssetMaints</@ofbizUrl>"  title="${uiLabelMap.AccountingFixedAssetMaints}" class="${class.link}"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" width="10" height="15" border="0"></a></td>
-                <td nowrap="nowrap" class="${class.center}"><a href="<@ofbizUrl>/findFixedAssetMaints</@ofbizUrl>" class="${class.link}">${uiLabelMap.AccountingFixedAssetMaints}</a></td>
-                <td class="${class.right}"><a href="<@ofbizUrl>/findFixedAssetMaints</@ofbizUrl>" title="${uiLabelMap.AccountingFixedAssetMaints}" class="${class.link}"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" width="10" height="15" border="0"></a></td>
-              </tr>
-              <#if appbarItem?if_exists != "fixedAssetMaints">            
-              <tr><td colspan="3" class="blackarea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"></td></tr>
-              <tr><td colspan="3" class="whitearea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"></td></tr>              
-              </#if>
-            </table>
-          </td>
-          <#if appbarItem?if_exists != "facility"><#assign class = unselectedClass><#else><#assign class = selectedClass></#if>
-          <td height="15" class="${class.col}">
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">                
-              <tr>
-                <td class="${class.left}"><a href="<@ofbizUrl>/FindFacility?facilityTypeId=WAREHOUSE</@ofbizUrl>"  title="${uiLabelMap.ProductWarehouse}" class="${class.link}"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" width="10" height="15" border="0"></a></td>
-                <td nowrap="nowrap" class="${class.center}"><a href="<@ofbizUrl>/FindFacility?facilityTypeId=WAREHOUSE</@ofbizUrl>" class="${class.link}">${uiLabelMap.ProductWarehouse}</a></td>
-                <td class="${class.right}"><a href="<@ofbizUrl>/FindFacility?facilityTypeId=WAREHOUSE</@ofbizUrl>" title="${uiLabelMap.ProductWarehouse}" class="${class.link}"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" width="10" height="15" border="0"></a></td>
-              </tr>
-              <#if appbarItem?if_exists != "facility">            
-              <tr><td colspan="3" class="blackarea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"></td></tr>
-              <tr><td colspan="3" class="whitearea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"></td></tr>              
-              </#if>
-            </table>
-          </td>
-          <td><div class="appbarright"></div></td>            
-          <td width="100%" class="appbarresize">
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">                
-              <tr>
-                <td class="whitearea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"></td>              
-              </tr>              
-            </table>
-          </td>          
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
+    <div id="main-navigation">    
+        <ul>                              
+            <li<#if appbarItem?if_exists == "fixedAssets"> class="selected"</#if>><a href="<@ofbizUrl>/findFixedAssets</@ofbizUrl>">${uiLabelMap.AccountingFixedAssets}</a></li>    
+            <li<#if appbarItem?if_exists == "fixedAssetMaints"> class="selected"</#if>><a href="<@ofbizUrl>/findFixedAssetMaints</@ofbizUrl>">${uiLabelMap.AccountingFixedAssetMaints}</a></li>      
+            <li<#if appbarItem?if_exists == "facility"> class="selected"</#if>><a href="<@ofbizUrl>/FindFacility?facilityTypeId=WAREHOUSE</@ofbizUrl>">${uiLabelMap.ProductWarehouse}</a></li>
+        </ul>
+        <br class="clear"/>
+    </div>
 </#if>
+

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?view=diff&rev=540865&r1=540864&r2=540865
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Wed May 23 00:08:08 2007
@@ -29,11 +29,11 @@
             <widgets>
                 <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="boxoutside">
+                        <container style="screenlet">
                             <container style="screenlet-header">
                                 <label style="boxhead">${uiLabelMap.PageTitleFindFixedAssetMaints}</label>
                             </container>
-                            <container style="boxbottom">
+                            <container style="screenlet-body">
                                 <include-form name="FindFixedAssetMaint" location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
                             </container>
                         </container>
@@ -70,11 +70,11 @@
                     <decorator-section name="body">
                         <container><link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/></container>
                         <container><link target="printFixedAssetMaint.pdf?fixedAssetId=${fixedAssetId}&amp;maintHistSeqId=${maintHistSeqId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/></container>
-                        <container style="boxoutside">
+                        <container style="screenlet">
                             <container style="screenlet-header">
                                 <label style="boxhead">${uiLabelMap.AccountingNewFixedAssetMaint}</label>
                             </container>
-                            <container style="boxbottom">
+                            <container style="screenlet-body">
                                 <include-form name="EditFixedAssetMaint" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
                             </container>
                         </container>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml?view=diff&rev=540865&r1=540864&r2=540865
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml Wed May 23 00:08:08 2007
@@ -30,16 +30,15 @@
             <widgets>
                 <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="boxoutside">
+                        <container style="screenlet">
                            <container style="screenlet-header">
                               <label style="boxhead">${uiLabelMap.AccountingFixedAssets}</label>
                            </container>
-                           <container style="boxbottom">
+                           <container style="screenlet-body">
                               <include-form name="FindFixedAssets" location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
                            </container>
                         </container>
-                        <label>&lt;br/&gt;</label>
-                        <container>
+                        <container style="button-bar">
                             <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext" />
                         </container>
                         <include-form name="ListFixedAssets" location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
@@ -63,15 +62,16 @@
             <widgets>
                 <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
+                        <container style="button-bar">
                             <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext" />
                         </container>
-                        <label>&lt;br/&gt;</label>
-                        <container style="boxoutside">
+                        <container style="screenlet">
                             <container style="screenlet-header">
                                 <label style="boxhead">${uiLabelMap.AccountingEditFixedAsset}</label>
                             </container>
-                            <include-form name="EditFixedAsset" location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
+                            <container style="screenlet-body">
+                                <include-form name="EditFixedAsset" location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
+                            </container>
                         </container>
                         <!--platform-specific>
                             <html><html-template location="component://assetmaint/webapp/assetmaint/includes/EquipmentsFocus.ftl"/></html>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?view=diff&rev=540865&r1=540864&r2=540865
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Wed May 23 00:08:08 2007
@@ -24,7 +24,7 @@
         <field name="hideSearch"><hidden value="Y"/></field>
         <field name="fixedAssetId"  title="${uiLabelMap.AccountingFixedAssetId}"><text-find default-option="contains" ignore-case="true"/></field>
         <field name="instanceOfProductId" title="${uiLabelMap.AccountingInstanceOfProductId}"><text-find default-option="contains" ignore-case="true"/></field>
-        <field name="classEnumId" title="${uiLabelMap.AccountingFixedAssetClassEnumId}" widget-style="selectBox">
+        <field name="classEnumId" title="${uiLabelMap.AccountingFixedAssetClassEnumId}">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="FXAST_CLASS"/>
@@ -33,7 +33,7 @@
             </drop-down>
         </field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
-        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
     </form>
 
     <!-- list all assets in a tabular format -->
@@ -68,15 +68,15 @@
     </form>
 
     <!-- create and update a Equipment -->
-    <form name="EditFixedAsset" type="single" target="updateFixedAsset" title="${uiLabelMap.AccountingFixedAsset}" default-map-name="fixedAsset">
+    <form name="EditFixedAsset" type="single" target="updateFixedAsset" title="${uiLabelMap.AccountingFixedAsset}" default-map-name="fixedAsset" style="basic-form form-widget">
         <alt-target use-when="fixedAsset==null" target="createFixedAsset"/>
         <auto-fields-service service-name="updateFixedAsset" map-name="fixedAsset"/>
 
-        <field use-when="fixedAsset!=null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}"  tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
-        <field use-when="fixedAsset==null&amp;&amp;fixedAssetId==null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}"><text size="20" maxlength="20"/></field>
+        <field use-when="fixedAsset!=null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}"  tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field use-when="fixedAsset==null&amp;&amp;fixedAssetId==null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="20" maxlength="20"/></field>
         <field use-when="fixedAsset==null&amp;&amp;fixedAssetId!=null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${fixedAssetId}]"><text size="20" maxlength="20"/></field>
 
-        <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}" widget-style="selectBox">
+        <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}">
             <drop-down allow-empty="false">
                 <entity-options entity-name="FixedAssetType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -85,7 +85,7 @@
         </field>
         <field name="parentFixedAssetId" title="${uiLabelMap.AccountingFixedAssetParent}"><lookup target-form-name="LookupFixedAsset"/></field>
         <field name="instanceOfProductId" title="${uiLabelMap.AccountingInstanceOfProductId}"><lookup target-form-name="LookupProduct"/></field>
-        <field name="classEnumId" title="${uiLabelMap.AccountingFixedAssetClassEnumId}" widget-style="selectBox">
+        <field name="classEnumId" title="${uiLabelMap.AccountingFixedAssetClassEnumId}">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="FXAST_CLASS"/>
@@ -101,7 +101,8 @@
         <field name="productionCapacity"><hidden/></field>
         <field name="locatedAtFacilityId" title="${uiLabelMap.AccountingFacilityId}"><lookup target-form-name="LookupFacility"/></field>
         <field name="locatedAtLocationSeqId" title=""><hidden/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="fixedAssetId!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="fixedAssetId==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>        
     </form>
 
     <form name="FindFixedAssetMaint" default-map-name="timesheet" target="findFixedAssetMaints" title="" type="single">
@@ -111,7 +112,7 @@
         <field name="actualStartDate"><date-find/></field>
         
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
-        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
     </form>
     <form name="ListFixedAssetMaints" target="" title="" type="list" list-name="listIt" paginate-target="findFixedAssetMaints" paginate="true">
         <actions>
@@ -135,9 +136,9 @@
         <field name="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"><display/></field>
     </form>
     
-    <form name="EditFixedAssetMaint" type="single" default-map-name="fixedAssetMaint" target="updateFixedAssetMaintAndWorkEffort">
+    <form name="EditFixedAssetMaint" type="single" default-map-name="fixedAssetMaint" target="updateFixedAssetMaintAndWorkEffort" style="basic-form form-widget">
         <alt-target use-when="fixedAssetMaint==null" target="createFixedAssetMaintUpdateWorkEffort"/>
-        <field name="fixedAssetId" use-when="fixedAssetMaint==null" title="${uiLabelMap.AccountingFixedAssetId}"><lookup target-form-name="LookupFixedAsset"/></field>
+        <field name="fixedAssetId" use-when="fixedAssetMaint==null" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupFixedAsset"/></field>        
         <field name="dummy" use-when="fixedAssetMaint !=null" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${fixedAssetMaint.fixedAssetId}" target="EditFixedAsset?fixedAssetId=${fixedAssetMaint.fixedAssetId}"/>
         </field>
@@ -168,7 +169,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="intervalQuantity" required-field="true" position="1" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}"><text size="10"/></field>
+        <field name="intervalQuantity" position="1" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}" tooltip="${uiLabelMap.CommonRequired}"><text size="10"/></field>
         <field name="intervalMeterTypeId" position="1" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="ProductMeterType" key-field-name="productMeterTypeId">
@@ -198,7 +199,8 @@
             <lookup target-form-name="LookupPerson"/>
         </field>
         <field name="purchaseOrderId"><text/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="fixedAssetMaint!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="fixedAssetMaint==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
 
     <form name="AddItemIssuance"  target="issueInventoryItemToFixedAssetMaint" title="PageTitleFixedAssetMaintItemIssuance" default-map-name="newIssuanceItem" type="single">
@@ -214,7 +216,7 @@
         <field name="quantity" position="1" title="${uiLabelMap.CommonQuantity}*"><text size="10"/></field>
         <field name="maintHistSeqId"><hidden/></field>
         <field name="fixedAssetId"><hidden/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
 
     <form name="ListItemIssuance"  title="PageTitleFixedAssetMaintItemIssuance" type="list"  list-name="itemIssuanceList" style="basic-form form-widget">

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/LookupForms.xml?view=diff&rev=540865&r1=540864&r2=540865
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/LookupForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/LookupForms.xml Wed May 23 00:08:08 2007
@@ -21,15 +21,13 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <!-- Person Lookup forms -->
-    <form name="lookupPerson" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="inputBox"
-        target="LookupPerson" title="" type="single">
+    <form name="lookupPerson" target="LookupPerson" title="" type="single">
         <!--<auto-fields-entity entity-name="Person" default-field-type="find" />-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
         <field name="lastName"  title="${uiLabelMap.PartyLastName}"><text-find/></field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field>
     </form>
 </forms>
         

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml?view=diff&rev=540865&r1=540864&r2=540865
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Wed May 23 00:08:08 2007
@@ -21,9 +21,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
-    <form name="EditProduct" type="single"
-            target="updateProduct" title="" default-map-name="product"
-            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+    <form name="EditProduct" type="single" target="updateProduct" title="" default-map-name="product">
 
         <alt-target use-when="product==null" target="createProduct"/>
 
@@ -41,7 +39,7 @@
         <field name="comments" title="${uiLabelMap.CommonComments}"><text size="60" maxlength="250"/></field>
         <field name="requireInventory"><hidden value="N"/></field>
         <field name="autoCreateKeywords"><hidden value="N"/></field>
-        <field name="primaryProductCategoryId" title="${uiLabelMap.ProductPrimaryCategory}" widget-style="selectBox">
+        <field name="primaryProductCategoryId" title="${uiLabelMap.ProductPrimaryCategory}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="ProductCategory" key-field-name="productCategoryId" description="${description} [${productCategoryId}]">
                     <entity-constraint name="productCategoryTypeId" value="CATALOG_CATEGORY"/>
@@ -49,19 +47,17 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="submitButton" title="Update" use-when="product!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="submitButton" title="Create" use-when="product==null" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field use-when="product!=null" name="lastUpdatedByText" title="${uiLabelMap.ProductLastModifiedBy}:" widget-style="tabletext">
+        <field name="submitButton" title="Update" use-when="product!=null"><submit button-type="button"/></field>
+        <field name="submitButton" title="Create" use-when="product==null"><submit button-type="button"/></field>
+        <field use-when="product!=null" name="lastUpdatedByText" title="${uiLabelMap.ProductLastModifiedBy}:">
             <display description="[${product.lastModifiedByUserLogin}] ${uiLabelMap.CommonOn} ${product.lastModifiedDate}" also-hidden="false"/>
         </field>
-        <field use-when="product!=null" name="createdByText" title="${uiLabelMap.ProductCreatedBy}:" widget-style="tabletext">
+        <field use-when="product!=null" name="createdByText" title="${uiLabelMap.ProductCreatedBy}:">
             <display description="[${product.createdByUserLogin}] ${uiLabelMap.CommonOn} ${product.createdDate}" also-hidden="false"/>
         </field>
     </form>
     <!-- List Product  -->
-    <form name="ListProducts" type="list" list-name="listIt" paginate-target="${submitTarget}"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        default-title-area-style="viewOneTR1" even-row-style="viewManyTR2" odd-row-style="viewManyTR1">
+    <form name="ListProducts" type="list" list-name="listIt" paginate-target="${submitTarget}">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="parameters"/>
@@ -77,22 +73,17 @@
             <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct?productId=${productId}"/>
         </field>
     </form>
-    <form name="lookupProduct"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
-        target="${submitTarget}" type="single">
+    <form name="lookupProduct" target="${submitTarget}" type="single">
         <!-- <auto-fields-entity entity-name="Product" default-field-type="hidden" /> -->
         <field name="productId" title="${uiLabelMap.CommonId}"><text-find default-option="contains" ignore-case="true"/></field>
         <field name="brandName" title="${uiLabelMap.ProductBrandName}"><text-find default-option="contains" ignore-case="true"/></field>
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find default-option="contains" ignore-case="true"/></field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
        <!-- <field name="isVariant"><hidden value="N"/></field>  -->
-        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
     </form>
 
-    <form name="listLookupProduct"
-        default-title-style="tableheadtext"  default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-name="listIt" paginate-target="${submitTarget}"
-        title="" type="list">
+    <form name="listLookupProduct" list-name="listIt" paginate-target="${submitTarget}" title="" type="list">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="parameters"/>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?view=diff&rev=540865&r1=540864&r2=540865
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Wed May 23 00:08:08 2007
@@ -51,7 +51,7 @@
         <field map-name="workEffort" name="fixedAssetId"  title="${uiLabelMap.AccountingFixedAssetId}"><hidden/></field>
         <field map-name="workEffort" name="moneyUomId" title="${uiLabelMap.CommonCurrency}"><ignored/></field>
         <field map-name="workEffort" name="workEffortTypeId"><hidden value="TASK"/></field>
-        <field map-name="workEffort" name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field>
+        <field map-name="workEffort" name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field>
     </form>
 
     <form name="AddWorkEffortChild"  target="createWorkEffortAndAssoc" title="" type="single">
@@ -90,7 +90,7 @@
         </field>
         <field name="actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><date-time/></field>
         <field name="actualCompletionDate" title="${uiLabelMap.WorkEffortActualEndDate}"><date-time/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
     
     <form name="WorkEffortChildren"  target="updateWorkEffortAndAssoc" title="" type="list" separate-columns="true">
@@ -121,7 +121,7 @@
         </field>
         <field name="actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><date-time/></field>
         <field name="actualCompletionDate" title="${uiLabelMap.WorkEffortActualEndDate}"><date-time/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
     <form name="AddWorkEffortTimeEntry" type="single" target="createWorkEffortTimeEntry" title="">
         <auto-fields-service service-name="createTimeEntry"/>
@@ -133,7 +133,7 @@
         <field name="timesheetId"><lookup size="10" target-form-name="LookupTimesheet"/></field>
         
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPerson" default-value="${timesheet.partyId}"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox">
+        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
             <drop-down>
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -142,7 +142,7 @@
         </field>
         <field name="invoiceId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
         <field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
-        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
     <!-- TimeEntry -->
     <form name="ListWorkEffortTimeEntries" type="list" list-name="timesheetEntries" target="updateWorkEffortTimeEntry">
@@ -166,7 +166,7 @@
             </lookup>
         </field>
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPerson" default-value="${timesheet.partyId}"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox">
+        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
             <drop-down>
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -177,7 +177,7 @@
         <field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
         <field name="invoiceInfo"><hidden/></field>
         <field name="comments"><text size="60"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title="" widget-style="buttontext">
             <hyperlink target="deleteWorkEffortTimeEntry?maintHistSeqId=${maintHistSeqId}&amp;fixedAssetId=${fixedAssetId}&amp;workEffortId=${workEffortId}&amp;timeEntryId=${timeEntryId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
@@ -194,9 +194,9 @@
         <field name="workEffortId"><hidden/></field>
         <field name="fixedAssetId"><hidden/></field>
         <field name="maintHistSeqId"><hidden/></field>
-        <field name="noteId" widget-style="tabletext"><display/></field>
-        <field name="noteInfo" title="${uiLabelMap.CommonNote}" widget-style="tabletext"><display/></field>
-        <field name="noteParty" title="${uiLabelMap.CommonBy}" widget-style="tabletext"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field>
+        <field name="noteId"><display/></field>
+        <field name="noteInfo" title="${uiLabelMap.CommonNote}"><display/></field>
+        <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field>
     </form>
     
     <form name="AddWorkEffortNote" type="single" target="createWorkEffortNote" title="">
@@ -208,6 +208,6 @@
         <field name="noteInfo" title="${uiLabelMap.OrderNote}"><textarea cols="70" rows="5" /></field>
         <field name="noteParty"><hidden/></field>
         <field name="noteName"><hidden/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
 </forms>