svn commit: r529202 - in /ofbiz/trunk/applications/product: webapp/facility/facility/PickMoveStock.ftl webapp/facility/facility/PicklistManage.ftl webapp/facility/facility/PicklistOptions.ftl widget/facility/FacilityScreens.xml widget/facility/Menus.xml

[jacopoc]

Author: jacopoc
Date: Mon Apr 16 03:56:25 2007
New Revision: 529202

URL: http://svn.apache.org/viewvc?view=rev&rev=529202
Log:
Improved navigation for picklist related facility screens.

Modified:
    ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
    ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
    ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
    ofbiz/trunk/applications/product/widget/facility/Menus.xml

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl?view=diff&rev=529202&r1=529201&r2=529202
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl Mon Apr 16 03:56:25 2007
@@ -20,9 +20,6 @@
 <div class="screenlet">
     <div class="screenlet-header">
         <div class="simple-right-half">
-            <a href="<@ofbizUrl>PicklistOptions?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductPicklistOptions}</a>
-            <a href="<@ofbizUrl>PicklistManage?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductPicklistManage}</a>
-            <a href="<@ofbizUrl>PickMoveStock?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductStockMoves}</a>
             <a href="<@ofbizUrl>PickMoveStockSimple?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrint}</a>
         </div>
         <div class="boxhead">${uiLabelMap.ProductStockMovesNeeded}</div>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl?view=diff&rev=529202&r1=529201&r2=529202
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl Mon Apr 16 03:56:25 2007
@@ -19,11 +19,6 @@
 
 <div class="screenlet">
     <div class="screenlet-header">
-        <div class="simple-right-half">
-            <a href="<@ofbizUrl>PicklistOptions?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductPicklistOptions}</a>
-            <a href="<@ofbizUrl>PicklistManage?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductPicklistManage}</a>
-            <a href="<@ofbizUrl>PickMoveStock?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductStockMoves}</a>
-        </div>
         <div class="boxhead">${uiLabelMap.ProductPicklistManage}</div>
     </div>
     <div class="screenlet-body">

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl?view=diff&rev=529202&r1=529201&r2=529202
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Mon Apr 16 03:56:25 2007
@@ -19,11 +19,6 @@
 
 <div class="screenlet">
     <div class="screenlet-header">
-        <div class="simple-right-half">
-            <a href="<@ofbizUrl>PicklistOptions?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="submenutext">${uiLabelMap.ProductPicklistOptions}</a>
-            <a href="<@ofbizUrl>PicklistManage?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="submenutext">${uiLabelMap.ProductPicklistManage}</a>
-            <a href="<@ofbizUrl>PickMoveStock?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.ProductStockMoves}</a>
-        </div>
         <div class="boxhead">${uiLabelMap.ProductFindOrdersToPick}</div>
     </div>
     <div class="screenlet-body">

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=529202&r1=529201&r2=529202
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Mon Apr 16 03:56:25 2007
@@ -645,7 +645,7 @@
             <actions>
                 <set field="titleProperty" value="PageTitlePickListOptions"/>
                 <set field="headerItem" value="facility"/>
-                <set field="tabButtonItem" value="PicklistOptions"/>
+                <set field="tabButtonItem" value="PicklistManage"/>
 
                 <set field="facilityId" from-field="parameters.facilityId"/>
                 <service service-name="getPicklistDisplayInfo">
@@ -681,7 +681,7 @@
             <actions>
                 <set field="titleProperty" value="PageTitlePickingMoveStock"/>
                 <set field="headerItem" value="facility"/>
-                <set field="tabButtonItem" value="PicklistOptions"/>
+                <set field="tabButtonItem" value="PickMoveStock"/>
 
                 <set field="facilityId" from-field="parameters.facilityId"/>
                 <service service-name="findStockMovesNeeded">

Modified: ofbiz/trunk/applications/product/widget/facility/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/Menus.xml?view=diff&rev=529202&r1=529201&r2=529202
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Mon Apr 16 03:56:25 2007
@@ -52,8 +52,14 @@
         <menu-item name="ReceiveReturn" title="${uiLabelMap.ProductReceiveReturn}">
             <link target="ReceiveReturn?facilityId=${facilityId}"/>
         </menu-item>
+        <menu-item name="PickMoveStock" title="${uiLabelMap.ProductStockMoves}">
+            <link target="PickMoveStock?facilityId=${facilityId}"/>
+        </menu-item>
         <menu-item name="PicklistOptions" title="${uiLabelMap.ProductPicking}">
             <link target="PicklistOptions?facilityId=${facilityId}"/>
+        </menu-item>
+        <menu-item name="PicklistManage" title="${uiLabelMap.ProductPicklistManage}">
+            <link target="PicklistManage?facilityId=${facilityId}"/>
         </menu-item>
         <menu-item name="PackOrder" title="${uiLabelMap.ProductPacking}">
             <link target="PackOrder?facilityId=${facilityId}"/>