You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/03/17 14:20:34 UTC
svn commit: r519307 - in /ofbiz/trunk/applications/manufacturing:
webapp/manufacturing/bom/ webapp/manufacturing/jobshopmgt/
webapp/manufacturing/lookup/ webapp/manufacturing/mrp/
webapp/manufacturing/routing/ widget/manufacturing/
Author: jacopoc
Date: Sat Mar 17 06:20:33 2007
New Revision: 519307
URL: http://svn.apache.org/viewvc?view=rev&rev=519307
Log:
Small layout 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/jobshopmgt/ProductionRunForms.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml
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=519307&r1=519306&r2=519307
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl Sat Mar 17 06:20:33 2007
@@ -37,7 +37,7 @@
<th width="10%" align="right"> </th>
</tr>
<tr>
- <td colspan="6"><hr class="sepbar"></td>
+ <td colspan="6"><hr/></td>
</tr>
<#if tree?has_content>
<#assign rowClass = "viewManyTR2">
@@ -88,7 +88,7 @@
<th width="8%" align="right">${uiLabelMap.CommonTotalCost}</th>
</tr>
<tr>
- <td colspan="6"><hr class="sepbar"></td>
+ <td colspan="6"><hr/></td>
</tr>
<#if productsData?has_content>
<#assign rowClass = "viewManyTR2">
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=519307&r1=519306&r2=519307
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Sat Mar 17 06:20:33 2007
@@ -62,7 +62,7 @@
<td>
<input type="text" name="productId" size="20" maxlength="40" value="${productId?if_exists}"/>
<a href="javascript:call_fieldlookup2(document.searchform.productId,'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a>
- <span class='tabletext'><a href="javascript:document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingShowBOMAssocs}</a></span>
+ <span><a href="javascript:document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingShowBOMAssocs}</a></span>
</td>
</tr>
<tr>
@@ -74,13 +74,13 @@
<td>
<input type="text" name="copyToProductId" size="20" maxlength="40" value=""/>
<a href="javascript:call_fieldlookup2(document.searchform.copyToProductId,'LookupProduct');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a>
- <span class='tabletext'><a href="javascript:document.searchform.UPDATE_MODE.value='COPY';document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingCopyBOMAssocs}</a></span>
+ <span><a href="javascript:document.searchform.UPDATE_MODE.value='COPY';document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingCopyBOMAssocs}</a></span>
</td>
</tr>
</table>
</form>
- <hr class="sepbar"/>
+ <hr/>
<form action="<@o...@ofbizUrl>" method="post" style="margin: 0;" name="editProductAssocForm">
@@ -231,7 +231,7 @@
</form>
<br/>
<#if productId?exists && product?exists>
- <hr class="sepbar">
+ <hr/>
<a name="components"></a>
<h2>${uiLabelMap.ManufacturingProductComponents}</h2>
@@ -255,9 +255,9 @@
<tr valign="middle">
<td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)?if_exists}</a></td>
<td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if> </td>
- <td><div class="tabletext" <#if (assocFromProduct.getTimestamp("fromDate"))?exists && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> style="color: red;"</#if>>
+ <td><div <#if (assocFromProduct.getTimestamp("fromDate"))?exists && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> style="color: red;"</#if>>
${(assocFromProduct.fromDate)?if_exists} </div></td>
- <td><div class="tabletext" <#if (assocFromProduct.getTimestamp("thruDate"))?exists && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> style="color: red;"</#if>>
+ <td><div <#if (assocFromProduct.getTimestamp("thruDate"))?exists && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> style="color: red;"</#if>>
${(assocFromProduct.thruDate)?if_exists} </div></td>
<td> ${(assocFromProduct.sequenceNum)?if_exists}</td>
<td> ${(assocFromProduct.quantity)?if_exists}</td>
@@ -276,7 +276,7 @@
</#list>
</table>
- <hr class="sepbar">
+ <hr/>
<h2>${uiLabelMap.ManufacturingProductComponentOf}</h2>
<table border="1" cellpadding="2" cellspacing="0">
<tr>
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=519307&r1=519306&r2=519307
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl Sat Mar 17 06:20:33 2007
@@ -88,7 +88,7 @@
</th>
<td> </td>
<td width="80%" align="left">
- <span class="tabletext">
+ <span>
<#list orderItems as orderItem>
<a href="/ordermgr/control/orderview?orderId=${orderItem.getString("orderId")}" class="buttontext" target="_blank">
${orderItem.getString("orderId")}/${orderItem.getString("orderItemSeqId")}
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=519307&r1=519306&r2=519307
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl Sat Mar 17 06:20:33 2007
@@ -106,7 +106,7 @@
</th>
<td> </td>
<td width="80%" align="left">
- <span class="tabletext">
+ <span>
<#list inventoryItems as inventoryItem>
<a href="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItem.getString("inventoryItemId")}" class="buttontext" target="_blank">
${inventoryItem.getString("inventoryItemId")}
@@ -129,7 +129,7 @@
</th>
<td> </td>
<td width="80%" align="left">
- <span class="tabletext">
+ <span>
<#list orderItems as orderItem>
<a href="/ordermgr/control/orderview?orderId=${orderItem.getString("orderId")}" class="buttontext" target="_blank">
${orderItem.getString("orderId")}/${orderItem.getString("orderItemSeqId")}
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?view=diff&rev=519307&r1=519306&r2=519307
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Sat Mar 17 06:20:33 2007
@@ -548,7 +548,7 @@
<form name="AddProductionRunComponent" type="single" target="addProductionRunComponent" title="">
<auto-fields-service service-name="addProductionRunComponent"/>
<field name="productionRunId"><hidden/></field>
- <field name="workEffortId" title="${uiLabelMap.ManufacturingTask}" widget-style="selectBox">
+ <field name="workEffortId" title="${uiLabelMap.ManufacturingTask}">
<drop-down allow-empty="false">
<entity-options entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]">
<entity-constraint name="workEffortParentId" env-name="productionRunId"/>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml?view=diff&rev=519307&r1=519306&r2=519307
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml Sat Mar 17 06:20:33 2007
@@ -20,8 +20,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
- <form name="lookupRouting" target="LookupRouting" title="" type="single"
- default-title-style="tableheadtext" default-tooltip-style="tabletext">
+ <form name="lookupRouting" target="LookupRouting" title="" type="single">
<auto-fields-service service-name="lookupRoutingTask" default-field-type="hidden"/>
<field name="workEffortName"><text-find/></field>
<field name="workEffortTypeId"><hidden value="ROUTING"/></field>
@@ -31,7 +30,6 @@
<field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field>
</form>
<form name="listLookupRouting" list-name="listIt" title="" type="list"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
paginate-target="LookupRouting" >
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
@@ -47,8 +45,7 @@
<field name="quantityToProduce" title="${uiLabelMap.ManufacturingQuantityMinimum}"><display/></field>
</form>
- <form name="lookupRoutingTask" target="LookupRoutingTask" title="" type="single"
- default-title-style="tableheadtext" default-tooltip-style="tabletext">
+ <form name="lookupRoutingTask" target="LookupRoutingTask" title="" type="single">
<auto-fields-service service-name="lookupRoutingTask" default-field-type="find"/>
<field name="workEffortTypeId"><hidden value="ROU_TASK"/></field>
<field name="fixedAssetId" >
@@ -65,7 +62,6 @@
<field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field>
</form>
<form name="listLookupRoutingTask" list-name="listIt" title="" type="list"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
paginate-target="LookupRoutingTask" >
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?view=diff&rev=519307&r1=519306&r2=519307
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Sat Mar 17 06:20:33 2007
@@ -54,7 +54,7 @@
<td align='center' width='100%'>
<table border='0' cellspacing='0' cellpadding='2'>
<tr>
- <td width='20%' align='right'><div class='tableheadtext'>${uiLabelMap.ManufacturingProductId}:</div></td>
+ <th width='20%' align='right'>${uiLabelMap.ManufacturingProductId}:</th>
<td width='5%'> </td>
<td>
<input type='text' size='25' name='productId' value='${requestParameters.productId?if_exists}'/>
@@ -67,7 +67,7 @@
</td>
</tr>
<tr>
- <td width='20%' align='right'><div class='tableheadtext'>${uiLabelMap.CommonFromDate}:</div></td>
+ <th width='20%' align='right'>${uiLabelMap.CommonFromDate}:</th>
<td width='5%'> </td>
<td>
<input type='text' size='25' name='eventDate' value='${requestParameters.eventDate?if_exists}'/>
@@ -134,16 +134,16 @@
<table width='100%' border='0' cellspacing='0' cellpadding='2' class='boxbottom'>
<tr>
- <td align="left"><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
- <td align="center"> </td>
- <td align="left"><div class="tableheadtext">${uiLabelMap.CommonEventName}</div></td>
- <td align="left"><div class="tableheadtext">${uiLabelMap.CommonEventDate}</div></td>
- <td align="center"> </td>
- <td align="right"><div class="tableheadtext">${uiLabelMap.CommonQuantity}</div></td>
- <td align="right"><div class="tableheadtext">${uiLabelMap.ManufacturingTotalQuantity}</div></td>
+ <th align="left">${uiLabelMap.CommonDescription}</th>
+ <th align="center"> </th>
+ <th align="left">${uiLabelMap.CommonEventName}</th>
+ <th align="left">${uiLabelMap.CommonEventDate}</th>
+ <th align="center"> </th>
+ <th align="right">${uiLabelMap.CommonQuantity}</th>
+ <th align="right">${uiLabelMap.ManufacturingTotalQuantity}</th>
</tr>
<tr>
- <td colspan="7"><hr class="sepbar"/></td>
+ <td colspan="7"><hr/></td>
</tr>
<#assign count = lowIndex>
<#assign productTmp = "">
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl?view=diff&rev=519307&r1=519306&r2=519307
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl Sat Mar 17 06:20:33 2007
@@ -25,11 +25,11 @@
<#if techDataCalendar?has_content>
${listCalendarExceptionDayWrapper.renderFormString(context)}
<br/>
-<hr class="sepbar">
+<hr/>
<#if calendarExceptionDay?has_content>
${updateCalendarExceptionDayWrapper.renderFormString(context)}
<br/>
-<hr class="sepbar">
+<hr/>
</#if>
${addCalendarExceptionDayWrapper.renderFormString(context)}
</#if>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl?view=diff&rev=519307&r1=519306&r2=519307
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl Sat Mar 17 06:20:33 2007
@@ -26,11 +26,11 @@
<#if techDataCalendar?has_content>
${listCalendarExceptionWeekWrapper.renderFormString(context)}
<br/>
- <hr class="sepbar">
+ <hr/>
<#if calendarExceptionWeek?has_content>
${updateCalendarExceptionWeekWrapper.renderFormString(context)}
<br/>
- <hr class="sepbar">
+ <hr/>
</#if>
${addCalendarExceptionWeekWrapper.renderFormString(context)}
</#if>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml?view=diff&rev=519307&r1=519306&r2=519307
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml Sat Mar 17 06:20:33 2007
@@ -20,8 +20,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
- <form name="ListCostComponentCalc" type="list" title="" list-name="allCostComponentCalcs"
- default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+ <form name="ListCostComponentCalc" type="list" title="" list-name="allCostComponentCalcs">
<auto-fields-entity entity-name="CostComponentCalc" default-field-type="display"/>
<field name="costComponentCalcId" widget-style="buttontext">
<hyperlink target="EditCostCalcs?costComponentCalcId=${costComponentCalcId}" description="${costComponentCalcId}" also-hidden="false"/>
@@ -42,8 +41,7 @@
<hyperlink target="removeCostComponentCalc?costComponentCalcId=${costComponentCalcId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
</field>
</form>
- <form name="EditCostComponentCalc" type="single" target="updateCostComponentCalc" title="" default-map-name="costComponentCalc"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <form name="EditCostComponentCalc" type="single" target="updateCostComponentCalc" title="" default-map-name="costComponentCalc">
<alt-target use-when="costComponentCalc==null" target="createCostComponentCalc"/>
<auto-fields-entity entity-name="CostComponentCalc" default-field-type="edit"/>
<field name="costComponentCalcId"><display/></field>
@@ -57,7 +55,7 @@
<entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/>
</drop-down>
</field>
- <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}" widget-style="selectBox">
+ <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
<drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
<entity-options entity-name="Uom" key-field-name="uomId" description="${description} [${uomId}]">
<entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>