OFBiz › OFBiz - Commits

svn commit: r662306 [1/2] - in /ofbiz/trunk/applications: accounting/widget/ product/config/ product/webapp/facility/WEB-INF/actions/facility/ product/webapp/facility/facility/ product/webapp/facility/inventory/ product/widget/facility/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
adrianc
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r662306 [1/2] - in /ofbiz/trunk/applications: accounting/widget/ product/config/ product/webapp/facility/WEB-INF/actions/facility/ product/webapp/facility/facility/ product/webapp/facility/inventory/ product/widget/facility/

adrianc
Author: adrianc
Date: Sun Jun  1 19:02:35 2008
New Revision: 662306

URL: http://svn.apache.org/viewvc?rev=662306&view=rev
Log:
UI work in the Facility Manager component. Based on recent dev ml discussions:

1. Reduced number of screenlets used
2. Add Item plus Item List screens have Add Item on top, added collapsible screenlets
3. Used placeholders in UI labels for better internationalization.

Internationalization note: I added a few labels to ProductUiLabels and changed a few others. Non-English languages need to be updated.

The browser title bar has more information in it. Helpful for reviewing browser history.

There is still a lot of work that needs to be done on this.

Modified:
    ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditContactMech.bsh
    ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
    ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
    ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.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/ViewContactMechs.ftl
    ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
    ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
    ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
    ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
    ofbiz/trunk/applications/product/widget/facility/Menus.xml

Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Sun Jun  1 19:02:35 2008
@@ -73,6 +73,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="AccountingFindFixedAssets"/>
+                <set field="headerItem" value="ListFixedAssets"/>
                 <set field="tabButtonItem" value="ListFixedAssets"/>
             </actions>
             <widgets>
@@ -357,11 +358,6 @@
                             <widgets>
                                 <container style="button-bar"><link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/></container>
                             </widgets>
-                            <fail-widgets>
-                                <section><actions><set field="titleProperty" value="AccountingAddFixedAssetMaintenance"/></actions>
-                                    <widgets/>    
-                                </section>
-                            </fail-widgets>
                         </section>
                         <include-form name="EditFixedAssetMaint" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
                     </decorator-section>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun Jun  1 19:02:35 2008
@@ -4199,7 +4199,7 @@
         <value xml:lang="zh">编辑配置选项</value>
     </property>
     <property key="PageTitleEditFacilityContactMech">
-        <value xml:lang="en">Edit Facility Contact Mech</value>
+        <value xml:lang="en">Edit Facility Contact Mechanism for ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="es">Editar Mecanismos de Contacto de un Almacén</value>
         <value xml:lang="fr">Édition des coordonnées du lieu de stockage</value>
         <value xml:lang="it">Aggiorna Contatto Stabilimento</value>
@@ -4249,17 +4249,17 @@
         <value xml:lang="zh">编辑场所组汇总</value>
     </property>
     <property key="PageTitleEditFacilityGroups">
-        <value xml:lang="en">Edit Facility Groups</value>
+        <value xml:lang="en">Edit Facility Groups for ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="es">Editar Grupos de Almacén</value>
         <value xml:lang="fr">Édition des groupes de lieux de stockage</value>
         <value xml:lang="it">Aggiorna Gruppi Stabilimento</value>
-        <value xml:lang="ro">Actualizeaza Grupuri Compartimente PageTitleEditFacilityInventoryItems=Actualizeaza Linii Inventar Compartiment</value>
+        <value xml:lang="ro">Actualizeaza Grupuri Compartimente</value>
         <value xml:lang="ru">Изменить группы объектов</value>
         <value xml:lang="th">แก้ไขกลุ่มคลังสินค้า</value>
         <value xml:lang="zh">编辑场所组</value>
     </property>
     <property key="PageTitleEditFacilityInventoryItems">
-        <value xml:lang="en">Edit Facility Inventory Items</value>
+        <value xml:lang="en">Edit Facility Inventory Items for ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="es">Editar Artículos del Inventario de un Almacén</value>
         <value xml:lang="fr">Édition des lignes de stocks</value>
         <value xml:lang="it">Aggiorna Righe Inventario Stabilimento</value>
@@ -4268,7 +4268,7 @@
         <value xml:lang="zh">编辑场所库存明细</value>
     </property>
     <property key="PageTitleEditFacilityLocation">
-        <value xml:lang="en">Edit Facility Location</value>
+        <value xml:lang="en">Edit Facility Location for ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="es">Editar sitios de un Almacén</value>
         <value xml:lang="fr">Édition des emplacements du lieu de stockage</value>
         <value xml:lang="it">Aggiorna Posizione Stabilimento</value>
@@ -4278,7 +4278,7 @@
         <value xml:lang="zh">编辑场所位置</value>
     </property>
     <property key="PageTitleEditFacilityRoles">
-        <value xml:lang="en">Edit Facility Roles</value>
+        <value xml:lang="en">Edit Facility Roles for ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="es">Editar Roles de un Almacén</value>
         <value xml:lang="fr">Édition des rôles du lieu de stockage</value>
         <value xml:lang="it">Aggiorna Ruoli Stabilimento</value>
@@ -4993,7 +4993,7 @@
         <value xml:lang="zh">查找场所组</value>
     </property>
     <property key="PageTitleFindFacilityInventoryItems">
-        <value xml:lang="en">Find Facility Inventory Items</value>
+        <value xml:lang="en">Find Facility Inventory Items for ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="fr">Rechercher les lignes de stock du lieu de stockage</value>
         <value xml:lang="it">Ricerca Righe Inventario</value>
         <value xml:lang="th">ค้นหารายการคลังสินค้าสินค้าคงเหลือ</value>
@@ -5005,7 +5005,7 @@
         <value xml:lang="th">ค้นหาคลังสินค้าของรายการสินค้าคงเหลือโดยสินค้า</value>
     </property>
     <property key="PageTitleFindFacilityLocation">
-        <value xml:lang="en">Find Facility Location</value>
+        <value xml:lang="en">Find Facility Locations for ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="es">Buscar Sitio de Almacén</value>
         <value xml:lang="fr">Rechercher l'emplacement d'un stock</value>
         <value xml:lang="it">Ricerca Posizione Stabilimento</value>
@@ -5279,6 +5279,26 @@
         <value xml:lang="th">หน้าหลัก</value>
         <value xml:lang="zh">首页</value>
     </property>
+    <property key="PageTitleNewFacilityContactMech">
+        <value xml:lang="en">New Facility Contact Mechanism for ${facility.facilityName} [${facility.facilityId}]</value>
+        <value xml:lang="es">Editar Mecanismos de Contacto de un Almacén</value>
+        <value xml:lang="fr">Édition des coordonnées du lieu de stockage</value>
+        <value xml:lang="it">Aggiorna Contatto Stabilimento</value>
+        <value xml:lang="ro">Actualizeaza Contact Compartiment</value>
+        <value xml:lang="ru">Изменить способ контакта объекта</value>
+        <value xml:lang="th">แก้ไขวิธีการติดต่อคลังสินค้า</value>
+        <value xml:lang="zh">编辑场所联系方式</value>
+    </property>
+    <property key="PageTitleNewFacilityLocation">
+        <value xml:lang="en">New Facility Location for ${facility.facilityName} [${facility.facilityId}]</value>
+        <value xml:lang="es">Editar sitios de un Almacén</value>
+        <value xml:lang="fr">Édition des emplacements du lieu de stockage</value>
+        <value xml:lang="it">Aggiorna Posizione Stabilimento</value>
+        <value xml:lang="ro">Actualizeaza Pozitie Compartiment</value>
+        <value xml:lang="ru">Изменить местонахождение объекта</value>
+        <value xml:lang="th">แก้ไขที่ตั้งคลังสินค้า</value>
+        <value xml:lang="zh">编辑场所位置</value>
+    </property>
     <property key="PageTitlePackageShipmentScheduling">
         <value xml:lang="en">Package Shipment Scheduling</value>
         <value xml:lang="fr">Planification de l'emballage d'expédition</value>
@@ -5372,7 +5392,7 @@
         <value xml:lang="zh">搜索结果</value>
     </property>
     <property key="PageTitleTransferInventoryItem">
-        <value xml:lang="en">Transfer Inventory Item</value>
+        <value xml:lang="en">Transfer Inventory Item From ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="es">Transferir Artículo de Inventario</value>
         <value xml:lang="fr">Transfert de stock</value>
         <value xml:lang="it">Trasferimento Riga Inventario</value>
@@ -5382,7 +5402,7 @@
         <value xml:lang="zh">转运库存明细</value>
     </property>
     <property key="PageTitleViewFacilityContactMechanism">
-        <value xml:lang="en">View Facility Contact Mechanism</value>
+        <value xml:lang="en">View Facility Contact Mechanisms for ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="es">Ver Mecanismo de Contacto de un Almacén</value>
         <value xml:lang="fr">Voir les coordonnées du lieu de stockage</value>
         <value xml:lang="it">Mostra Contatto Stabilimento</value>
@@ -6109,7 +6129,7 @@
         <value xml:lang="zh">添加场所</value>
     </property>
     <property key="ProductAddFacilityGroupMember">
-        <value xml:lang="en">Add FacilityGroupMember</value>
+        <value xml:lang="en">Add Facility Group Member</value>
         <value xml:lang="es">Añadir Miembro de Grupo de Almacén</value>
         <value xml:lang="fr">Ajouter un membre au groupe de stock</value>
         <value xml:lang="it">Aggiungi Membro Gruppo Stabilimento</value>
@@ -6119,7 +6139,7 @@
         <value xml:lang="zh">添加场所组成员</value>
     </property>
     <property key="ProductAddFacilityGroupPartyRole">
-        <value xml:lang="en">Add FacilityGroup Party Role</value>
+        <value xml:lang="en">Add Facility Group Party Role</value>
         <value xml:lang="es">Añadir Rol de Participante a Grupo de Almacén</value>
         <value xml:lang="fr">Associer un acteur-rôle à ce groupe de stock</value>
         <value xml:lang="it">Aggiungi Ruolo Soggetto Gruppo Stabilimento</value>
@@ -10344,7 +10364,7 @@
         <value xml:lang="zh">库存明细</value>
     </property>
     <property key="ProductInventoryItemGrandTotals">
-        <value xml:lang="en">Inventory Item Grand Totals</value>
+        <value xml:lang="en">Inventory Item Grand Totals for ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="fr">Total général des lignes de stock</value>
         <value xml:lang="it">Totale Generale Righe Inventario</value>
         <value xml:lang="th">ผลรวมรายการสินค้าคงเหลือดีเยี่ยม</value>
@@ -14528,7 +14548,7 @@
         <value xml:lang="zh">购物订单收据</value>
     </property>
     <property key="ProductReceiveInventory">
-        <value xml:lang="en">Receive Inventory</value>
+        <value xml:lang="en">Receive Inventory Into ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="es">Recibir Inventario</value>
         <value xml:lang="fr">Stock à recevoir</value>
         <value xml:lang="it">Ricevi Inventario</value>

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditContactMech.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditContactMech.bsh?rev=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditContactMech.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditContactMech.bsh Sun Jun  1 19:02:35 2008
@@ -27,6 +27,8 @@
 
 String facilityId = parameters.get("facilityId");
 context.put("facilityId", facilityId);
+GenericValue facility = delegator.findByPrimaryKey("Facility", UtilMisc.toMap("facilityId", facilityId));
+context.put("facility", facility);
 
 Map mechMap = new HashMap();
 ContactMechWorker.getFacilityContactMechAndRelated(request, facilityId, mechMap);

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=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl Sun Jun  1 19:02:35 2008
@@ -24,14 +24,17 @@
   <#if !mechMap.contactMech?exists>
     <#-- When creating a new contact mech, first select the type, then actually create -->
     <#if !preContactMechTypeId?has_content>
-    <h1>${uiLabelMap.PartyCreateNewContact}</h1>
+    <h1>${title}</h1>
+    <div class="button-bar">
+      <a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class='buttontext'>${uiLabelMap.CommonGoBack}</a>
+    </div>
     <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%" class="basic-table" cellspacing="0">
+      <table width="50%" class="basic-table" cellspacing="0">
         <tr>
-          <td width="26%">${uiLabelMap.PartySelectContactType}</td>
-          <td width="74%">
+          <td class="label">${uiLabelMap.PartySelectContactType}</td>
+          <td>
             <select name="preContactMechTypeId" >
               <#list mechMap.contactMechTypes as contactMechType>
                 <option value='${contactMechType.contactMechTypeId}'>${contactMechType.get("description",locale)}</option>
@@ -46,9 +49,10 @@
 
   <#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>
+      <h1>${title}</h1>
+      <div class="button-bar">
+        <a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class='buttontext'>${uiLabelMap.CommonGoBack}</a>
+      </div>
       <#if contactMechPurposeType?exists>
         <div><span class="label">(${uiLabelMap.PartyMsgContactHavePurpose}</span>"${contactMechPurposeType.get("description",locale)?if_exists}")</div>
       </#if>
@@ -62,15 +66,16 @@
 
         <#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%" class="basic-table" cellspacing="0">
+      <h1>${title}</h1>
+      <div class="button-bar">
+        <a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class='buttontext'>${uiLabelMap.CommonGoBack}</a>
+        <a href="<@ofbizUrl>EditContactMech?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewContactMech}</a>
+      </div>
+      <table class="basic-table" cellspacing="0">
         <#if mechMap.purposeTypes?has_content>
         <tr>
-          <td width="26%" align="right" valign="top"><span class="label">${uiLabelMap.PartyContactPurposes}</span></td>
-          <td width="5">&nbsp;</td>
-          <td width="74%">
+          <td valign="top" class="label">${uiLabelMap.PartyContactPurposes}</td>
+          <td>
             <table class="basic-table" cellspacing="0">
             <#if mechMap.facilityContactMechPurposes?has_content>
               <#assign alt_row = false>
@@ -78,38 +83,34 @@
                 <#assign contactMechPurposeType = facilityContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
                 <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
                   <td>
-                    <div>
-                      &nbsp;
                       <#if contactMechPurposeType?has_content>
                         <b>${contactMechPurposeType.get("description",locale)}</b>
                       <#else>
                         <b>${uiLabelMap.PartyMechPurposeTypeNotFound}: "${facilityContactMechPurpose.contactMechPurposeTypeId}"</b>
                       </#if>
-                      (${uiLabelMap.CommonSince}:${facilityContactMechPurpose.fromDate.toString()})
+                      (${uiLabelMap.CommonSince}: ${facilityContactMechPurpose.fromDate})
                       <#if facilityContactMechPurpose.thruDate?has_content>(${uiLabelMap.CommonExpires}: ${facilityContactMechPurpose.thruDate.toString()}</#if>
-                      &nbsp;
-                    </div>
+                      &nbsp;<a href='<@ofbizUrl>deleteFacilityContactMechPurpose?facilityId=${facilityId}&contactMechId=${contactMechId}&contactMechPurposeTypeId=${facilityContactMechPurpose.contactMechPurposeTypeId}&fromDate=${facilityContactMechPurpose.fromDate.toString()}&DONE_PAGE=${donePage}&useValues=true</@ofbizUrl>' class='buttontext'>${uiLabelMap.CommonDelete}</a>
                   </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>
+                <td>
+                  <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}'>
                     <select name='contactMechPurposeTypeId'>
                       <option></option>
                       <#list mechMap.purposeTypes as contactMechPurposeType>
                         <option value='${contactMechPurposeType.contactMechPurposeTypeId}'>${contactMechPurposeType.get("description",locale)}</option>
                       </#list>
                     </select>
-                  </td>
-                </form>
-                <td><a href='javascript:document.newpurposeform.submit()' class='buttontext'>${uiLabelMap.PartyAddPurpose}</a></td>
+                    &nbsp;<a href='javascript:document.newpurposeform.submit()' class='buttontext'>${uiLabelMap.PartyAddPurpose}</a>
+                  </form>
+                </td>
               </tr>
             </table>
           </td>
@@ -123,45 +124,39 @@
 
   <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId?if_exists>
     <tr>
-      <td width="26%" align="right" valign="top">${uiLabelMap.PartyToName}</td>
-      <td width="5">&nbsp;</td>
-      <td width="74%">
+      <td class="label">${uiLabelMap.PartyToName}</td>
+      <td>
         <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">${uiLabelMap.PartyAttentionName}</td>
-      <td width="5">&nbsp;</td>
-      <td width="74%">
+      <td class="label">${uiLabelMap.PartyAttentionName}</td>
+      <td>
         <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">${uiLabelMap.PartyAddressLine1}</td>
-      <td width="5">&nbsp;</td>
-      <td width="74%">
-        <input type="text" size="30" maxlength="30" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}">
+      <td class="label">${uiLabelMap.PartyAddressLine1}</td>
+      <td>
+        <input type="text" class="required" 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">${uiLabelMap.PartyAddressLine2}</td>
-      <td width="5">&nbsp;</td>
-      <td width="74%">
+      <td class="label">${uiLabelMap.PartyAddressLine2}</td>
+      <td>
           <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">${uiLabelMap.PartyCity}</td>
-      <td width="5">&nbsp;</td>
-      <td width="74%">
-          <input type="text" size="30" maxlength="30" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}">
+      <td class="label">${uiLabelMap.PartyCity}</td>
+      <td>
+          <input type="text" class="required" 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">${uiLabelMap.PartyState}</td>
-      <td width="5">&nbsp;</td>
-      <td width="74%">
-        <select name="stateProvinceGeoId">
+      <td class="label">${uiLabelMap.PartyState}</td>
+      <td>
+        <select name="stateProvinceGeoId" class="required">
           <option>${(mechMap.postalAddress.stateProvinceGeoId)?if_exists}</option>
           <option></option>
            ${screens.render("component://common/widget/CommonScreens.xml#states")}
@@ -169,17 +164,15 @@
       *</td>
     </tr>
     <tr>
-      <td width="26%" align="right" valign="top">${uiLabelMap.PartyZipCode}</td>
-      <td width="5">&nbsp;</td>
-      <td width="74%">
-        <input type="text" size="12" maxlength="10" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}">
+      <td class="label">${uiLabelMap.PartyZipCode}</td>
+      <td>
+        <input type="text" class="required" 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">${uiLabelMap.PartyCountry}</td>
-      <td width="5">&nbsp;</td>
-      <td width="74%">
-        <select name="countryGeoId">
+      <td class="label">${uiLabelMap.PartyCountry}</td>
+      <td>
+        <select name="countryGeoId" class="required">
           <option>${(mechMap.postalAddress.countryGeoId)?if_exists}</option>
           <option></option>
           ${screens.render("component://common/widget/CommonScreens.xml#countries")}
@@ -188,9 +181,8 @@
     </tr>
   <#elseif "TELECOM_NUMBER" = mechMap.contactMechTypeId?if_exists>
     <tr>
-      <td width="26%" align="right" valign="top">${uiLabelMap.PartyPhoneNumber}</td>
-      <td width="5">&nbsp;</td>
-      <td width="74%">
+      <td class="label">${uiLabelMap.PartyPhoneNumber}</td>
+      <td>
         <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)}">
@@ -198,33 +190,31 @@
       </td>
     </tr>
     <tr>
-      <td width="26%" align="right" valign="top">&nbsp;</td>
-      <td width="5">&nbsp;</td>
-      <td><div>[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div></td>
+      <td>&nbsp;</td>
+      <td>[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</td>
     </tr>
   <#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId?if_exists>
     <tr>
-      <td width="26%" align="right" valign="top">${uiLabelMap.PartyEmailAddress}</td>
-      <td width="5">&nbsp;</td>
-      <td width="74%">
-          <input type="text" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}">
+      <td class="label">${uiLabelMap.PartyEmailAddress}</td>
+      <td>
+          <input type="text" class="required" 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">${mechMap.contactMechType.get("description",locale)}</td>
-      <td width="5">&nbsp;</td>
-      <td width="74%">
-          <input type="text" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}">
+      <td class="label">${mechMap.contactMechType.get("description",locale)}</td>
+      <td>
+          <input type="text" class="required" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}">
       *</td>
     </tr>
   </#if>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        <a href="javascript:document.editcontactmechform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
+      </td>
+    </tr>
   </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>
-  <#else>
-    &nbsp;<a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonGoBack}</a>
   </#if>
 </#if>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Sun Jun  1 19:02:35 2008
@@ -18,19 +18,20 @@
 -->
 
 <#if security.hasEntityPermission("FACILITY", "_VIEW", session)>
-<h1>${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</h1>
-<br/>
-<div class="button-bar">
-  <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" name="EditFacilityForm" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
-  <#if facilityId?has_content>
-    <a href="/workeffort/control/month?facilityId=${facilityId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="buttontext">${uiLabelMap.CommonViewCalendar}</a>
-  </#if>
-</div>
+<#if facilityId?has_content>
+  <h1>${uiLabelMap.ProductEditFacility} ${facility.facilityName?if_exists} [${facilityId?if_exists}]</h1>
+  <div class="button-bar">
+    <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" name="EditFacilityForm" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
+      <a href="/workeffort/control/month?facilityId=${facilityId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="buttontext">${uiLabelMap.CommonViewCalendar}</a>
+  </div>
+<#else>
+  <h1>${uiLabelMap.ProductNewFacility}</h1>
+</#if>
 
 <#if facility?exists && facilityId?has_content>
   <form action="<@ofbizUrl>UpdateFacility</@ofbizUrl>" name="EditFacilityForm" method="post">
-  <table class="basic-table" cellspacing='0'>
   <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
+  <table class="basic-table" cellspacing='0'>
   <tr>
     <td class="label">${uiLabelMap.ProductFacilityId}</td>
     <td>
@@ -114,7 +115,11 @@
 
   <tr>
     <td>&nbsp;</td>
-    <td align="left"><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td>
+    <#if facilityId?has_content>
+      <td><input type="submit" name="Update" value="${uiLabelMap.CommonUpdate}"></td>
+    <#else>
+      <td><input type="submit" name="Update" value="${uiLabelMap.CommonSave}"></td>
+    </#if>
   </tr>
 </table>
 </form>
@@ -123,3 +128,4 @@
   <h3>${uiLabelMap.ProductFacilityViewPermissionError}</h3>
 </#if>
 
+

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl?rev=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Sun Jun  1 19:02:35 2008
@@ -16,86 +16,85 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<div class="screenlet">
-    <div class="screenlet-title-bar">
-        <h3>${uiLabelMap.PageTitleEditFacilityLocation}</h3>
-    </div>
-    <div class="screenlet-body">
-        <h1>${uiLabelMap.ProductLocationFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}: ${facilityId?if_exists}]</h1>
-        <div class="button-bar">
-          <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
-          <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a>
-          <#if facilityId?exists && locationSeqId?exists>
-              <a href="<@ofbizUrl>EditInventoryItem?facilityId=${facilityId}&locationSeqId=${locationSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewInventoryItem}</a>
-          </#if>
-        </div>
-        
-        <#if facilityId?exists && !(facilityLocation?exists)>
-            <form action="<@ofbizUrl>CreateFacilityLocation</@ofbizUrl>" method="post" style="margin: 0;">
-            <input type="hidden" name="facilityId" value="${facilityId}">  
-            <table class="basic-table" cellspacing="0">
-        <#elseif facilityLocation?exists>
-            <form action="<@ofbizUrl>UpdateFacilityLocation</@ofbizUrl>" method="post" style="margin: 0;">
-            <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
-            <input type="hidden" name="locationSeqId" value="${locationSeqId}">
-            <table class="basic-table" cellspacing="0">
-            <tr>
-                <td class="label">${uiLabelMap.ProductFacilityId}</td>
-                <td>${facilityId?if_exists}</td>
-            </tr>
-            <tr>
-                <td class="label">${uiLabelMap.ProductLocationSeqId}</td>
-                <td>${locationSeqId}</td>
-            </tr>
+<h1>${title}</h1>
+<#if facilityId?exists && locationSeqId?exists>
+  <div class="button-bar">
+    <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
+    <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a>
+    <a href="<@ofbizUrl>EditInventoryItem?facilityId=${facilityId}&locationSeqId=${locationSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewInventoryItem}</a>
+  </div>
+</#if>
+
+<#if facilityId?exists && !(facilityLocation?exists)>
+    <form action="<@ofbizUrl>CreateFacilityLocation</@ofbizUrl>" method="post">
+    <input type="hidden" name="facilityId" value="${facilityId}">  
+    <table class="basic-table" cellspacing="0">
+<#elseif facilityLocation?exists>
+    <form action="<@ofbizUrl>UpdateFacilityLocation</@ofbizUrl>" method="post">
+    <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
+    <input type="hidden" name="locationSeqId" value="${locationSeqId}">
+    <table class="basic-table" cellspacing="0">
+    <tr>
+        <td class="label">${uiLabelMap.ProductFacilityId}</td>
+        <td>${facilityId?if_exists}</td>
+    </tr>
+    <tr>
+        <td class="label">${uiLabelMap.ProductLocationSeqId}</td>
+        <td>${locationSeqId}</td>
+    </tr>
+<#else>
+    <h1>${uiLabelMap.ProductNotCreateLocationFacilityId}</h1>
+</#if>
+
+<#if facilityId?exists>      
+    <tr>
+        <td class="label">${uiLabelMap.ProductType}</td>
+        <td>
+            <select name="locationTypeEnumId">
+                <#if (facilityLocation.locationTypeEnumId)?has_content>
+                    <#assign locationTypeEnum = facilityLocation.getRelatedOneCache("TypeEnumeration")?if_exists>
+                    <option value="${facilityLocation.locationTypeEnumId}">${(locationTypeEnum.get("description",locale))?default(facilityLocation.locationTypeEnumId)}</option>
+                    <option value="${facilityLocation.locationTypeEnumId}">----</option>
+                </#if>
+                <#list locationTypeEnums as locationTypeEnum>
+                    <option value="${locationTypeEnum.enumId}">${locationTypeEnum.get("description",locale)}</option>
+                </#list>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td class="label">${uiLabelMap.CommonArea}</td>
+        <td><input type="text" name="areaId" value="${(facilityLocation.areaId)?if_exists}" size="19" maxlength="20"></td>
+    </tr>
+    <tr>
+        <td class="label">${uiLabelMap.ProductAisle}</td>
+        <td><input type="text" name="aisleId" value="${(facilityLocation.aisleId)?if_exists}" size="19" maxlength="20"></td>
+    </tr>
+    <tr>
+        <td class="label">${uiLabelMap.ProductSection}</td>
+        <td><input type="text" name="sectionId" value="${(facilityLocation.sectionId)?if_exists}" size="19" maxlength="20"></td>
+    </tr>
+    <tr>
+        <td class="label">${uiLabelMap.ProductLevel}</td>
+        <td><input type="text" name="levelId" value="${(facilityLocation.levelId)?if_exists}" size="19" maxlength="20"></td>
+    </tr>
+    <tr>
+        <td class="label">${uiLabelMap.ProductPosition}</td>
+        <td><input type="text" name="positionId" value="${(facilityLocation.positionId)?if_exists}" size="19" maxlength="20"></td>
+    </tr>    
+    <tr>
+        <td>&nbsp;</td>
+        <#if locationSeqId?exists>
+          <td><input type="submit" value="${uiLabelMap.CommonUpdate}"></td>
         <#else>
-            <h1>${uiLabelMap.ProductNotCreateLocationFacilityId}</h1>
+          <td><input type="submit" value="${uiLabelMap.CommonSave}"></td>
         </#if>
-        
-        <#if facilityId?exists>      
-            <tr>
-                <td class="label">${uiLabelMap.ProductType}</td>
-                <td>
-                    <select name="locationTypeEnumId">
-                        <#if (facilityLocation.locationTypeEnumId)?has_content>
-                            <#assign locationTypeEnum = facilityLocation.getRelatedOneCache("TypeEnumeration")?if_exists>
-                            <option value="${facilityLocation.locationTypeEnumId}">${(locationTypeEnum.get("description",locale))?default(facilityLocation.locationTypeEnumId)}</option>
-                            <option value="${facilityLocation.locationTypeEnumId}">----</option>
-                        </#if>
-                        <#list locationTypeEnums as locationTypeEnum>
-                            <option value="${locationTypeEnum.enumId}">${locationTypeEnum.get("description",locale)}</option>
-                        </#list>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td class="label">${uiLabelMap.CommonArea}</td>
-                <td><input type="text" name="areaId" value="${(facilityLocation.areaId)?if_exists}" size="19" maxlength="20"></td>
-            </tr>
-            <tr>
-                <td class="label">${uiLabelMap.ProductAisle}</td>
-                <td><input type="text" name="aisleId" value="${(facilityLocation.aisleId)?if_exists}" size="19" maxlength="20"></td>
-            </tr>
-            <tr>
-                <td class="label">${uiLabelMap.ProductSection}</td>
-                <td><input type="text" name="sectionId" value="${(facilityLocation.sectionId)?if_exists}" size="19" maxlength="20"></td>
-            </tr>
-            <tr>
-                <td class="label">${uiLabelMap.ProductLevel}</td>
-                <td><input type="text" name="levelId" value="${(facilityLocation.levelId)?if_exists}" size="19" maxlength="20"></td>
-            </tr>
-            <tr>
-                <td class="label">${uiLabelMap.ProductPosition}</td>
-                <td><input type="text" name="positionId" value="${(facilityLocation.positionId)?if_exists}" size="19" maxlength="20"></td>
-            </tr>    
-            <tr>
-                <td>&nbsp;</td>
-                <td><input type="submit" value="${uiLabelMap.CommonUpdate}"></td>
-            </tr>
-        </table>
-        </form>
-    </div>
-</div>
-<div class="screenlet">
+    </tr>
+  </table>
+  </form>
+  <#if locationSeqId?exists>
+  <br/>
+  <div class="screenlet">
     <div class="screenlet-title-bar">
         <h3>${uiLabelMap.ProductLocationProduct}</h3>
     </div>
@@ -125,8 +124,8 @@
         </#list>
         </table>
     </div>
-</div>
-<div class="screenlet">
+  </div>
+  <div class="screenlet">
     <div class="screenlet-title-bar">
         <h3>${uiLabelMap.ProductAddProduct}</h3>
     </div>
@@ -141,5 +140,7 @@
             <input type="submit" value="${uiLabelMap.CommonAdd}">
         </form>
     </div>
-</div>
-        </#if>
+  </div>
+  </#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=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Sun Jun  1 19:02:35 2008
@@ -73,7 +73,7 @@
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="ListFacilityInventoryItems" type="list"  target="" title="" list-name="listIt"
+    <form name="ListFacilityInventoryItems" type="list" list-name="listIt" header-row-style="header-row-2"
         paginate-target="EditFacilityInventoryItems" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-name="results" result-map-list-name="listIt">
@@ -102,7 +102,7 @@
             <display-entity entity-name="Enumeration"/>
         </field>
         <field name="lotId" title="${uiLabelMap.ProductLotId}"><display/></field>
-        <field name="binNumber" title="${ProductBinNumber}"><display/></field>
+        <field name="binNumber" title="${uiLabelMap.ProductBinNumber}"><display/></field>
         <field name="serialNumber"><display/></field>
         <field name="softIdentifier"><display/></field>
         <field name="quantityOnHandTotal"><display description="${availableToPromiseTotal} / ${quantityOnHandTotal}"/></field>
@@ -351,7 +351,7 @@
         </field>
     </form>
     <form name="ListFacilityInventoryByProduct" type="list" target="" title="" list-name="inventoryByProduct"
-        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"
         paginate-target="${facilityInventoryByProductScreen}" override-list-size="${overrideListSize}">
         <row-actions>
             <service service-name="getProductInventoryAndFacilitySummary" result-map-name="resultMap">
@@ -487,7 +487,7 @@
     </form>
     <!-- FacilityGroups -->
     <form name="EditFacilityGroups" type="list" target="updateGroupToFacility" paginate-target="EditFacilityGroups" title="" list-name="facilityGroupMembers"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="FacilityGroupMember"/>
         <field name="facilityId"><hidden/></field>
         <field name="facilityGroupId" title="${uiLabelMap.ProductFacilityGroupId}">
@@ -515,7 +515,7 @@
     </form>
     <!-- FacilityRoles -->
     <form name="EditFacilityRoles" type="list" paginate-target="EditFacilityRoles" title="" list-name="facilityRoles"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="FacilityRole" default-field-type="display"/>
         <field name="facilityId"><hidden/></field>
         <field name="partyId">
@@ -557,7 +557,7 @@
         <field name="totalRetailPrice" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductRetailPrice}"><display/></field>
     </form>
     <form name="ListInventoryItemGrandTotals" type="list" list-name="inventoryItemGrandTotals"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="qohGrandTotal" title="${uiLabelMap.ProductQoh} ${uiLabelMap.CommonTotal} ${uiLabelMap.CommonQty}"><display/></field>
         <field name="atpGrandTotal" title="${uiLabelMap.ProductAtp} ${uiLabelMap.CommonTotal} ${uiLabelMap.CommonQty}"><display/></field>
         <field name="totalCostPriceGrandTotal" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductCostPrice}"><display/></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=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Sun Jun  1 19:02:35 2008
@@ -17,8 +17,7 @@
 under the License.
 -->
     
-    <h1>${uiLabelMap.ProductFindLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</h1>
-    <br/>
+    <h1>${title}</h1>
     <div class="button-bar">
       <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
       <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl?rev=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl Sun Jun  1 19:02:35 2008
@@ -17,7 +17,7 @@
 under the License.
 -->
 
-<h1>${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</h1>
+<h1>${title}</h1>
 <div class="button-bar">
   <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
   <#if facilityId?has_content>

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?rev=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Sun Jun  1 19:02:35 2008
@@ -97,7 +97,7 @@
     </form>
 
     <form name="CreatePhysicalInventoryAndVariance" type="single" target="createPhysicalInventoryAndVariance" title=""
-        header-row-style="header-row" default-table-style="basic-table">
+        default-table-style="basic-table">
         <auto-fields-service service-name="createPhysicalInventoryAndVariance"/>
         <field name="physicalInventoryId"><ignored/></field>
         <field name="physicalInventoryDate"><ignored/></field>
@@ -115,7 +115,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ViewPhysicalInventoryAndVariance" type="list" target="" title="" list-name="physicalInventoryAndVarianceDatas"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="PhysicalInventoryAndVariance" map-name="physicalInventoryAndVariance" default-field-type="display"/>
         <field name="inventoryItemId"><hidden/></field>
         <field name="partyId"><display description="${person.firstName} ${person.lastName} ${partyGroup.groupName} [${physicalInventoryAndVariance.partyId}]"/></field>
@@ -150,7 +150,7 @@
         itemIssuanceId, receiptId, physicalInventoryId - no natural screens to show these -->
     </form>
     <form name="InventoryItemReservations" type="list" target="" title="" list-name="inventoryItemReservations"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="OrderItemShipGrpInvRes" default-field-type="display"/>
         <field name="inventoryItemId"><hidden/></field>
         <field name="orderId" widget-style="buttontext">

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Sun Jun  1 19:02:35 2008
@@ -16,35 +16,23 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<div class="screenlet">
-    <div class="screenlet-title-bar">
-        <ul>
-            <li class="h3">${uiLabelMap.ProductInventoryTransfer} ${uiLabelMap.CommonFrom} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</li>
-            <li><a href="<@ofbizUrl>PickMoveStockSimple?facilityId=${facilityId?if_exists}</@ofbizUrl>">${uiLabelMap.CommonPrint}</a></li>
-        </ul>
-        <br class="clear"/>
-    </div>
-    <div class="screenlet-body">
+<h1>${title}</h1>
       <#if illegalInventoryItem?exists>
             <div class="errorMessage">${illegalInventoryItem}</div>
-        </#if>
-
+      </#if>
         <div class="button-bar">
           <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
+          <a href="<@ofbizUrl>PickMoveStockSimple?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrint}</a>
         </div>
-
        <#if !(inventoryItem?exists)>
             <form method="post" action="<@ofbizUrl>TransferInventoryItem</@ofbizUrl>">
+            <input type="hidden" name="facilityId" value="${facilityId}">
             <table cellspacing="0" class="basic-table">
             <tr>
-                <td width="25%" align="right" class="label">${uiLabelMap.ProductInventoryItemId}</td>
-                <td width="6%">&nbsp;</td>
-                <td width="25%">
-                <input type="text" name="inventoryItemId" size="20" maxlength="20">
-                <input type="hidden" name="facilityId" value="${facilityId}">
-                </td>
-                <td width="50%">
-                <input type="submit" value="${uiLabelMap.ProductGetItem}">
+                <td class="label">${uiLabelMap.ProductInventoryItemId}</td>
+                <td>
+                  <input type="text" name="inventoryItemId" size="20" maxlength="20">
+                  <input type="submit" value="${uiLabelMap.ProductGetItem}">
                 </td>
             </tr>
             </table>
@@ -250,5 +238,3 @@
         </table>
         </form>
         </#if>
-    </div>
-</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Sun Jun  1 19:02:35 2008
@@ -16,27 +16,16 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<div class="screenlet">
-    <div class="screenlet-title-bar">
-        <ul>
-            <li class="h3">${uiLabelMap.ProductReceiveInventory} ${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}"</#if> [${uiLabelMap.CommonId} :${facility.facilityId?if_exists}]</li>
-        </ul>
-        <br class="clear"/>
-    </div>
-    <div class="screenlet-body">
+<script language="JavaScript">
+    function setNow(field) { eval('document.selectAllForm.' + field + '.value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}"'); }
+</script>
+<h1>${title}</h1>
         <#if invalidProductId?exists>
             <div class="errorMessage">${invalidProductId}</div>
         </#if>        
         <div class="button-bar">
           <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
         </div>
-
-        <script language="JavaScript">
-            function setNow(field) { eval('document.selectAllForm.' + field + '.value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}"'); }
-        </script>
-
-        <br/>
-
         <#-- Receiving Results -->
         <#if receivedItems?has_content>
           <h3>${uiLabelMap.ProductReceiptPurchaseOrder} ${purchaseOrder.orderId}</h3>
@@ -472,41 +461,37 @@
 
         <#-- Initial Screen -->
         <#else>
+          <h2>${uiLabelMap.ProductReceiveItem}</h2>
           <form name="selectAllForm" method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>">
             <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/>
             <input type="hidden" name="initialSelected" value="Y"/>
             <table class="basic-table" cellspacing="0">
-              <tr><td colspan="4"><h3>${uiLabelMap.ProductReceiveItem}</h3></td></tr>
               <tr>
-                <td width="25%" align="right" class="label">${uiLabelMap.ProductPurchaseOrderNumber}</td>
-                <td>&nbsp;</td>
-                <td width="25%">
+                <td class="label">${uiLabelMap.ProductPurchaseOrderNumber}</td>
+                <td>
                   <input type="text" name="purchaseOrderId" size="20" maxlength="20" value="${requestParameters.purchaseOrderId?if_exists}">
                     <a href="javascript:call_fieldlookup2(document.selectAllForm.purchaseOrderId,'LookupPurchaseOrderHeaderAndShipInfo');">
                       <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
                     </a>
+                    <span class="tooltip">${uiLabelMap.ProductLeaveSingleProductReceiving}</span>
                 </td>
-                <td class="tooltip">${uiLabelMap.ProductLeaveSingleProductReceiving}</td>
               </tr>
               <tr>
-                <td width="25%" align="right" class="label">${uiLabelMap.ProductProductId}</td>
-                <td>&nbsp;</td>
-                <td width="25%">
+                <td class="label">${uiLabelMap.ProductProductId}</td>
+                <td>
                   <input type="text" name="productId" size="20" maxlength="20" value="${requestParameters.productId?if_exists}"/>
                     <a href="javascript:call_fieldlookup2(document.selectAllForm.productId,'LookupProduct');">
                       <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
                     </a>
+                    <span class="tooltip">${uiLabelMap.ProductLeaveEntirePoReceiving}</span>
                 </td>
-                <td class="tooltip">${uiLabelMap.ProductLeaveEntirePoReceiving}</td>
               </tr>
               <tr>
-                <td colspan="2">&nbsp;</td>
-                <td colspan="2">
+                <td>&nbsp;</td>
+                <td>
                   <a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.ProductReceiveProduct}</a>
                 </td>
               </tr>
             </table>
           </form>
         </#if>
-    </div>
-</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=662306&r1=662305&r2=662306&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Sun Jun  1 19:02:35 2008
@@ -47,6 +47,7 @@
     <screen name="CommonFacilityDecorator">
         <section>
             <actions>
+                <set field="headerItem" value="facility"/>
                 <set field="facilityId" from-field="parameters.facilityId"/>
                 <entity-one entity-name="Facility" value-name="facility"/>
             </actions>
@@ -55,7 +56,7 @@
                     <decorator-section name="body">
                         <section>
                             <condition>
-                                <if-has-permission permission="FACILITY" action="_VIEW"/>
+                                <if-service-permission service-name="facilityGenericPermission" main-action="VIEW"/>
                             </condition>
                             <widgets>
                                 <section>


Free forum by Nabble Edit this page