Author: adrianc
Date: Tue May 20 15:43:21 2008
New Revision: 658473
URL: http://svn.apache.org/viewvc?rev=658473&view=rev
Log:
Updated the Asset Maint component to reuse existing screens.
Removed:
ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FacilityForms.xml
Modified:
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml
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=658473&r1=658472&r2=658473&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
Tue May 20 15:43:21 2008
@@ -203,9 +203,6 @@
<view-map name="LookupPartsProduct" type="screen"
page="component://assetmaint/widget/ProductScreens.xml#LookupPartsProduct"/>
<view-map name="LookupWorkEffortShort" type="screen"
page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffortShort"/>
- <!-- Facility screens -->
- <view-map name="FindFacility" type="screen"
page="component://assetmaint/widget/FacilityScreens.xml#FindFacility"/>
-
<!-- Asset Maint Calendar screens -->
<view-map name="day" type="screen"
page="component://assetmaint/widget/FixedAssetScreens.xml#CalendarDay"/>
<view-map name="week" type="screen"
page="component://assetmaint/widget/FixedAssetScreens.xml#CalendarWeek"/>
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=658473&r1=658472&r2=658473&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
(original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
Tue May 20 15:43:21 2008
@@ -23,7 +23,7 @@
<#if userLogin?has_content>
<li<#if selected == "fixedAssets"> class="selected"</#if>><a
href="<@ofbizUrl>/findFixedAssets</@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.ProductWarehouse}</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>
<#else>
<li class="opposed"><a
href="<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
@@ -32,3 +32,4 @@
<br class="clear"/>
</div>
+
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml?rev=658473&r1=658472&r2=658473&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml Tue May 20
15:43:21 2008
@@ -20,38 +20,6 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
- <screen name="FindFacility">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleFindFacility"/>
- <set field="headerItem" value="facility"/>
- <entity-condition entity-name="Facility"
list-name="facilities">
- <condition-expr field-name="facilityTypeId"
value="WAREHOUSE"/>
- <order-by field-name="facilityId"/>
- </entity-condition>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindFacility}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListFacilities"
location="component://assetmaint/widget/forms/FacilityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="ViewFacilityInventoryByProduct">
<section>
<actions>
