ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mrisal...@apache.org
Subject svn commit: r609427 [1/2] - in /ofbiz/trunk/applications/product: config/ webapp/facility/facility/ webapp/facility/group/ webapp/facility/inventory/ widget/facility/
Date Sun, 06 Jan 2008 22:06:05 GMT
Author: mrisaliti
Date: Sun Jan  6 14:06:04 2008
New Revision: 609427

URL: http://svn.apache.org/viewvc?rev=609427&view=rev
Log:
Picking/Shipments/Inventory forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1556)

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
    ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
    ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
    ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
    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/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl
    ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl
    ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
    ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Sun Jan  6 14:06:04 2008
@@ -396,6 +396,7 @@
 ProductAssociationsToProduct=Associations TO this Product from
 ProductAssocs=Assocs
 ProductAtp=ATP
+ProductAtpQoh=Atp/Qoh
 ProductAtpQohSerial=ATP/QOH or Serial#
 ProductAttachmentScreenLocation=Attachment Screen Location (XSL-FO)
 ProductAttributes=Attributes
@@ -2025,4 +2026,9 @@
 FormFieldTitle_parentTypeId=Parent Type Id
 FormFieldTitle_reportType=Report Type
 FormFieldTitle_availableToPromiseTotal=Available To Promise Total
-FormFieldTitle_addtlShippingChargeDesc=Addtl Shipping Charge Desc
\ No newline at end of file
+FormFieldTitle_addtlShippingChargeDesc=Addtl Shipping Charge Desc
+FormFieldTitle_inventoryTransferId=Inventory Transfer Id
+FormFieldTitle_locationSeqIdTo=Location Seq Id To
+FormFieldTitle_sendDate=Send Date
+FormFieldTitle_receiveDate=Receive Date
+FormFieldTitle_facilityIdTo=Facility Id To
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Sun Jan  6 14:06:04 2008
@@ -391,6 +391,7 @@
 ProductAssociationsToProduct=Associazioni a questo Prodotto da
 ProductAssocs=Associazioni
 ProductAtp=ATP
+ProductAtpQoh=Atp/Qoh
 ProductAtpQohSerial=ATP/QOH o # Seriale
 ProductAttachmentScreenLocation=Allegato Locazione Videata (XSL-FO)
 ProductAttributes=Attributi
@@ -2008,4 +2009,9 @@
 FormFieldTitle_parentTypeId=Tipo Padre
 FormFieldTitle_reportType=Tipo Report
 FormFieldTitle_availableToPromiseTotal=Totale Disponibilit\u00e0 Promessa
-FormFieldTitle_addtlShippingChargeDesc=Descrizione Ricarico Aggiuntivo Spedizione
\ No newline at end of file
+FormFieldTitle_addtlShippingChargeDesc=Descrizione Ricarico Aggiuntivo Spedizione
+FormFieldTitle_inventoryTransferId=Numero Trasferimento Inventario
+FormFieldTitle_locationSeqIdTo=Sequenza Locazione Destinazione
+FormFieldTitle_sendDate=Data Invio
+FormFieldTitle_receiveDate=Data Ricezione
+FormFieldTitle_facilityIdTo=Stabilimento Destinazione
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl Sun Jan  6 14:06:04 2008
@@ -19,7 +19,7 @@
 
 <#if !mechMap.facilityContactMech?exists && mechMap.contactMech?exists>
   <p><h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3></p>
-  &nbsp;<a href="<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">[${uiLabelMapCommon.Back}]</a>
+  &nbsp;<a href="<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMapCommon.Back}</a>
 <#else>
   <#if !mechMap.contactMech?exists>
     <#-- When creating a new contact mech, first select the type, then actually create -->
@@ -28,15 +28,15 @@
     <form method="post" action='<@ofbizUrl>EditContactMech</@ofbizUrl>' name="createcontactmechform">
       <input type='hidden' name='facilityId' value='${facilityId}'>
       <input type='hidden' name='DONE_PAGE' value='${donePage?if_exists}'>
-      <table width="90%" border="0" cellpadding="2" cellspacing="0">
+      <table width="90%" class="basic-table" cellspacing="0">
         <tr>
-          <td width="26%"><div class="tabletext">${uiLabelMap.PartySelectContactType}:</div></td>
+          <td width="26%">${uiLabelMap.PartySelectContactType}</td>
           <td width="74%">
-            <select name="preContactMechTypeId" class="selectBox">
+            <select name="preContactMechTypeId" >
               <#list mechMap.contactMechTypes as contactMechType>
                 <option value='${contactMechType.contactMechTypeId}'>${contactMechType.get("description",locale)}</option>
               </#list>
-            </select>&nbsp;<a href="javascript:document.createcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonCreate}]</a>
+            </select>&nbsp;<a href="javascript:document.createcontactmechform.submit()" class="buttontext">${uiLabelMap.CommonCreate}</a>
           </td>
         </tr>
       </table>
@@ -47,12 +47,12 @@
   <#if mechMap.contactMechTypeId?has_content>
     <#if !mechMap.contactMech?has_content>
       <h1>${uiLabelMap.PartyCreateNewContact}</h1>
-    &nbsp;<a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class="buttontext">[${uiLabelMap.CommonGoBack}]</a>
-    &nbsp;<a href="javascript:document.editcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a>
+    &nbsp;<a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonGoBack}</a>
+    &nbsp;<a href="javascript:document.editcontactmechform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
       <#if contactMechPurposeType?exists>
-        <div>(${uiLabelMap.PartyMsgContactHavePurpose}<b>"${contactMechPurposeType.get("description",locale)?if_exists}"</b>)</div>
+        <div><span class="label">(${uiLabelMap.PartyMsgContactHavePurpose}</span>"${contactMechPurposeType.get("description",locale)?if_exists}")</div>
       </#if>
-      <table width="90%" border="0" cellpadding="2" cellspacing="0">
+      <table width="90%" class="basic-table" cellspacing="0">
         <form method="post" action='<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>' name="editcontactmechform">
         <input type='hidden' name='DONE_PAGE' value='${donePage}'>
         <input type='hidden' name='contactMechTypeId' value='${mechMap.contactMechTypeId}'>
@@ -63,21 +63,23 @@
         <#if paymentMethodId?exists><input type='hidden' name='paymentMethodId' value='${paymentMethodId}'></#if>
     <#else>
       <h1>${uiLabelMap.PartyEditContactInformation}</h1>
-    &nbsp;<a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class='buttontext'>[${uiLabelMap.CommonGoBack}]</a>
-    &nbsp;<a href="javascript:document.editcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a>
-      <table width="90%" border="0" cellpadding="2" cellspacing="0">
+    &nbsp;<a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class='buttontext'>${uiLabelMap.CommonGoBack}</a>
+    &nbsp;<a href="javascript:document.editcontactmechform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
+      <table width="90%" class="basic-table" cellspacing="0">
         <#if mechMap.purposeTypes?has_content>
         <tr>
-          <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyContactPurposes}</div></td>
+          <td width="26%" align="right" valign="top"><span class="label">${uiLabelMap.PartyContactPurposes}</span></td>
           <td width="5">&nbsp;</td>
           <td width="74%">
-            <table border='0' cellspacing='1' bgcolor='black'>
+            <table class="basic-table" cellspacing="0">
             <#if mechMap.facilityContactMechPurposes?has_content>
+              <#assign alt_row = false>
               <#list mechMap.facilityContactMechPurposes as facilityContactMechPurpose>
                 <#assign contactMechPurposeType = facilityContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
-                <tr>
-                  <td bgcolor='white'>
-                    <div class="tabletext">&nbsp;
+                <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+                  <td>
+                    <div>
+                      &nbsp;
                       <#if contactMechPurposeType?has_content>
                         <b>${contactMechPurposeType.get("description",locale)}</b>
                       <#else>
@@ -85,18 +87,21 @@
                       </#if>
                       (${uiLabelMap.CommonSince}:${facilityContactMechPurpose.fromDate.toString()})
                       <#if facilityContactMechPurpose.thruDate?has_content>(${uiLabelMap.CommonExpires}: ${facilityContactMechPurpose.thruDate.toString()}</#if>
-                    &nbsp;</div></td>
-                  <td bgcolor='white'><div><a href='<@ofbizUrl>deleteFacilityContactMechPurpose?facilityId=${facilityId}&contactMechId=${contactMechId}&contactMechPurposeTypeId=${facilityContactMechPurpose.contactMechPurposeTypeId}&fromDate=${facilityContactMechPurpose.fromDate.toString()}&DONE_PAGE=${donePage}&useValues=true</@ofbizUrl>' class='buttontext'>&nbsp;${uiLabelMap.CommonDelete}&nbsp;</a></div></td>
+                      &nbsp;
+                    </div>
+                  </td>
+                  <td><a href='<@ofbizUrl>deleteFacilityContactMechPurpose?facilityId=${facilityId}&contactMechId=${contactMechId}&contactMechPurposeTypeId=${facilityContactMechPurpose.contactMechPurposeTypeId}&fromDate=${facilityContactMechPurpose.fromDate.toString()}&DONE_PAGE=${donePage}&useValues=true</@ofbizUrl>' class='buttontext'>&nbsp;${uiLabelMap.CommonDelete}&nbsp;</a></td>
                 </tr>
+                <#-- toggle the row color -->
+                <#assign alt_row = !alt_row>
               </#list>
               </#if>
-
               <tr>
                 <form method="post" action='<@ofbizUrl>createFacilityContactMechPurpose?DONE_PAGE=${donePage}&useValues=true</@ofbizUrl>' name='newpurposeform'>
                 <input type="hidden" name='facilityId' value='${facilityId}'>
                 <input type="hidden" name='contactMechId' value='${contactMechId?if_exists}'>
-                  <td bgcolor='white'>
-                    <select name='contactMechPurposeTypeId' class="selectBox">
+                  <td>
+                    <select name='contactMechPurposeTypeId'>
                       <option></option>
                       <#list mechMap.purposeTypes as contactMechPurposeType>
                         <option value='${contactMechPurposeType.contactMechPurposeTypeId}'>${contactMechPurposeType.get("description",locale)}</option>
@@ -104,7 +109,7 @@
                     </select>
                   </td>
                 </form>
-                <td bgcolor='white'><div><a href='javascript:document.newpurposeform.submit()' class='buttontext'>${uiLabelMap.PartyAddPurpose}</a></div></td>
+                <td><a href='javascript:document.newpurposeform.submit()' class='buttontext'>${uiLabelMap.PartyAddPurpose}</a></td>
               </tr>
             </table>
           </td>
@@ -118,45 +123,45 @@
 
   <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId?if_exists>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyToName}</div></td>
+      <td width="26%" align="right" valign="top">${uiLabelMap.PartyToName}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
-        <input type="text" class="inputBox" size="30" maxlength="60" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')?if_exists)}">
+        <input type="text" size="30" maxlength="60" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')?if_exists)}">
       </td>
     </tr>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyAttentionName}</div></td>
+      <td width="26%" align="right" valign="top">${uiLabelMap.PartyAttentionName}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
-        <input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')?if_exists)}">
+        <input type="text" size="30" maxlength="60" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')?if_exists)}">
       </td>
     </tr>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyAddressLine1}</div></td>
+      <td width="26%" align="right" valign="top">${uiLabelMap.PartyAddressLine1}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
-        <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}">
+        <input type="text" size="30" maxlength="30" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}">
       *</td>
     </tr>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td>
+      <td width="26%" align="right" valign="top">${uiLabelMap.PartyAddressLine2}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
-          <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')?if_exists)}">
+          <input type="text" size="30" maxlength="30" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')?if_exists)}">
       </td>
     </tr>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyCity}</div></td>
+      <td width="26%" align="right" valign="top">${uiLabelMap.PartyCity}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
-          <input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}">
+          <input type="text" size="30" maxlength="30" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}">
       *</td>
     </tr>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyState}</div></td>
+      <td width="26%" align="right" valign="top">${uiLabelMap.PartyState}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
-        <select name="stateProvinceGeoId" class="selectBox">
+        <select name="stateProvinceGeoId">
           <option>${(mechMap.postalAddress.stateProvinceGeoId)?if_exists}</option>
           <option></option>
            ${screens.render("component://common/widget/CommonScreens.xml#states")}
@@ -164,14 +169,14 @@
       *</td>
     </tr>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyZipCode}</div></td>
+      <td width="26%" align="right" valign="top">${uiLabelMap.PartyZipCode}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
-        <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}">
+        <input type="text" size="12" maxlength="10" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}">
       *</td>
     </tr>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyCountry}</div></td>
+      <td width="26%" align="right" valign="top">${uiLabelMap.PartyCountry}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
         <select name="countryGeoId" class="selectBox">
@@ -183,43 +188,43 @@
     </tr>
   <#elseif "TELECOM_NUMBER" = mechMap.contactMechTypeId?if_exists>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyPhoneNumber}</div></td>
+      <td width="26%" align="right" valign="top">${uiLabelMap.PartyPhoneNumber}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
-        <input type="text" class="inputBox" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')?if_exists)}">
-        -&nbsp;<input type="text" class="inputBox" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')?if_exists)}">
-        -&nbsp;<input type="text" class="inputBox" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')?if_exists)}">
-        &nbsp;ext&nbsp;<input type="text" class="inputBox" size="6" maxlength="10" name="extension" value="${(mechMap.facilityContactMech.extension)?default(request.getParameter('extension')?if_exists)}">
+        <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')?if_exists)}">
+        -&nbsp;<input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')?if_exists)}">
+        -&nbsp;<input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')?if_exists)}">
+        &nbsp;ext&nbsp;<input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.facilityContactMech.extension)?default(request.getParameter('extension')?if_exists)}">
       </td>
     </tr>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext"></div></td>
+      <td width="26%" align="right" valign="top">&nbsp;</td>
       <td width="5">&nbsp;</td>
-      <td><div class="tabletext">[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div></td>
+      <td><div>[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div></td>
     </tr>
   <#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId?if_exists>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyEmailAddress}</div></td>
+      <td width="26%" align="right" valign="top">${uiLabelMap.PartyEmailAddress}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
-          <input type="text" class="inputBox" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}">
+          <input type="text" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}">
       *</td>
     </tr>
   <#else>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${mechMap.contactMechType.get("description",locale)}</div></td>
+      <td width="26%" align="right" valign="top">${mechMap.contactMechType.get("description",locale)}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
-          <input type="text" class="inputBox" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}">
+          <input type="text" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}">
       *</td>
     </tr>
   </#if>
   </form>
   </table>
 
-    &nbsp;<a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class="buttontext">[${uiLabelMap.CommonGoBack}]</a>
-    &nbsp;<a href="javascript:document.editcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a>
+    &nbsp;<a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonGoBack}</a>
+    &nbsp;<a href="javascript:document.editcontactmechform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
   <#else>
-    &nbsp;<a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class="buttontext">[${uiLabelMap.CommonGoBack}]</a>
+    &nbsp;<a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonGoBack}</a>
   </#if>
 </#if>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Sun Jan  6 14:06:04 2008
@@ -624,7 +624,7 @@
         <field name="productId" entry-name="product.productId" widget-style="buttontext">
             <hyperlink target="/catalog/control/EditProduct?productId=${product.productId}" target-type="inter-app" description="${product.productId}"/>
         </field>
-        <field name="productName" entry-name="product.internalName"><display/></field>
+        <field name="productName" title="${uiLabelMap.ProductProductName}" entry-name="product.internalName"><display/></field>
         <field name="serialNumber" entry-name="inventoryItem.serialNumber"><display/></field>
         <field name="atpQoh" title="${uiLabelMap.ProductAtpQoh}"><display description="${inventoryItem.availableToPromiseTotal}/${inventoryItem.quantityOnHandTotal}"/></field>
         <field name="locationSeqIdTo"><display/></field>
@@ -660,7 +660,7 @@
         <field name="productId" entry-name="product.productId" widget-style="buttontext">
             <hyperlink target="/catalog/control/EditProduct?productId=${product.productId}" target-type="inter-app" description="${product.productId}"/>
         </field>
-        <field name="productName" entry-name="product.internalName"><display/></field>
+        <field name="productName" title="${uiLabelMap.ProductProductName}" entry-name="product.internalName"><display/></field>
         <field name="serialNumber" entry-name="inventoryItem.serialNumber"><display/></field>
         <field name="atpQoh" title="${uiLabelMap.ProductAtpQoh}"><display description="${inventoryItem.availableToPromiseTotal}/${inventoryItem.quantityOnHandTotal}"/></field>
         <field name="locationSeqId"><display/></field>
@@ -697,7 +697,7 @@
         <field name="productId" entry-name="product.productId" widget-style="buttontext">
             <hyperlink target="/catalog/control/EditProduct?productId=${product.productId}" target-type="inter-app" description="${product.productId}" also-hidden="false"/>
         </field>
-        <field name="productName" entry-name="product.internalName"><display also-hidden="false"/></field>
+        <field name="productName" title="${uiLabelMap.ProductProductName}" entry-name="product.internalName"><display also-hidden="false"/></field>
         <field name="serialNumber" entry-name="inventoryItem.serialNumber"><display also-hidden="false"/></field>
         <field name="atpQoh" title="${uiLabelMap.ProductAtpQoh}"><display description="${inventoryItem.availableToPromiseTotal}/${inventoryItem.quantityOnHandTotal}" also-hidden="false"/></field>
         <field name="locationSeqId"><display also-hidden="false"/></field>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Sun Jan  6 14:06:04 2008
@@ -78,7 +78,7 @@
         <br/>
         <span class="head1">${uiLabelMap.CommonFound}:&nbsp;</span><span class="head2"><b>${foundLocations.size()}</b>&nbsp;${uiLabelMap.ProductLocationsFor}&nbsp;<#if facility?exists>${(facility.facilityName)?if_exists}</#if> [ID:${facilityId?if_exists}]</span>
         <br/>
-        <table class="basic-table hover-bar hover-bar" cellspacing="0">
+        <table class="basic-table hover-bar" cellspacing="0">
         <tr class="header-row">
             <td>${uiLabelMap.ProductFacility}</td>
             <td>${uiLabelMap.ProductLocationSeqId}</td>

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?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl Sun Jan  6 14:06:04 2008
@@ -18,11 +18,12 @@
 -->
 
 <div class="screenlet">
-    <div class="screenlet-header">
-        <div class="simple-right-half">
-            <a href="<@ofbizUrl>PickMoveStockSimple?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrint}</a>
-        </div>
-        <div class="boxhead">${uiLabelMap.ProductStockMovesNeeded}</div>
+    <div class="screenlet-title-bar">
+        <ul>
+            <li class="head3">${uiLabelMap.ProductStockMovesNeeded}</li>
+            <li><a href="<@ofbizUrl>PickMoveStockSimple?facilityId=${facilityId?if_exists}</@ofbizUrl>">${uiLabelMap.CommonPrint}</a></li>
+        </ul>
+        <br class="clear"/>
     </div>
     <div class="screenlet-body">
           <form method="post" action="<@ofbizUrl>processPhysicalStockMove</@ofbizUrl>" name='selectAllForm' style='margin: 0;'>
@@ -30,25 +31,26 @@
               <input type="hidden" name="facilityId" value="${facilityId?if_exists}">   
               <input type="hidden" name="_useRowSubmit" value="Y">
               <#assign rowCount = 0>
-              <table border="1" cellspacing="0" cellpadding="2">
-                <tr>
-                    <td><div class="tableheadtext">${uiLabelMap.ProductProductId}</div></td>
-                    <td><div class="tableheadtext">${uiLabelMap.ProductProduct}</div></td>
-                    <td><div class="tableheadtext">${uiLabelMap.ProductFromLocation}</div></td>
-                    <td><div class="tableheadtext">${uiLabelMap.ProductQoh}</div></td>
-                    <td><div class="tableheadtext">${uiLabelMap.ProductAtp}</div></td>
-                    <td><div class="tableheadtext">${uiLabelMap.ProductToLocation}</div></td>
-                    <td><div class="tableheadtext">${uiLabelMap.ProductQoh}</div></td>
-                    <td><div class="tableheadtext">${uiLabelMap.ProductAtp}</div></td>
-                    <td><div class="tableheadtext">${uiLabelMap.ProductMinimumStock}</div></td>
-                    <td><div class="tableheadtext">${uiLabelMap.ProductMoveQuantity}</div></td>
-                    <td><div class="tableheadtext">${uiLabelMap.OrderConfirm}</div></td>
+              <table cellspacing="0" class="basic-table hover-bar">
+                <tr class="header-row">
+                    <td>${uiLabelMap.ProductProductId}</td>
+                    <td>${uiLabelMap.ProductProduct}</td>
+                    <td>${uiLabelMap.ProductFromLocation}</td>
+                    <td>${uiLabelMap.ProductQoh}</td>
+                    <td>${uiLabelMap.ProductAtp}</td>
+                    <td>${uiLabelMap.ProductToLocation}</td>
+                    <td>${uiLabelMap.ProductQoh}</td>
+                    <td>${uiLabelMap.ProductAtp}</td>
+                    <td>${uiLabelMap.ProductMinimumStock}</td>
+                    <td>${uiLabelMap.ProductMoveQuantity}</td>
+                    <td>${uiLabelMap.OrderConfirm}</td>
                     <td align="right">
-                        <span class="tableheadtext">${uiLabelMap.ProductSelectAll}</span>&nbsp;
+                        ${uiLabelMap.ProductSelectAll}&nbsp;
                         <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');">
                     </td>
                 </tr>
                 <#if moveByOisgirInfoList?has_content || moveByPflInfoList?has_content>
+                    <#assign alt_row = false>
                     <#list moveByOisgirInfoList?if_exists as moveByOisgirInfo>
                         <#assign product = moveByOisgirInfo.product>
                         <#assign facilityLocationFrom = moveByOisgirInfo.facilityLocationFrom>
@@ -57,29 +59,31 @@
                         <#assign targetProductFacilityLocation = moveByOisgirInfo.targetProductFacilityLocation>
                         <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOneCache("TypeEnumeration"))?if_exists>
                         <#assign totalQuantity = moveByOisgirInfo.totalQuantity>
-                        <tr>
-                            <td><div class="tabletext">${product.productId}</div></td>
-                            <td><div class="tabletext">${product.internalName?if_exists}</div></td>
-                            <td><div class="tabletext">${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</div></td>
-                            <td><div class="tabletext">${moveByOisgirInfo.quantityOnHandTotalFrom?if_exists}</div></td>
-                            <td><div class="tabletext">${moveByOisgirInfo.availableToPromiseTotalFrom?if_exists}</div></td>
-                            <td><div class="tabletext">${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</div></td>
-                            <td><div class="tabletext">${moveByOisgirInfo.quantityOnHandTotalTo?if_exists}</div></td>
-                            <td><div class="tabletext">${moveByOisgirInfo.availableToPromiseTotalTo?if_exists}</div></td>
-                            <td><div class="tabletext">${targetProductFacilityLocation.minimumStock?if_exists}</div></td>
-                            <td><div class="tabletext">${targetProductFacilityLocation.moveQuantity?if_exists}</div></td>
+                        <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+                            <td>${product.productId}</td>
+                            <td>${product.internalName?if_exists}</td>
+                            <td>${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</td>
+                            <td>${moveByOisgirInfo.quantityOnHandTotalFrom?if_exists}</td>
+                            <td>${moveByOisgirInfo.availableToPromiseTotalFrom?if_exists}</td>
+                            <td>${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</td>
+                            <td>${moveByOisgirInfo.quantityOnHandTotalTo?if_exists}</td>
+                            <td>${moveByOisgirInfo.availableToPromiseTotalTo?if_exists}</td>
+                            <td>${targetProductFacilityLocation.minimumStock?if_exists}</td>
+                            <td>${targetProductFacilityLocation.moveQuantity?if_exists}</td>
                             <td align="right">              
                                 <input type="hidden" name="productId_o_${rowCount}" value="${product.productId?if_exists}">
                                 <input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId?if_exists}">
                                 <input type="hidden" name="locationSeqId_o_${rowCount}" value="${facilityLocationFrom.locationSeqId?if_exists}">
                                 <input type="hidden" name="targetLocationSeqId_o_${rowCount}" value="${facilityLocationTo.locationSeqId?if_exists}">
-                                <input type="text" class="inputBox" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}">
+                                <input type="text" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}">
                             </td>
                             <td align="right">              
                                 <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');">
                             </td>
                         </tr>
-                        <#assign rowCount = rowCount + 1>   
+                        <#assign rowCount = rowCount + 1>
+                        <#-- toggle the row color -->
+                        <#assign alt_row = !alt_row>
                     </#list>
                     <#list moveByPflInfoList?if_exists as moveByPflInfo>
                         <#assign product = moveByPflInfo.product>
@@ -89,17 +93,17 @@
                         <#assign targetProductFacilityLocation = moveByPflInfo.targetProductFacilityLocation>
                         <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOneCache("TypeEnumeration"))?if_exists>
                         <#assign totalQuantity = moveByPflInfo.totalQuantity>
-                        <tr>
-                            <td><div class="tabletext">${product.productId}</div></td>
-                            <td><div class="tabletext">${product.internalName?if_exists}</div></td>
-                            <td><div class="tabletext">${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</div></td>
-                            <td><div class="tabletext">${moveByPflInfo.quantityOnHandTotalFrom?if_exists}</div></td>
-                            <td><div class="tabletext">${moveByPflInfo.availableToPromiseTotalFrom?if_exists}</div></td>
-                            <td><div class="tabletext">${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</div></td>
-                            <td><div class="tabletext">${moveByPflInfo.quantityOnHandTotalTo?if_exists}</div></td>
-                            <td><div class="tabletext">${moveByPflInfo.availableToPromiseTotalTo?if_exists}</div></td>
-                            <td><div class="tabletext">${targetProductFacilityLocation.minimumStock?if_exists}</div></td>
-                            <td><div class="tabletext">${targetProductFacilityLocation.moveQuantity?if_exists}</div></td>
+                        <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+                            <td>${product.productId}</td>
+                            <td>${product.internalName?if_exists}</td>
+                            <td>${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</td>
+                            <td>${moveByPflInfo.quantityOnHandTotalFrom?if_exists}</td>
+                            <td>${moveByPflInfo.availableToPromiseTotalFrom?if_exists}</td>
+                            <td>${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</td>
+                            <td>${moveByPflInfo.quantityOnHandTotalTo?if_exists}</td>
+                            <td>${moveByPflInfo.availableToPromiseTotalTo?if_exists}</td>
+                            <td>${targetProductFacilityLocation.minimumStock?if_exists}</td>
+                            <td>${targetProductFacilityLocation.moveQuantity?if_exists}</td>
                             <td align="right">              
                                 <input type="hidden" name="productId_o_${rowCount}" value="${product.productId?if_exists}">
                                 <input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId?if_exists}">
@@ -130,4 +134,4 @@
             <input type="hidden" name="_rowCount" value="${rowCount}">
         </form>
     </div>
-</div>
+</div>
\ No newline at end of file

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?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl Sun Jan  6 14:06:04 2008
@@ -18,8 +18,11 @@
 -->
 
 <div class="screenlet">
-    <div class="screenlet-header">
-        <div class="boxhead">${uiLabelMap.ProductPicklistManage}</div>
+    <div class="screenlet-title-bar">
+        <ul>
+            <li class="head3">${uiLabelMap.ProductPicklistManage}</li>
+        </ul>
+        <br class="clear"/>
     </div>
     <div class="screenlet-body">
         <#if picklistInfoList?has_content>
@@ -27,13 +30,13 @@
                 <#assign picklist = picklistInfo.picklist>
 
                 <#-- Picklist -->
-                <div class="tabletext">
-                    <b>${uiLabelMap.ProductPickList}</b> <span class="head2">${picklist.picklistId}</span>
-                    <b>${uiLabelMap.CommonDate}</b> ${picklist.picklistDate}
+                <div>
+                    <span class="label">${uiLabelMap.ProductPickList}</span> ${picklist.picklistId}
+                    <span class="label">${uiLabelMap.CommonDate}</span> ${picklist.picklistDate}
                     <form method="post" action="<@ofbizUrl>updatePicklist</@ofbizUrl>" style="display: inline;">
                         <input type="hidden" name="facilityId" value="${facilityId}"/>
                         <input type="hidden" name="picklistId" value="${picklist.picklistId}"/>
-                        <select name="statusId" class="smallSelect">
+                        <select name="statusId">
                             <option value="${picklistInfo.statusItem.statusId}" selected>${picklistInfo.statusItem.get("description",locale)}</option>
                             <option value="${picklistInfo.statusItem.statusId}">---</option>
                             <#list picklistInfo.statusValidChangeToDetailList as statusValidChangeToDetail>
@@ -42,31 +45,32 @@
                         </select>
                         <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
                     </form>
-                    <b>${uiLabelMap.ProductCreatedModifiedBy}</b> ${picklist.createdByUserLogin}/${picklist.lastModifiedByUserLogin}
-                    <a href="<@ofbizUrl>PicklistReport.pdf?picklistId=${picklist.picklistId}</@ofbizUrl>" target="_blank" class="buttontext">[${uiLabelMap.ProductPick}/${uiLabelMap.ProductPacking} ${uiLabelMap.CommonReports}]</a>
+                    <span class="label">${uiLabelMap.ProductCreatedModifiedBy}</span> ${picklist.createdByUserLogin}/${picklist.lastModifiedByUserLogin}
+                    <a href="<@ofbizUrl>PicklistReport.pdf?picklistId=${picklist.picklistId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPick}/${uiLabelMap.ProductPacking} ${uiLabelMap.CommonReports}</a>
+                    <hr/>
                 </div>
                 <#if picklistInfo.shipmentMethodType?has_content>
-                    <div class="tabletext" style="margin-left: 15px;">
-                        <b>${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentMethodType}</b> ${picklistInfo.shipmentMethodType.description?default(picklistInfo.shipmentMethodType.shipmentMethodTypeId)}
+                    <div style="margin-left: 15px;">
+                        <span class="label">${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentMethodType}</span> ${picklistInfo.shipmentMethodType.description?default(picklistInfo.shipmentMethodType.shipmentMethodTypeId)}
                     </div>
                 </#if>
 
                 <#-- PicklistRole -->
                 <#list picklistInfo.picklistRoleInfoList?if_exists as picklistRoleInfo>
-                    <div class="tabletext" style="margin-left: 15px;">
-                        <b>${uiLabelMap.PartyParty}</b> ${picklistRoleInfo.partyNameView.firstName?if_exists} ${picklistRoleInfo.partyNameView.middleName?if_exists} ${picklistRoleInfo.partyNameView.lastName?if_exists} ${picklistRoleInfo.partyNameView.groupName?if_exists}
-                        <b>${uiLabelMap.PartyRole}</b> ${picklistRoleInfo.roleType.description}
-                        <b>${uiLabelMap.CommonFrom}</b> ${picklistRoleInfo.picklistRole.fromDate}
-                        <#if picklistRoleInfo.picklistRole.thruDate?exists><b>thru</b> ${picklistRoleInfo.picklistRole.thruDate}</#if>
+                    <div style="margin-left: 15px;">
+                        <span class="label">${uiLabelMap.PartyParty}</span> ${picklistRoleInfo.partyNameView.firstName?if_exists} ${picklistRoleInfo.partyNameView.middleName?if_exists} ${picklistRoleInfo.partyNameView.lastName?if_exists} ${picklistRoleInfo.partyNameView.groupName?if_exists}
+                        <span class="label">${uiLabelMap.PartyRole}</span> ${picklistRoleInfo.roleType.description}
+                        <span class="label">${uiLabelMap.CommonFrom}</span> ${picklistRoleInfo.picklistRole.fromDate}
+                        <#if picklistRoleInfo.picklistRole.thruDate?exists><span class="label">${uiLabelMap.CommonThru}</span> ${picklistRoleInfo.picklistRole.thruDate}</#if>
                     </div>
                 </#list>
-                <div class="tabletext" style="margin-left: 15px;">
-                    <b>${uiLabelMap.ProductAssignPicker}:</b>
+                <div style="margin-left: 15px;">
+                    <span class="label">${uiLabelMap.ProductAssignPicker}</span>
                     <form method="post" action="<@ofbizUrl>createPicklistRole</@ofbizUrl>" style="display: inline;">
                         <input type="hidden" name="facilityId" value="${facilityId}"/>
                         <input type="hidden" name="picklistId" value="${picklist.picklistId}"/>
                         <input type="hidden" name="roleTypeId" value="PICKER"/>
-                        <select name="partyId" class="smallSelect">
+                        <select name="partyId">
                             <#list partyRoleAndPartyDetailList as partyRoleAndPartyDetail>
                                 <option value="${partyRoleAndPartyDetail.partyId}">${partyRoleAndPartyDetail.firstName?if_exists} ${partyRoleAndPartyDetail.middleName?if_exists} ${partyRoleAndPartyDetail.lastName?if_exists} ${partyRoleAndPartyDetail.groupName?if_exists} [${partyRoleAndPartyDetail.partyId}]</option>
                             </#list>
@@ -77,33 +81,33 @@
 
                 <#-- PicklistStatusHistory -->
                 <#list picklistInfo.picklistStatusHistoryInfoList?if_exists as picklistStatusHistoryInfo>
-                    <div class="tabletext" style="margin-left: 15px;">
-                        <b>${uiLabelMap.CommonStatus}</b> ${uiLabelMap.CommonChange} ${uiLabelMap.CommonFrom} ${picklistStatusHistoryInfo.statusItem.get("description",locale)}
+                    <div style="margin-left: 15px;">
+                        <span class="label">${uiLabelMap.CommonStatus}</span> ${uiLabelMap.CommonChange} ${uiLabelMap.CommonFrom} ${picklistStatusHistoryInfo.statusItem.get("description",locale)}
                         ${uiLabelMap.CommonTo} ${picklistStatusHistoryInfo.statusItemTo.description}
                         ${uiLabelMap.CommonOn} ${picklistStatusHistoryInfo.picklistStatusHistory.changeDate}
                         ${uiLabelMap.CommonBy} ${picklistStatusHistoryInfo.picklistStatusHistory.changeUserLoginId}
                     </div>
                 </#list>
-
+                <hr/>
                 <#-- PicklistBin -->
                 <#list picklistInfo.picklistBinInfoList?if_exists as picklistBinInfo>
                     <#assign isBinComplete = Static["org.ofbiz.shipment.picklist.PickListServices"].isBinComplete(delegator, picklistBinInfo.picklistBin.picklistBinId)/>
                     <#if (!isBinComplete)>
-                        <div class="tabletext" style="margin-left: 15px;">
-                            <b>${uiLabelMap.ProductBinNum}</b> ${picklistBinInfo.picklistBin.binLocationNumber}&nbsp;(${picklistBinInfo.picklistBin.picklistBinId})
-                            <#if picklistBinInfo.primaryOrderHeader?exists><b>${uiLabelMap.ProductPrimaryOrderId}</b> ${picklistBinInfo.primaryOrderHeader.orderId}</#if>
-                            <#if picklistBinInfo.primaryOrderItemShipGroup?exists><b>${uiLabelMap.ProductPrimaryShipGroupSeqId}</b> ${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</#if>
+                        <div style="margin-left: 15px;">
+                            <span class="label">${uiLabelMap.ProductBinNum}</span> ${picklistBinInfo.picklistBin.binLocationNumber}&nbsp;(${picklistBinInfo.picklistBin.picklistBinId})
+                            <#if picklistBinInfo.primaryOrderHeader?exists><span class="label">${uiLabelMap.ProductPrimaryOrderId}</span> ${picklistBinInfo.primaryOrderHeader.orderId}</#if>
+                            <#if picklistBinInfo.primaryOrderItemShipGroup?exists><span class="label">${uiLabelMap.ProductPrimaryShipGroupSeqId}</span> ${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</#if>
                             <#if !picklistBinInfo.picklistItemInfoList?has_content><a href="<@ofbizUrl>deletePicklistBin?picklistBinId=${picklistBinInfo.picklistBin.picklistBinId}&amp;facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></#if>
                         </div>
-                        <div class="tabletext" style="margin-left: 30px;">
-                            <b>${uiLabelMap.CommonUpdate} ${uiLabelMap.ProductBinNum}:</b>
+                        <div style="margin-left: 30px;">
+                            <span class="label">${uiLabelMap.CommonUpdate} ${uiLabelMap.ProductBinNum}</span>
                             <form method="post" action="<@ofbizUrl>updatePicklistBin</@ofbizUrl>" style="display: inline;">
                                 <input type="hidden" name="facilityId" value="${facilityId}"/>
                                 <input type="hidden" name="picklistBinId" value="${picklistBinInfo.picklistBin.picklistBinId}"/>
-                                ${uiLabelMap.ProductLocation}#:
+                                <span class="label">${uiLabelMap.ProductLocation}#</span>
                                 <input type"text" size="2" name="binLocationNumber" value="${picklistBinInfo.picklistBin.binLocationNumber}"/>
-                                ${uiLabelMap.PageTitlePickList}:
-                                <select name="picklistId" class="smallSelect">
+                                <span class="label">${uiLabelMap.PageTitlePickList}</span>
+                                <select name="picklistId">
                                     <#list picklistActiveList as picklistActive>
                                         <#assign picklistActiveStatusItem = picklistActive.getRelatedOneCache("StatusItem")>
                                         <option value="${picklistActive.picklistId}"<#if picklistActive.picklistId == picklist.picklistId> selected</#if>>${picklistActive.picklistId} [${uiLabelMap.CommonDate}:${picklistActive.picklistDate},${uiLabelMap.CommonStatus}:${picklistActiveStatusItem.get("description",locale)}]</option>
@@ -115,22 +119,21 @@
                         <#if picklistBinInfo.picklistItemInfoList?has_content>
                             <div style="margin-left: 30px;">
                                 <table class="basic-table" cellspacing="0">
-                                    <tr>
-                                        <b>
-                                            <th>${uiLabelMap.ProductOrderId}</th>
-                                            <th>${uiLabelMap.OrderShipGroup}</th>
-                                            <th>${uiLabelMap.ProductOrderItem}</th>
-                                            <th>${uiLabelMap.ProductProduct}</th>
-                                            <th>${uiLabelMap.ProductInventoryItem}</th>
-                                            <th>${uiLabelMap.ProductLocation}</th>
-                                            <th>${uiLabelMap.ProductQuantity}</th>
-                                            <th>&nbsp;</th>
-                                        </b>
+                                    <tr class="header-row"
+                                        <td>${uiLabelMap.ProductOrderId}</td>
+                                        <td>${uiLabelMap.OrderShipGroup}</td>
+                                        <td>${uiLabelMap.ProductOrderItem}</td>
+                                        <td>${uiLabelMap.ProductProduct}</td>
+                                        <td>${uiLabelMap.ProductInventoryItem}</td>
+                                        <td>${uiLabelMap.ProductLocation}</td>
+                                        <td>${uiLabelMap.ProductQuantity}</td>
+                                        <td>&nbsp;</td>
                                     </tr>
+                                <#assign alt_row = false>
                                 <#list picklistBinInfo.picklistItemInfoList?if_exists as picklistItemInfo>
                                 <#assign picklistItem = picklistItemInfo.picklistItem>
                                 <#assign inventoryItemAndLocation = picklistItemInfo.inventoryItemAndLocation>
-                                    <tr>
+                                    <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
                                         <td>${picklistItem.orderId}</td>
                                         <td>${picklistItem.shipGroupSeqId}</td>
                                         <td>${picklistItem.orderItemSeqId}</td>
@@ -151,19 +154,20 @@
                                             </#list>
                                         </td>
                                     </tr>
+                                    <#-- toggle the row color -->
+                                    <#assign alt_row = !alt_row>
                                 </#list>
                                 </table>
                             </div>
                         </#if>
                     </#if>
                 </#list>
-
                 <#if picklistInfo_has_next>
-                   <hr class="sepbar"/>
+                   <hr/>
                 </#if>
             </#list>
         <#else/>
             <h3>${uiLabelMap.ProductNoPicksStarted}.</h3>
         </#if>
     </div>
-</div>
+</div>
\ No newline at end of file

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?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Sun Jan  6 14:06:04 2008
@@ -16,18 +16,20 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
 <div class="screenlet">
-    <div class="screenlet-header">
-        <div class="boxhead">${uiLabelMap.ProductFindOrdersToPick}</div>
+    <div class="screenlet-title-bar">
+        <ul>
+            <li class="head3">${uiLabelMap.ProductFindOrdersToPick}</li>
+        </ul>
+        <br class="clear"/>
     </div>
     <div class="screenlet-body">
-        <table class="basic-table">
-            <tr>
-                <th>${uiLabelMap.ProductShipmentMethod}</th>
-                <th>${uiLabelMap.ProductReadyToPick}</th>
-                <th>${uiLabelMap.ProductNeedStockMove}</th>
-                <th>&nbsp;</th>
+        <table cellspacing="0" class="basic-table">
+            <tr class="header-row">
+                <td>${uiLabelMap.ProductShipmentMethod}</td>
+                <td>${uiLabelMap.ProductReadyToPick}</td>
+                <td>${uiLabelMap.ProductNeedStockMove}</td>
+                <td>&nbsp;</td>
             </tr>
             <#if rushOrderInfo?has_content>
                 <#assign orderReadyToPickInfoList = rushOrderInfo.orderReadyToPickInfoList?if_exists>
@@ -55,6 +57,7 @@
             <#if pickMoveByShipmentMethodInfoList?has_content>
                 <#assign orderReadyToPickInfoListSizeTotal = 0>
                 <#assign orderNeedsStockMoveInfoListSizeTotal = 0>
+                <#assign alt_row = false>
                 <#list pickMoveByShipmentMethodInfoList as pickMoveByShipmentMethodInfo>
                     <#assign shipmentMethodType = pickMoveByShipmentMethodInfo.shipmentMethodType?if_exists>
                     <#assign orderReadyToPickInfoList = pickMoveByShipmentMethodInfo.orderReadyToPickInfoList?if_exists>
@@ -63,8 +66,8 @@
                     <#assign orderNeedsStockMoveInfoListSize = (orderNeedsStockMoveInfoList.size())?default(0)>
                     <#assign orderReadyToPickInfoListSizeTotal = orderReadyToPickInfoListSizeTotal + orderReadyToPickInfoListSize>
                     <#assign orderNeedsStockMoveInfoListSizeTotal = orderNeedsStockMoveInfoListSizeTotal + orderNeedsStockMoveInfoListSize>
-                    <tr>
-                        <td><a href="<@ofbizUrl>PicklistOptions?viewDetail=${shipmentMethodType.shipmentMethodTypeId?if_exists}&facilityId=${facilityId?if_exists}</@ofbizUrl>" class="linktext"><#if shipmentMethodType?exists && shipmentMethodType?has_content>${shipmentMethodType.description}<#else>${groupName?if_exists}</#if></a></td>
+                    <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+                        <td><a href="<@ofbizUrl>PicklistOptions?viewDetail=${shipmentMethodType.shipmentMethodTypeId?if_exists}&facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext"><#if shipmentMethodType?exists && shipmentMethodType?has_content>${shipmentMethodType.description}<#else>${groupName?if_exists}</#if></a></td>
                         <td>${orderReadyToPickInfoListSize}</td>
                         <td>${orderNeedsStockMoveInfoListSize}</td>
                         <td>
@@ -80,7 +83,8 @@
                                             <input type="hidden" name="orderIdList" value="${orderIdForPickList.orderHeader.orderId}"/>
                                         </#list>
                                     </#if>
-                                    ${uiLabelMap.ProductPickFirst}:<input type="text" size="4" name="maxNumberOfOrders" value="20"/>
+                                    <span class="label">${uiLabelMap.ProductPickFirst}</span>
+                                    <input type="text" size="4" name="maxNumberOfOrders" value="20"/>
                                     <input type="submit" value="${uiLabelMap.ProductCreatePicklist}"/>
                                 </form>
                             <#else>
@@ -88,6 +92,8 @@
                             </#if>
                         </td>
                     </tr>
+                    <#-- toggle the row color -->
+                    <#assign alt_row = !alt_row>
                 </#list>
                 <tr>
                     <th>${uiLabelMap.CommonAllMethods}</div></th>
@@ -97,7 +103,8 @@
                       <#if (orderReadyToPickInfoListSizeTotal > 0)>
                         <form method="post" action="<@ofbizUrl>createPicklistFromOrders</@ofbizUrl>">
                             <input type="hidden" name="facilityId" value="${facilityId}"/>
-                            ${uiLabelMap.ProductPickFirst}:<input type="text" size="4" name="maxNumberOfOrders" value="20"/>
+                            <span class="label">${uiLabelMap.ProductPickFirst}</span>
+                            <input type="text" size="4" name="maxNumberOfOrders" value="20"/>
                             <input type="submit" value="${uiLabelMap.ProductCreatePicklist}"/>
                         </form>
                       <#else>
@@ -125,21 +132,25 @@
 
 <#if toPickList?has_content>
 <div class="screenlet">
-    <div class="screenlet-header">
-        <div class="boxhead">${shipmentMethodType.description?if_exists} ${uiLabelMap.ProductPickingDetail}</div>
+    <div class="screenlet-title-bar">
+        <ul>
+            <li class="head3">${shipmentMethodType.description?if_exists} ${uiLabelMap.ProductPickingDetail}</li>
+        </ul>
+        <br class="clear"/>
     </div>
     <div class="screenlet-body">
-        <table class="basic-table">
-            <tr>
-                <th>${uiLabelMap.ProductOrderId}</th>
-                <th>${uiLabelMap.FormFieldTitle_orderDate}</th>
-                <th>${uiLabelMap.ProductChannel}</th>
-                <th>${uiLabelMap.ProductOrderItem}</th>
-                <th>${uiLabelMap.ProductDescription}</th>
-                <th>${uiLabelMap.OrderShipGroup}</th>
-                <th>${uiLabelMap.ProductQuantity}</th>
-                <th>${uiLabelMap.ProductQuantityNotAvailable}</th>
+        <table cellspacing="0" class="basic-table">
+            <tr class="header-row">
+                <td>${uiLabelMap.ProductOrderId}</td>
+                <td>${uiLabelMap.FormFieldTitle_orderDate}</td>
+                <td>${uiLabelMap.ProductChannel}</td>
+                <td>${uiLabelMap.ProductOrderItem}</td>
+                <td>${uiLabelMap.ProductDescription}</td>
+                <td>${uiLabelMap.OrderShipGroup}</td>
+                <td>${uiLabelMap.ProductQuantity}</td>
+                <td>${uiLabelMap.ProductQuantityNotAvailable}</td>
             </tr>
+            <#assign alt_row = false>
             <#list toPickList as toPick>
                 <#assign oiasgal = toPick.orderItemShipGrpInvResList>
                 <#assign header = toPick.orderHeader>
@@ -148,15 +159,15 @@
                 <#list oiasgal as oiasga>
                     <#assign orderProduct = oiasga.getRelatedOne("OrderItem").getRelatedOne("Product")?if_exists>
                     <#assign product = oiasga.getRelatedOne("InventoryItem").getRelatedOne("Product")?if_exists>
-                    <tr>
-                        <td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${externalKeyParam}" class="linktext" target="_blank">${oiasga.orderId}</a></td>
+                    <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+                        <td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${externalKeyParam}" class="buttontext" target="_blank">${oiasga.orderId}</a></td>
                         <td>${header.orderDate?string}</td>
                         <td>${(channel.description)?if_exists}</td>
                         <td>${oiasga.orderItemSeqId}</td>
                         <td>
-                            <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="linktext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
+                            <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
                             <#if orderProduct.productId != product.productId>
-                                &nbsp;[<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="linktext" target="_blank">${(product.internalName)?if_exists}</a>]
+                                &nbsp;[<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>]
                             </#if>
                         </td>
                         <td>${oiasga.shipGroupSeqId}</td>
@@ -164,9 +175,8 @@
                         <td>${oiasga.quantityNotAvailable?if_exists}</td>
                     </tr>
                 </#list>
-                <tr>
-                    <td colspan="8"><hr/></td>
-                </tr>
+                <#-- toggle the row color -->
+                <#assign alt_row = !alt_row>
             </#list>
         </table>
     </div>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl Sun Jan  6 14:06:04 2008
@@ -25,19 +25,22 @@
     <#assign index = index + 1>
     <#assign labels = labelType.getRelated("InventoryItemLabel", Static["org.ofbiz.base.util.UtilMisc"].toList("inventoryItemLabelId"))>
     <tr>
-      <th>${labelType.description?if_exists} [${labelType.inventoryItemLabelTypeId}]</th>
       <td>
-      <select name="inventoryItemLabelId_${index}">
-        <option></option>
-        <#list labels as label>
-        <option value="${label.inventoryItemLabelId}" <#if parameters["inventoryItemLabelId_" + index]?has_content && parameters["inventoryItemLabelId_" + index] == label.inventoryItemLabelId>selected</#if>>${label.description?if_exists} [${label.inventoryItemLabelId}]</option>
-        </#list>
-      </select>
+          <div>
+          <span class="label">${labelType.description?if_exists} [${labelType.inventoryItemLabelTypeId}]</span>
+          &nbsp;
+          <select name="inventoryItemLabelId_${index}">
+            <option></option>
+            <#list labels as label>
+            <option value="${label.inventoryItemLabelId}" <#if parameters["inventoryItemLabelId_" + index]?has_content && parameters["inventoryItemLabelId_" + index] == label.inventoryItemLabelId>selected</#if>>${label.description?if_exists} [${label.inventoryItemLabelId}]</option>
+            </#list>
+          </select>
+          </div>
       </td>
     </tr>
   </#list>
   <tr>
-    <td colspan="2">
+    <td>
       <input type="submit" value="${uiLabelMap.CommonSubmit}"/>
     </td>
   </tr>

Modified: ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl Sun Jan  6 14:06:04 2008
@@ -16,14 +16,16 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<#assign selected = tabButtonItem?default("void")>
 
 <#if facilityGroupId?has_content>
-    <div class="tabContainer">
-        <a href="<@ofbizUrl>EditFacilityGroup?facilityGroupId=${facilityGroupId}</@ofbizUrl>" class="${selectedClassMap.EditFacilityGroup?default(unselectedClassName)}">${uiLabelMap.ProductFacilityGroup}</a>
-        <a href="<@ofbizUrl>EditFacilityGroupRollup?facilityGroupId=${facilityGroupId}</@ofbizUrl>" class="${selectedClassMap.EditFacilityGroupRollup?default(unselectedClassName)}">${uiLabelMap.ProductRollups}</a>
-        <a href="<@ofbizUrl>EditFacilityGroupMembers?facilityGroupId=${facilityGroupId}</@ofbizUrl>" class="${selectedClassMap.EditFacilityGroupMembers?default(unselectedClassName)}">${uiLabelMap.ProductFacilities}</a>
-        <a href="<@ofbizUrl>EditFacilityGroupRoles?facilityGroupId=${facilityGroupId}</@ofbizUrl>" class="${selectedClassMap.EditFacilityGroupRoles?default(unselectedClassName)}">${uiLabelMap.PartyRoles}</a>
+    <div class="button-bar tab-bar">
+        <ul>
+            <li<#if selected="EditFacilityGroup"> class="selected"</#if>><a href="<@ofbizUrl>EditFacilityGroup?facilityGroupId=${facilityGroupId}</@ofbizUrl>">${uiLabelMap.ProductFacilityGroup}</a></li>
+            <li<#if selected="EditFacilityGroupRollup"> class="selected"</#if>><a href="<@ofbizUrl>EditFacilityGroupRollup?facilityGroupId=${facilityGroupId}</@ofbizUrl>">${uiLabelMap.ProductRollups}</a></li>
+            <li<#if selected="EditFacilityGroupMembers"> class="selected"</#if>><a href="<@ofbizUrl>EditFacilityGroupMembers?facilityGroupId=${facilityGroupId}</@ofbizUrl>">${uiLabelMap.ProductFacilities}</a></li>
+            <li<#if selected="EditFacilityGroupRoles"> class="selected"</#if>><a href="<@ofbizUrl>EditFacilityGroupRoles?facilityGroupId=${facilityGroupId}</@ofbizUrl>">${uiLabelMap.PartyRoles}</a></li>
+        </ul>
+        <br/>
     </div>
-</#if>
+</#if>
\ No newline at end of file



Mime
View raw message