Return-Path: 
 <commits-return-7407-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org>
Delivered-To: apmail-ofbiz-commits-archive@www.apache.org
Received: (qmail 50213 invoked from network); 2 Jun 2008 02:05:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 2 Jun 2008 02:05:34 -0000
Received: (qmail 83387 invoked by uid 500); 2 Jun 2008 02:05:37 -0000
Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org
Received: (qmail 83356 invoked by uid 500); 2 Jun 2008 02:05:37 -0000
Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ofbiz.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ofbiz.apache.org>
List-Post: <mailto:commits@ofbiz.apache.org>
List-Id: <commits.ofbiz.apache.org>
Reply-To: dev@ofbiz.apache.org
Delivered-To: mailing list commits@ofbiz.apache.org
Received: (qmail 83347 invoked by uid 99); 2 Jun 2008 02:05:37 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jun 2008 19:05:37 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jun 2008 02:04:47 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E9D3E2388A1B; Sun,  1 Jun 2008 19:05:07 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r662307 - in /ofbiz/trunk/specialpurpose/assetmaint:
 config/
 webapp/assetmaint/WEB-INF/ webapp/assetmaint/includes/ widget/ widget/forms/
Date: Mon, 02 Jun 2008 02:05:07 -0000
To: commits@ofbiz.apache.org
From: adrianc@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080602020507.E9D3E2388A1B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: adrianc
Date: Sun Jun  1 19:05:07 2008
New Revision: 662307

URL: http://svn.apache.org/viewvc?rev=662307&view=rev
Log:
Changes to Asset Maint component to re-use existing screens better.

Modified:
    ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
    ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml

Modified: ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml?rev=662307&r1=662306&r2=662307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml Sun Jun  1 19:05:07 2008
@@ -28,16 +28,6 @@
         <value xml:lang="it">Posizione</value>
         <value xml:lang="th">ที่ตั้ง</value>
     </property>
-    <property key="AccountingFindFixedAsset">
-        <value xml:lang="en">Find Equipments</value>
-        <value xml:lang="it">Ricerca Cespite</value>
-        <value xml:lang="th">ค้นหาเครื่องมือ</value>
-    </property>
-    <property key="AccountingFixedAsset">
-        <value xml:lang="en">Equipment</value>
-        <value xml:lang="it">Cespite</value>
-        <value xml:lang="th">เครื่องมือ</value>
-    </property>
     <property key="AccountingFixedAssetChildren">
         <value xml:lang="en">Children</value>
         <value xml:lang="it">Figlio</value>
@@ -123,11 +113,6 @@
         <value xml:lang="it">Costi Standard</value>
         <value xml:lang="th">ราคามาตรฐาน</value>
     </property>
-    <property key="AccountingFixedAssets">
-        <value xml:lang="en">Equipments</value>
-        <value xml:lang="it">Cespiti</value>
-        <value xml:lang="th">เครื่องมือ</value>
-    </property>
     <property key="AccountingInstanceOfProductId">
         <value xml:lang="en">Manufacturer Product Id</value>
         <value xml:lang="it">Codice Prodotto Produttore</value>

Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml?rev=662307&r1=662306&r2=662307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml Sun Jun  1 19:05:07 2008
@@ -31,12 +31,6 @@
         <response name="success" type="view" value="main"/>
     </request-map>
 
-    <request-map uri="findFixedAssets">
-        <security https="true" auth="true" />
-        <response name="success" type="view" value="FindFixedAssets" />
-        <response name="error" type="view" value="FindFixedAssets" />
-    </request-map>
-
     <!-- FixedAssetMaintenance -->
     <request-map uri="ListFixedAssetMaints">
         <security https="true" auth="true"/>
@@ -172,22 +166,10 @@
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
-    <view-map name="main" type="screen" page="component://assetmaint/widget/FixedAssetScreens.xml#FindFixedAssets"/>
-
-    <!-- FixedAsset and Relationship management screens -->    
-    <view-map name="FindFixedAssets" type="screen" page="component://assetmaint/widget/FixedAssetScreens.xml#FindFixedAssets" />
-    <view-map name="EditFixedAsset" type="screen" page="component://assetmaint/widget/FixedAssetScreens.xml#EditFixedAsset" />
-    <view-map name="FixedAssetChildren" type="screen" page="component://assetmaint/widget/FixedAssetScreens.xml#FixedAssetChildren"/>
-    <view-map name="updateFixedAssetCalendar" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#updateFixedAssetCalendar"/> 
-    <view-map name="EditFixedAssetStdCosts" type="screen" page="component://assetmaint/widget/FixedAssetScreens.xml#EditFixedAssetStdCosts"/>
-    <view-map name="EditFixedAssetIdents" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAssetIdents"/>
-    <view-map name="EditFixedAssetRegistrations" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAssetRegistrations"/>
-    <view-map name="ListFixedAssetMaints" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetMaints"/>
+    <view-map name="main" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssets"/> 
 
     <!-- FixedAsset Maintenance screens -->
-    <view-map name="FindFixedAssetMaints" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#FindFixedAssetMaints" />
     <view-map name="EditFixedAssetMaint" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditFixedAssetMaint"/>
-    <view-map name="EditFixedAssetMaintMeters" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditFixedAssetMaintMeters"/>
     <view-map name="EditWorkEfforts" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditWorkEfforts"/>
     <view-map name="EditWorkEffortTimeEntries" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditWorkEffortTimeEntries"/>
     <view-map name="EditWorkEffortNotes" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditWorkEffortNotes"/>

Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml?rev=662307&r1=662306&r2=662307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml Sun Jun  1 19:05:07 2008
@@ -43,6 +43,11 @@
         <param-value>component://assetmaint/widget/CommonScreens.xml</param-value>
         <description>The location of the CommonFacilityDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
     </context-param>
+    <context-param>
+        <param-name>fixedAssetMaintDecoratorLocation</param-name>
+        <param-value>component://assetmaint/widget/AssetMaintScreens.xml</param-value>
+        <description>The location of the CommonFixedAssetMaintDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+    </context-param>
 
     <filter>
         <filter-name>ContextFilter</filter-name>

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?rev=662307&r1=662306&r2=662307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl Sun Jun  1 19:05:07 2008
@@ -21,7 +21,7 @@
     <h2>${uiLabelMap.AssetMaintApplication}</h2>
     <ul>                               
         <#if userLogin?has_content>
-            <li<#if selected == "fixedAssets"> class="selected"</#if>><a href="<@ofbizUrl>/findFixedAssets</@ofbizUrl>">${uiLabelMap.AccountingFixedAssets}</a></li>     
+            <li<#if selected == "ListFixedAssets"> class="selected"</#if>><a href="<@ofbizUrl>/ListFixedAssets</@ofbizUrl>">${uiLabelMap.AccountingFixedAssets}</a></li>     
             <li<#if selected == "fixedAssetMaints"> class="selected"</#if>><a href="<@ofbizUrl>/findFixedAssetMaints</@ofbizUrl>">${uiLabelMap.AccountingFixedAssetMaints}</a></li>      
             <li<#if selected == "facility"> class="selected"</#if>><a href="<@ofbizUrl>/FindFacility?facilityTypeId=WAREHOUSE</@ofbizUrl>">${uiLabelMap.ProductFacility}</a></li>
             <li class="opposed"><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
@@ -33,3 +33,7 @@
 </div> 
 
 
+
+
+
+

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=662307&r1=662306&r2=662307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Sun Jun  1 19:05:07 2008
@@ -21,6 +21,30 @@
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
 
+    <screen name="CommonFixedAssetMaintDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="ListFixedAssetMaints"/>
+                <set field="tabButtonItem" value="ListFixedAssetMaints"/>                
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonFixedAssetDecorator" location="component://accounting/widget/FixedAssetScreens.xml">
+                    <decorator-section name="pre-body">
+                        <section>
+                            <condition><not><if-empty field-name="maintHistSeqId"/></not></condition>
+                            <widgets>
+                                <include-menu name="FixedAssetMaintTabBar" location="component://assetmaint/widget/Menus.xml"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="FindFixedAssetMaints">
         <section>
             <actions>
@@ -28,7 +52,7 @@
                 <set field="labelTitleProperty" value="AccountingFixedAssetMaint"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonFixedAssetMaintDecorator">
                     <decorator-section name="body">
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
@@ -70,8 +94,7 @@
     <screen name="EditFixedAssetMaint">
         <section>
             <actions>
-                <set field="labelTitleProperty" value="AccountingFixedAssetMaint"/>
-                <set field="tabButtonItemFixedAssetMaint" value="EditFixedAssetMaint"/>
+                <set field="titleProperty" value="PageTitleEditFixedAssetMaintenance"/>
                 <script location="component://assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/editMaint.bsh"/>
                 <set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
                 <set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/>
@@ -90,7 +113,12 @@
                 <set field="title" value="${uiLabelMap.AccountingFixedAssetMaint}: ${fixedAsset.fixedAssetName}"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}">
+                <section>
+                    <condition><if-empty field-name="maintHistSeqId"/></condition>
+                    <actions><set field="titleProperty" value="AccountingAddFixedAssetMaintenance"/></actions>
+                    <widgets/>
+                </section>
+                <decorator-screen name="CommonFixedAssetMaintDecorator">
                     <decorator-section name="body">
                         <section>
                             <condition><not><if-empty field-name="maintHistSeqId"/></not></condition>
@@ -99,71 +127,9 @@
                                     <link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/>
                                     <link target="printFixedAssetMaint.pdf?fixedAssetId=${fixedAssetId}&amp;maintHistSeqId=${maintHistSeqId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
                                 </container>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar">
-                                        <container style="h3">
-                                            <label text="${uiLabelMap.FixedAssetMaintWorkEffortName}"/>
-                                        </container>
-                                    </container>
-                                    <container style="screenlet-body">
-                                        <include-form name="EditFixedAssetMaint" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
-                                    </container>
-                                </container>
                             </widgets>
-                            <fail-widgets>
-                                <container style="button-bar"><label/></container>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar">
-                                        <container style="h3">
-                                            <label text="${uiLabelMap.AccountingNewFixedAssetMaint}"/>
-                                        </container>
-                                    </container>
-                                    <container style="screenlet-body">
-                                        <include-form name="EditFixedAssetMaint" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
-                                    </container>
-                                </container>
-                            </fail-widgets>
                         </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="EditFixedAssetMaintMeters">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleEditFixedAssetMaintenance"/>
-                <set field="tabButtonItemFixedAssetMaint" value="EditFixedAssetMeter"/>
-                <set field="labelTitleProperty" value="PageTitleEditFixedAssetMaintenance"/>
-                <set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
-                <set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/>
-                <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
-                <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleEditFixedAssetMaintenance}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <include-form name="ListFixedAssetMaintMeters" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleEditFixedAssetMaintenance}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <include-form name="AddFixedAssetMaintMeter" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
-                            </container>
-                        </container>
+                        <include-form name="EditFixedAssetMaint" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -178,55 +144,21 @@
                 <script location="component://assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.bsh"/>                
             </actions>
             <widgets>
-                <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonFixedAssetMaintDecorator">
                     <decorator-section name="body">
                         <section>
                             <condition>
                                 <if-empty field-name="workEffort"/>
                             </condition>
                             <widgets>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar">
-                                        <container style="h3">
-                                            <label text="${uiLabelMap.PageTitleEditWorkEffort}"/>
-                                        </container>
-                                    </container>
-                                    <container style="screenlet-body">
-                                        <include-form name="EditWorkEffort" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
-                                    </container>
-                                </container>
+                                <include-form name="EditWorkEffort" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
                             </widgets>
                             <fail-widgets>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar">
-                                        <container style="h3">
-                                            <label text="${uiLabelMap.PageTitleEditWorkEffort}"/>
-                                        </container>
-                                    </container>
-                                    <container style="screenlet-body">
-                                        <include-form name="EditWorkEffort" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
-                                    </container>
-                                </container>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar">
-                                        <container style="h3">
-                                            <label text="${uiLabelMap.PageTitleChildWorkEfforts}"/>
-                                        </container>
-                                    </container>
-                                    <container style="screenlet-body">
-                                        <include-form name="WorkEffortChildren" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
-                                    </container>
-                                </container>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar">
-                                        <container style="h3">
-                                            <label text="${uiLabelMap.PageTitleChildWorkEfforts}"/>
-                                        </container>
-                                    </container>
-                                    <container style="screenlet-body">
-                                        <include-form name="AddWorkEffortChild" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
-                                    </container>
-                                </container>
+                                <include-form name="EditWorkEffort" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
+                                <screenlet id="add-workeffort-task" title="${uiLabelMap.WorkEffortAddTask}" collapsible="true">
+                                    <include-form name="AddWorkEffortChild" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
+                                </screenlet>
+                                <include-form name="WorkEffortChildren" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
                             </fail-widgets>
                         </section>
                     </decorator-section>
@@ -250,28 +182,12 @@
                 <script location="component://assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.bsh"/>                
             </actions>
             <widgets>
-                <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonFixedAssetMaintDecorator">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortTimeEntries}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <include-form name="ListWorkEffortTimeEntries" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortTimeEntry}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <include-form name="AddWorkEffortTimeEntry" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
-                            </container>
-                        </container>
+                        <screenlet id="add-time-entry" title="${uiLabelMap.PageTitleAddWorkEffortTimeEntry}" collapsible="true">
+                            <include-form name="AddWorkEffortTimeEntry" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortTimeEntries" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -293,28 +209,12 @@
                 <script location="component://assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.bsh"/>                
             </actions>
             <widgets>
-                <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonFixedAssetMaintDecorator">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListWorkEffortNotes}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <include-form name="ListWorkEffortNotes" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddWorkEffortNotes}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <include-form name="AddWorkEffortNote" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
-                            </container>
-                        </container>
+                        <screenlet id="add-workeffort-note" title="${uiLabelMap.PageTitleAddWorkEffortNotes}" collapsible="true">
+                            <include-form name="AddWorkEffortNote" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListWorkEffortNotes" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -337,28 +237,12 @@
                 </entity-condition>
             </actions>
             <widgets>
-                <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonFixedAssetMaintDecorator">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListItemIssuance}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <include-form name="ListItemIssuance" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleAddItemIssuance}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <include-form name="AddItemIssuance" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
-                            </container>
-                        </container>
+                        <screenlet id="add-item-issuance" title="${uiLabelMap.PageTitleAddItemIssuance}" collapsible="true">
+                            <include-form name="AddItemIssuance" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
+                        </screenlet>
+                        <include-form name="ListItemIssuance" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -401,4 +285,4 @@
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=662307&r1=662306&r2=662307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Sun Jun  1 19:05:07 2008
@@ -20,6 +20,7 @@
 
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
     <screen name="main-decorator">
         <section>
             <actions>
@@ -43,72 +44,6 @@
         </section>
     </screen>
 
-    <screen name="CommonFixedAssetDecorator"><!--Appbar level decorator-->
-        <section>
-            <actions>
-                <set field="headerItem" global="true" value="fixedAssets"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator">
-                    <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <if-has-permission permission="ASSETMAINT" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <section>
-                                    <condition><not><if-empty field-name="fixedAsset"/></not></condition>
-                                    <widgets>
-                                        <include-menu name="FixedAssetTabBar" location="component://assetmaint/widget/Menus.xml"/>
-                                    </widgets>
-                                </section>
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3" text="${uiLabelMap.AssetMaintViewPermissionError}"/>
-                            </fail-widgets>
-                        </section>                    
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="CommonFixedAssetMaintDecorator"><!--Appbar level decorator-->
-        <section>
-            <actions>
-                <set field="headerItem" value="fixedAssetMaints"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator">
-                    <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <if-has-permission permission="ASSETMAINT" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <section>
-                                    <condition><not><if-empty field-name="maintHistSeqId"/></not></condition>
-                                    <widgets>
-                                        <include-menu name="FixedAssetMaintTabBar" location="component://assetmaint/widget/Menus.xml"/>
-                                        <label style="h1" text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${fixedAsset.fixedAssetName} [${fixedAssetId}]  ${${extraFunctionName}}"/>
-                                    </widgets>
-                                    <fail-widgets>
-                                        <label style="h1" text="${uiLabelMap.${labelTitleProperty}}"/>
-                                    </fail-widgets>
-                                </section>
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3" text="${uiLabelMap.AssetMaintViewPermissionError}"/>
-                            </fail-widgets>
-                        </section>                    
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
     <screen name="CommonFacilityDecorator">
         <section>
             <actions>
@@ -118,10 +53,13 @@
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="pre-body">
+                        <include-menu name="FacilityTabBar" location="component://assetmaint/widget/Menus.xml"/>
+                    </decorator-section>
                     <decorator-section name="body">
                         <section>
                             <condition>
-                                <if-has-permission permission="ASSETMAINT" action="_VIEW"/>
+                                <if-service-permission service-name="facilityGenericPermission" main-action="VIEW"/>
                             </condition>
                             <widgets>
                                 <section>
@@ -132,7 +70,6 @@
                                         </or>
                                     </condition>
                                     <widgets>
-                                        <include-menu name="FacilityTabBar" location="component://assetmaint/widget/Menus.xml"/>
                                         <decorator-section-include name="body"/>
                                     </widgets>
                                     <fail-widgets>
@@ -149,5 +86,6 @@
             </widgets>
         </section>
     </screen>
+
 </screens>
         

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml?rev=662307&r1=662306&r2=662307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml Sun Jun  1 19:05:07 2008
@@ -21,200 +21,6 @@
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
 
-    <screen name="FindFixedAssets">
-        <section>
-            <actions>
-                <set field="titleProperty" value="AccountingFindFixedAsset"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.AccountingFindFixedAsset}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <container style="button-bar">
-                                            <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/>
-                                        </container>
-                                        <include-form name="FindFixedAssets" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>                     
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.AccountingFindFixedAsset}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="ListFixedAssets" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <!-- Create/Update Equipment -->
-    <screen name="EditFixedAsset">
-        <section>
-            <actions>
-                <set field="titleProperty" value="AccountingEditFixedAsset"/>
-                <set field="labelTitleProperty" value="AccountingEditFixedAsset" />
-                <set field="tabButtonItem" value="EditFixedAsset" />
-                <set field="fixedAssetId" from-field="parameters.fixedAssetId" />
-                <entity-one entity-name="FixedAsset" value-name="fixedAsset" />
-                <property-map resource="AssetMaintUiLabels" map-name="uiLabelMap"/>
-                <set field="fixedAssetName" from-field="fixedAsset.fixedAssetName" default-value="${uiLabelMap.AccountingNewFixedAsset}"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <condition><not><if-empty field-name="fixedAssetId"/></not></condition>
-                            <widgets>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar">
-                                        <container style="h3">
-                                            <label text="${uiLabelMap.AccountingEditFixedAsset} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAsset.fixedAssetId}]  ${${extraFunctionName}}"/>
-                                        </container>
-                                    </container>
-                                    <container style="screenlet-body">
-                                        <section>
-                                            <widgets>    
-                                                <container style="button-bar">
-                                                    <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/>
-                                                </container>
-                                                <include-form name="EditFixedAsset" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
-                                            </widgets>
-                                        </section>
-                                    </container>
-                                </container>
-                            </widgets>
-                            <fail-widgets>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar">
-                                        <container style="h3">
-                                            <label text="${uiLabelMap.AccountingNewFixedAsset}"/>
-                                        </container>
-                                    </container>
-                                    <container style="screenlet-body">
-                                        <section>
-                                            <widgets>    
-                                                <include-form name="EditFixedAsset" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
-                                            </widgets>
-                                        </section>
-                                    </container>
-                                </container>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="FixedAssetChildren">
-        <section>
-            <actions>
-                <set field="titleProperty" value="AccountingFixedAssetChildren"/>
-                <set field="labelTitleProperty" value="AccountingFixedAssetChildren"/>
-                <set field="tabButtonItem" value="FixedAssetChildren"/>
-                <set field="rootAssetId" from-field="parameters.rootAssetId" default-value="${parameters.fixedAssetId}"/>
-                <set field="fixedAssetId" from-field="rootAssetId"/>
-                <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
-                <set field="trail" from-field="parameters.trail" default-value="${parameters.fixedAssetId}"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.AccountingFixedAssetChildren} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAsset.fixedAssetId}]  ${${extraFunctionName}}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-tree name="TreeFixedAsset" location="component://assetmaint/widget/AssetMaintTrees.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="EditFixedAssetStdCosts">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleEditFixedAssetStdCost"/>
-                <set field="labelTitleProperty" value="AccountingFixedAssetStdCosts"/>
-                <set field="tabButtonItem" value="EditFixedAssetStdCosts"/>
-                
-                <set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
-                <set field="fixedAssetStdCostTypeId" from-field="parameters.fixedAssetStdCostTypeId"/>
-                <set field="fromDate" from-field="parameters.fromDate"/>
-                
-                <entity-one entity-name="FixedAsset" value-name="fixedAsset" auto-field-map="true"/>
-                <entity-one entity-name="FixedAssetStdCost" value-name="fixedAssetStdCost" auto-field-map="true"/>
-                <set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
-                <entity-one entity-name="FixedAsset" value-name="fixedAsset" auto-field-map="true"/>
-                <entity-and entity-name="FixedAssetStdCost" list-name="fixedAssetStdCosts">
-                    <field-map env-name="fixedAsset.fixedAssetId" field-name="fixedAssetId"/>
-                </entity-and>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleEditFixedAssetStdCost} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAsset.fixedAssetId}]  ${${extraFunctionName}}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                        <include-form name="ListFixedAssetStdCosts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleEditFixedAssetStdCost}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>    
-                                         <include-form name="EditFixedAssetStdCost" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
     <screen name="CommonCalendarDecorator">
         <section>
             <actions>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=662307&r1=662306&r2=662307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Sun Jun  1 19:05:07 2008
@@ -21,42 +21,7 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
     
-    <menu name="FixedAssetTabBar" default-menu-item-name="EditFixedAsset" type="simple"
-         default-selected-style="selected" menu-container-style="button-bar tab-bar">
-        <menu-item name="EditFixedAsset" title="${uiLabelMap.AccountingFixedAsset}">
-            <link target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/>
-        </menu-item>
-        <menu-item name="FixedAssetChildren" title="${uiLabelMap.AccountingFixedAssetChildren}">
-            <link target="FixedAssetChildren?rootAssetId=${fixedAssetId}&amp;trail=${fixedAssetId}"/>
-        </menu-item>
-        <menu-item name="ListFixedAssetCalendar" title="${uiLabelMap.AccountingFixedAssetCalendar}">
-            <link target="week?fixedAssetId=${fixedAssetId}"/>
-        </menu-item>
-        <menu-item name="EditFixedAssetStdCosts" title="${uiLabelMap.AccountingFixedAssetStdCosts}">
-            <link target="EditFixedAssetStdCosts?fixedAssetId=${fixedAssetId}"/>
-        </menu-item>
-        <menu-item name="EditFixedAssetIdents" title="${uiLabelMap.AccountingFixedAssetIdents}">
-            <link target="EditFixedAssetIdents?fixedAssetId=${fixedAssetId}"/>
-        </menu-item>
-        <menu-item name="EditFixedAssetRegistrations" title="${uiLabelMap.AccountingFixedAssetRegistrations}">
-            <link target="EditFixedAssetRegistrations?fixedAssetId=${fixedAssetId}"/>
-        </menu-item>
-        <menu-item name="ListFixedAssetMaints" title="${uiLabelMap.AccountingFixedAssetMaints}">
-            <link target="ListFixedAssetMaints?fixedAssetId=${fixedAssetId}"/>
-        </menu-item>
-        <menu-item name="EditPartyFixedAssetAssignments" title="${uiLabelMap.AccountingPartyFixedAssetAssignments}">
-            <link target="EditPartyFixedAssetAssignments?fixedAssetId=${fixedAssetId}"/>
-        </menu-item>
-    </menu>
-
-    <menu name="FixedAssetMaintTabBar" selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint" default-menu-item-name="EditFixedAssetMaint"
-         default-selected-style="selected" menu-container-style="button-bar tab-bar">
-        <menu-item name="EditFixedAssetMaint" title="${uiLabelMap.AccountingFixedAssetMaint}">
-            <link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
-        </menu-item>
-        <menu-item name="EditFixedAssetMeter" title="${uiLabelMap.AccountingFixedAssetMaintMeters}">
-            <link target="EditFixedAssetMaintMeters?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
-        </menu-item>
+    <menu name="FixedAssetMaintTabBar" extends="FixedAssetMaintTabBar" extends-resource="component://accounting/widget/Menus.xml">
         <menu-item name="EditWorkEfforts" title="${uiLabelMap.WorkEffortAllTasks}">
             <link target="EditWorkEfforts?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}&amp;workEffortId=${fixedAssetMaint.scheduleWorkEffortId}"/>
         </menu-item>
@@ -69,13 +34,10 @@
         <menu-item name="EditItemIssuances" title="${uiLabelMap.FixedAssetMaintItemIssuance}">
             <link target="EditItemIssuances?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
         </menu-item>
-        <menu-item name="EditFixedAssetMaintOrders" title="${uiLabelMap.AccountingFixedAssetMaintOrders}">
-            <link target="EditFixedAssetMaintOrders?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
-        </menu-item>
     </menu>  
     
     <menu name="FacilityTabBar" default-menu-item-name="ViewFacilityInventoryByProduct"
-         default-selected-style="selected" menu-container-style="button-bar tab-bar">
+         default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
         <menu-item name="EditFacility" title="${uiLabelMap.ProductFacility}">
             <link target="EditFacility?facilityId=${facilityId}"/>
         </menu-item>
@@ -88,6 +50,9 @@
         <menu-item name="ViewFacilityInventoryByProduct" title="${uiLabelMap.ProductInventory}">
             <link target="ViewFacilityInventoryByProduct?facilityId=${facilityId}"/>
         </menu-item>
+        <menu-item name="EditFacilityInventoryItems" title="${uiLabelMap.ProductInventoryItems}">
+            <link target="EditFacilityInventoryItems?facilityId=${facilityId}"/>
+        </menu-item>
         <menu-item name="ReceiveInventory" title="${uiLabelMap.ProductInventoryReceive}">
             <link target="ReceiveInventory?facilityId=${facilityId}"/>
         </menu-item>
@@ -108,4 +73,5 @@
             <link target="month?fixedAssetId=${fixedAssetId}"/>
         </menu-item>
     </menu>
-</menus>
\ No newline at end of file
+
+</menus>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=662307&r1=662306&r2=662307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Sun Jun  1 19:05:07 2008
@@ -229,7 +229,7 @@
     </form>
 
     <form name="ListItemIssuance"  title="PageTitleFixedAssetMaintItemIssuance" type="list"  list-name="itemIssuanceList" 
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="productId" title="Part Id"><display/></field>
         <field name="quantity" position="1" title="${uiLabelMap.CommonQuantity}"><display/></field>
         <field name="productName" position="1" title="${uiLabelMap.CommonName}"><display/></field>
@@ -239,4 +239,4 @@
             <hyperlink description="${uiLabelMap.CommonReturn}" target="returnPartIssuedToFixedAssetMaint?itemIssuanceId=${itemIssuanceId}&amp;fixedAssetId=${fixedAssetId}&amp;maintHistSeqId=${maintHistSeqId}"/>
         </field>
     </form>
-</forms>
\ No newline at end of file
+</forms>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=662307&r1=662306&r2=662307&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Sun Jun  1 19:05:07 2008
@@ -94,8 +94,8 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
     
-    <form name="WorkEffortChildren"  target="updateWorkEffortAndAssoc" title="" type="list" separate-columns="true"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+    <form name="WorkEffortChildren" target="updateWorkEffortAndAssoc" title="" type="list" separate-columns="true"
+        odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="WorkEffortAssocView">
                 <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortIdFrom"/>
@@ -159,7 +159,7 @@
     </form>
     <!-- TimeEntry -->
     <form name="ListWorkEffortTimeEntries" type="list" list-name="timesheetEntries" target="updateWorkEffortTimeEntry"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="TimeEntry">
                 <condition-expr field-name="workEffortId" env-name="workEffortId"/>
@@ -199,7 +199,7 @@
     
     <!-- WorkEffort Note -->
     <form name="ListWorkEffortNotes" type="list" list-name="workEffortNotes"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="WorkEffortNoteAndData">
                 <condition-expr field-name="workEffortId" env-name="workEffortId"/>
@@ -226,4 +226,4 @@
         <field name="noteName"><hidden/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
-</forms>
\ No newline at end of file
+</forms>