svn commit: r516761 - in /ofbiz/trunk/applications/manufacturing/webapp/manufacturing: bom/ jobshopmgt/ routing/

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

svn commit: r516761 - in /ofbiz/trunk/applications/manufacturing/webapp/manufacturing: bom/ jobshopmgt/ routing/

jacopoc
Author: jacopoc
Date: Sat Mar 10 10:17:46 2007
New Revision: 516761

URL: http://svn.apache.org/viewvc?view=rev&rev=516761
Log:
Small html and style cleanups.

Modified:
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl?view=diff&rev=516761&r1=516760&r2=516761
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl Sat Mar 10 10:17:46 2007
@@ -21,7 +21,7 @@
 
 <#if selectedFeatures?has_content>
 <hr/>
-<div class="tableheadtext">${uiLabelMap.ManufacturingSelectedFeatures}</div>
+<h2>${uiLabelMap.ManufacturingSelectedFeatures}</h2>
 <#list selectedFeatures as selectedFeature>
     <p>${selectedFeature.productFeatureTypeId} = ${selectedFeature.description?if_exists} [${selectedFeature.productFeatureId}]</p>
 </#list>
@@ -29,12 +29,12 @@
 <hr/>
       <table border='0' cellspacing='0' cellpadding='2' class='boxbottom'>
         <tr>
-          <td width="10%" align="left"><div class="tableheadtext">${uiLabelMap.ManufacturingProductLevel}</div></td>
-          <td width="20%" align="left"><div class="tableheadtext">${uiLabelMap.ProductProductId}</div></td>
-          <td width="10%" align="left"><div class="tableheadtext">&nbsp;</div></td>
-          <td width="40%" align="left"><div class="tableheadtext">${uiLabelMap.ProductProductName}</div></td>
-          <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.CommonQuantity}</div></td>
-          <td width="10%" align="right"><div class="tableheadtext">&nbsp;</div></td>
+          <th width="10%" align="left">${uiLabelMap.ManufacturingProductLevel}</th>
+          <th width="20%" align="left">${uiLabelMap.ProductProductId}</th>
+          <th width="10%" align="left">&nbsp;</th>
+          <th width="40%" align="left">${uiLabelMap.ProductProductName}</th>
+          <th width="10%" align="right">${uiLabelMap.CommonQuantity}</th>
+          <th width="10%" align="right">&nbsp;</th>
         </tr>
         <tr>
           <td colspan="6"><hr class="sepbar"></td>
@@ -72,12 +72,12 @@
 <hr/>
       <table border='0' cellspacing='0' cellpadding='2' class='boxbottom'>
         <tr>
-          <td width="18%" align="left"><div class="tableheadtext">${uiLabelMap.ProductProductId}</div></td>
-          <td width="50%" align="left"><div class="tableheadtext">${uiLabelMap.ProductProductName}</div></td>
-          <td width="8%" align="right"><div class="tableheadtext">${uiLabelMap.CommonQuantity}</div></td>
-          <td width="8%" align="right"><div class="tableheadtext">${uiLabelMap.ProductQoh}</div></td>
-          <td width="8%" align="right"><div class="tableheadtext">${uiLabelMap.FormFieldTitle_cost}</div></td>
-          <td width="8%" align="right"><div class="tableheadtext">${uiLabelMap.CommonTotalCost}</div></td>
+          <th width="18%" align="left">${uiLabelMap.ProductProductId}</th>
+          <th width="50%" align="left">${uiLabelMap.ProductProductName}</th>
+          <th width="8%" align="right">${uiLabelMap.CommonQuantity}</th>
+          <th width="8%" align="right">${uiLabelMap.ProductQoh}</th>
+          <th width="8%" align="right">${uiLabelMap.FormFieldTitle_cost}</th>
+          <th width="8%" align="right">${uiLabelMap.CommonTotalCost}</th>
         </tr>
         <tr>
           <td colspan="6"><hr class="sepbar"></td>
@@ -108,7 +108,7 @@
           <#--
           <#if grandTotalCost?exists>
           <tr>
-            <td colspan="6" align="right"><div class="tableheadtext">${grandTotalCost}</div></td>
+            <th colspan="6" align="right">${grandTotalCost}</th>
           </tr>
           </#if>
           -->

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?view=diff&rev=516761&r1=516760&r2=516761
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Sat Mar 10 10:17:46 2007
@@ -41,7 +41,7 @@
     <a name="topform"/>
     <table border="0" cellpadding="2" cellspacing="0">
         <tr>
-            <td align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingBomType}:</div></td>
+            <th align="right">${uiLabelMap.ManufacturingBomType}:</th>
             <td>&nbsp;</td>
             <td>
             <select name="productAssocTypeId" size="1">
@@ -57,7 +57,7 @@
             </#list>
             </select>
             </td>
-            <td align="right"><div class='tableheadtext'>${uiLabelMap.ProductProductId}:</div></td>
+            <th align="right">${uiLabelMap.ProductProductId}:</th>
             <td>&nbsp;</td>
             <td>
             <input type="text" name="productId" size="20" maxlength="40" value="${productId?if_exists}"/>
@@ -69,7 +69,7 @@
             <td colspan='3' align="left">
                 &nbsp;
             </td>
-            <td align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingCopyToProductId}:</div></td>
+            <th align="right">${uiLabelMap.ManufacturingCopyToProductId}:</th>
             <td>&nbsp;</td>
             <td>
             <input type="text" name="copyToProductId" size="20" maxlength="40" value=""/>
@@ -88,7 +88,7 @@
         <input type="hidden" name="UPDATE_MODE" value="CREATE"/>
         <table border="0" cellpadding="2" cellspacing="0">
             <tr>
-            <td align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingBomType}:</div></td>
+            <th align="right">${uiLabelMap.ManufacturingBomType}:</th>
             <td>&nbsp;</td>
             <td>
                 <select name="productAssocTypeId" size="1">
@@ -106,7 +106,7 @@
             </td>
             </tr>
             <tr>
-            <td align="right"><div class='tableheadtext'>${uiLabelMap.ProductProductId}:</div></td>
+            <th align="right">${uiLabelMap.ProductProductId}:</th>
             <td>&nbsp;</td>
             <td>
                 <input type="text" name="productId" size="20" maxlength="40" value="${productId?if_exists}"/>
@@ -114,7 +114,7 @@
             </td>
             </tr>
             <tr>
-            <td align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingProductIdTo}:</div></td>
+            <th align="right">${uiLabelMap.ManufacturingProductIdTo}:</th>
             <td>&nbsp;</td>
             <td>
                 <input type="text" name="productIdTo" size="20" maxlength="40" value="${productIdTo?if_exists}"/>
@@ -122,7 +122,7 @@
             </td>
             </tr>
             <tr>
-            <td align="right"><div class='tableheadtext'>${uiLabelMap.CommonFromDate}:</div></td>
+            <th align="right">${uiLabelMap.CommonFromDate}:</th>
             <td>&nbsp;</td>
             <td>
                 <input type="text" name="fromDate" size="25" maxlength="40" value=""/>
@@ -139,28 +139,28 @@
         <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/>
         <table border="0" cellpadding="2" cellspacing="0">
         <tr>
-            <td align="right"><div class='tableheadtext'>${uiLabelMap.ProductProductId}:</div></td>
+            <th align="right">${uiLabelMap.ProductProductId}:</th>
             <td>&nbsp;</td>
             <td><b>${productId?if_exists}</b></td>
         </tr>
         <tr>
-            <td align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingProductIdTo}:</div></td>
+            <th align="right">${uiLabelMap.ManufacturingProductIdTo}:</th>
             <td>&nbsp;</td>
             <td><b>${productIdTo?if_exists}</b></td>
         </tr>
         <tr>
-            <td align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingBomType}:</div></td>
+            <th align="right">${uiLabelMap.ManufacturingBomType}:</th>
             <td>&nbsp;</td>
             <td><b><#if curProductAssocType?exists>${(curProductAssocType.get("description",locale))?if_exists}<#else> ${productAssocTypeId?if_exists}</#if></b></td>
         </tr>
         <tr>
-            <td align="right"><div class='tableheadtext'>${uiLabelMap.CommonFromDate}:</div></td>
+            <th align="right">${uiLabelMap.CommonFromDate}:</th>
             <td>&nbsp;</td>
             <td><b>${fromDate?if_exists}</b></td>
         </tr>
     </#if>
     <tr>
-        <td width="26%" align="right"><div class='tableheadtext'>${uiLabelMap.CommonThruDate}:</div></td>
+        <th width="26%" align="right">${uiLabelMap.CommonThruDate}:</th>
         <td>&nbsp;</td>
         <td width="74%">
             <input type="text" name="thruDate" <#if useValues> value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("thruDate"))?if_exists}"</#if> size="30" maxlength="30"/>
@@ -168,35 +168,35 @@
         </td>
     </tr>
     <tr>
-        <td width="26%" align="right"><div class='tableheadtext'>${uiLabelMap.CommonSequenceNum}:</div></td>
+        <th width="26%" align="right">${uiLabelMap.CommonSequenceNum}:</th>
         <td>&nbsp;</td>
         <td width="74%"><input type="text" name="sequenceNum" <#if useValues>value="${(productAssoc.sequenceNum)?if_exists}"<#else>value="${(request.getParameter("sequenceNum"))?if_exists}"</#if> size="5" maxlength="10"/></td>
     </tr>
     <tr>
-        <td width="26%" align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingReason}:</div></td>
+        <th width="26%" align="right">${uiLabelMap.ManufacturingReason}:</th>
         <td>&nbsp;</td>
         <td width="74%"><input type="text" name="reason" <#if useValues>value="${(productAssoc.reason)?if_exists}"<#else>value="${(request.getParameter("reason"))?if_exists}"</#if> size="60" maxlength="255"/></td>
     </tr>
     <tr>
-        <td width="26%" align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingInstruction}:</div></td>
+        <th width="26%" align="right">${uiLabelMap.ManufacturingInstruction}:</th>
         <td>&nbsp;</td>
         <td width="74%"><input type="text" name="instruction" <#if useValues>value="${(productAssoc.instruction)?if_exists}"<#else>value="${(request.getParameter("instruction"))?if_exists}"</#if> size="60" maxlength="255"/></td>
     </tr>
     
     <tr>
-        <td width="26%" align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingQuantity}:</div></td>
+        <th width="26%" align="right">${uiLabelMap.ManufacturingQuantity}:</th>
         <td>&nbsp;</td>
         <td width="74%"><input type="text" name="quantity" <#if useValues>value="${(productAssoc.quantity)?if_exists}"<#else>value="${(request.getParameter("quantity"))?if_exists}"</#if> size="10" maxlength="15"/></td>
     </tr>
 
     <tr>
-        <td width="26%" align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingScrapFactor}:</div></td>
+        <th width="26%" align="right">${uiLabelMap.ManufacturingScrapFactor}:</th>
         <td>&nbsp;</td>
         <td width="74%"><input type="text" name="scrapFactor" <#if useValues>value="${(productAssoc.scrapFactor)?if_exists}"<#else>value="${(request.getParameter("scrapFactor"))?if_exists}"</#if> size="10" maxlength="15"/></td>
     </tr>
 
     <tr>
-        <td width="26%" align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingFormula}:</div></td>
+        <th width="26%" align="right">${uiLabelMap.ManufacturingFormula}:</th>
         <td>&nbsp;</td>
         <td width="74%">
             <select name="estimateCalcMethod">
@@ -215,7 +215,7 @@
     </tr>
 
     <tr>
-        <td width="26%" align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingRoutingTask}:</div></td>
+        <th width="26%" align="right">${uiLabelMap.ManufacturingRoutingTask}:</th>
         <td>&nbsp;</td>
         <td width="74%">
             <input type="text" name="routingWorkEffortId" <#if useValues>value="${(productAssoc.routingWorkEffortId)?if_exists}"<#else>value="${(request.getParameter("routingWorkEffortId"))?if_exists}"</#if> size="10" maxlength="15"/>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl?view=diff&rev=516761&r1=516760&r2=516761
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl Sat Mar 10 10:17:46 2007
@@ -83,9 +83,9 @@
                     <td align="left">
                         <table border="0" cellpadding="2" cellspacing="0">
                             <tr>
-                                <td width="20%" align="right">
-                                    <span class="tableheadtext">${uiLabelMap.ManufacturingOrderItems}</span>
-                                </td>
+                                <th width="20%" align="right">
+                                    ${uiLabelMap.ManufacturingOrderItems}
+                                </th>
                                 <td>&nbsp;</td>
                                 <td width="80%" align="left">
                                     <span class="tabletext">

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl?view=diff&rev=516761&r1=516760&r2=516761
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl Sat Mar 10 10:17:46 2007
@@ -101,9 +101,9 @@
                     <td align="left">
                         <table border="0" cellpadding="2" cellspacing="0">
                             <tr>
-                                <td width="20%" align="right">
-                                    <span class="tableheadtext">${uiLabelMap.ManufacturingInventoryItemsProduced}</span>
-                                </td>
+                                <th width="20%" align="right">
+                                    ${uiLabelMap.ManufacturingInventoryItemsProduced}
+                                </th>
                                 <td>&nbsp;</td>
                                 <td width="80%" align="left">
                                     <span class="tabletext">
@@ -124,9 +124,9 @@
                     <td align="left">
                         <table border="0" cellpadding="2" cellspacing="0">
                             <tr>
-                                <td width="20%" align="right">
-                                    <span class="tableheadtext">${uiLabelMap.ManufacturingOrderItems}</span>
-                                </td>
+                                <th width="20%" align="right">
+                                    ${uiLabelMap.ManufacturingOrderItems}
+                                </th>
                                 <td>&nbsp;</td>
                                 <td width="80%" align="left">
                                     <span class="tabletext">

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl?view=diff&rev=516761&r1=516760&r2=516761
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl Sat Mar 10 10:17:46 2007
@@ -38,16 +38,16 @@
     <input type="hidden" name="copyTask" value="N"/>
     <table cellpadding="2" cellspacing="0" border="0" class="boxoutside">
         <tr>
-            <td align="right">
-                <div class="tableheadtext">${uiLabelMap.ManufacturingRoutingTaskId}</div>
-            </td>
+            <th align="right">
+                ${uiLabelMap.ManufacturingRoutingTaskId}
+            </th>
             <td>
                 <input type="text" name="workEffortIdTo" size="20"/>
                 <a href="javascript:call_fieldlookup(document.addtaskassocform.workEffortIdTo,'<@ofbizUrl>LookupRoutingTask</@ofbizUrl>', 'vide',540,450);"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'></a>
             </td>
-            <td align="right">
-                <div class="tableheadtext">${uiLabelMap.CommonFromDate}</div>
-            </td>
+            <th align="right">
+                ${uiLabelMap.CommonFromDate}
+            </th>
             <td>
                 <input type="text" name="fromDate" size="25"/>
                 <a href="javascript:call_cal(document.addtaskassocform.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Click here For Calendar"></a>
@@ -55,15 +55,15 @@
             <td align="center" width="40%">&nbsp;</td>
         </tr>
         <tr>
-            <td align="right">
-                <div class="tableheadtext">${uiLabelMap.CommonSequenceNum}</div>
-            </td>
+            <th align="right">
+                ${uiLabelMap.CommonSequenceNum}
+            </th>
             <td>
                 <input type="text" name="sequenceNum" size="10"/>
             </td>
-            <td align="right">
-                <div class="tableheadtext">${uiLabelMap.CommonThruDate}</div>
-            </td>
+            <th align="right">
+                ${uiLabelMap.CommonThruDate}
+            </th>
             <td>
                 <input type="text" name="thruDate" size="25"/>
                 <a href="javascript:call_cal(document.addtaskassocform.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Click here For Calendar"></a>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl?view=diff&rev=516761&r1=516760&r2=516761
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl Sat Mar 10 10:17:46 2007
@@ -22,9 +22,9 @@
 <br/>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr>
-    <td><div class="tableheadtext">${uiLabelMap.ManufacturingCalendarId}</div></td>
-    <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
-    <td><div class="tableheadtext">${uiLabelMap.ManufacturingCalendarWeekId}</div></td>
+    <th>${uiLabelMap.ManufacturingCalendarId}</th>
+    <th>${uiLabelMap.CommonDescription}</th>
+    <th>${uiLabelMap.ManufacturingCalendarWeekId}</th>
     <td>&nbsp;</td>
   </tr>  
   <tr><td colspan="4"><hr class="sepbar"/></td></tr>    
@@ -42,7 +42,7 @@
     </#list>
   <#else>
     <tr>
-      <td colspan='4'><div class="tabletext">${uiLabelMap.ManufacturingNoCalendarFound}</div></td>
+      <td colspan="4">${uiLabelMap.ManufacturingNoCalendarFound}</td>
     </tr>    
   </#if>
 </table>