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/04/23 11:03:37 UTC
svn commit: r531385 - in
/ofbiz/trunk/applications/manufacturing/webapp/manufacturing:
bom/EditProductBom.ftl jobshopmgt/MrpReports.ftl
jobshopmgt/WorkWithShipmentPlans.ftl mrp/findInventoryEventPlan.ftl
routing/EditCalendar.ftl
Author: jacopoc
Date: Mon Apr 23 02:03:35 2007
New Revision: 531385
URL: http://svn.apache.org/viewvc?view=rev&rev=531385
Log:
Layout improvements to the manufacturing application by Adrian Crum: OFBIZ-916
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl
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=531385&r1=531384&r2=531385
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Mon Apr 23 02:03:35 2007
@@ -83,7 +83,7 @@
<hr/>
- <form action="<@o...@ofbizUrl>" method="post" style="margin: 0;" name="editProductAssocForm">
+ <form action="<@o...@ofbizUrl>" method="post" name="editProductAssocForm">
<#if !(productAssoc?exists)>
<input type="hidden" name="UPDATE_MODE" value="CREATE"/>
<table border="0" cellpadding="2" cellspacing="0">
@@ -255,10 +255,10 @@
<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 <#if (assocFromProduct.getTimestamp("fromDate"))?exists && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> style="color: red;"</#if>>
- ${(assocFromProduct.fromDate)?if_exists} </div></td>
- <td><div <#if (assocFromProduct.getTimestamp("thruDate"))?exists && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> style="color: red;"</#if>>
- ${(assocFromProduct.thruDate)?if_exists} </div></td>
+ <td<#if (assocFromProduct.getTimestamp("fromDate"))?exists && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> class="alert"</#if>>
+ ${(assocFromProduct.fromDate)?if_exists} </td>
+ <td<#if (assocFromProduct.getTimestamp("thruDate"))?exists && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> class="alert"</#if>>
+ ${(assocFromProduct.thruDate)?if_exists} </td>
<td> ${(assocFromProduct.sequenceNum)?if_exists}</td>
<td> ${(assocFromProduct.quantity)?if_exists}</td>
<td> ${(assocFromProduct.scrapFactor)?if_exists}</td>
@@ -306,5 +306,5 @@
</table>
<br/>
- NOTE: <b style="color: red;">Red</b> date/time entries denote that the current time is before the From Date or after the Thru Date. If the From Date is <b style="color: red;">red</b>, association has not started yet; if Thru Date is <b style="color: red;">red</b>, association has expired (<u>and should probably be deleted</u>).
+ NOTE: <b class="alert">Red</b> date/time entries denote that the current time is before the From Date or after the Thru Date. If the From Date is <b style="color: red;">red</b>, association has not started yet; if Thru Date is <b style="color: red;">red</b>, association has expired (<u>and should probably be deleted</u>).
</#if>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl?view=diff&rev=531385&r1=531384&r2=531385
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl Mon Apr 23 02:03:35 2007
@@ -19,7 +19,7 @@
<#if mrpName?exists>
<h1>${uiLabelMap.ManufacturingMrpName}: ${mrpName?if_exists}</h1>
- <!--
+ <#--
<div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">[${uiLabelMap.ManufacturingMRPPRunsProductsByFeature}]</a></div>
<div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">[${uiLabelMap.ManufacturingPRunsComponentsByFeature}]</a></div>
<div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">[${uiLabelMap.ManufacturingPRunsComponentsByFeature1}]</a></div>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl?view=diff&rev=531385&r1=531384&r2=531385
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl Mon Apr 23 02:03:35 2007
@@ -31,8 +31,8 @@
</#if>
<div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPackageLabelsReport}</a></div>
- <!-- new reports -->
- <!--
+ <#-- new reports -->
+ <#--
<div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsProductsByFeature}</a></div>
<div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsComponentsByFeature2}</a></div>
<div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsComponentsByFeature3}</a></div>
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=531385&r1=531384&r2=531385
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Mon Apr 23 02:03:35 2007
@@ -33,7 +33,7 @@
<td width='100%'>
<table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
<tr>
- <td><div class='boxhead'></div></td>
+ <td class='boxhead'></td>
<td align='right'>
<p>
<#if requestParameters.hideFields?default("N") == "Y">
@@ -108,7 +108,7 @@
<#assign rowClass = "viewManyTR2">
<table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
<tr>
- <td width="50%"><div class="boxhead">${uiLabelMap.CommonElementsFound}</div></td>
+ <td width="50%" class="boxhead">${uiLabelMap.CommonElementsFound}</td>
<td width="50%">
<div class="boxhead" align="right">
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl?view=diff&rev=531385&r1=531384&r2=531385
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl Mon Apr 23 02:03:35 2007
@@ -36,7 +36,7 @@
</tr>
<#else>
<tr>
- <td width='26%' align='right' valign="top">${uiLabelMap.ManufacturingCalendarId}</div></td>
+ <td width='26%' align='right' valign="top">${uiLabelMap.ManufacturingCalendarId}</td>
<td width="5"> </td>
<td width="74%"><input type="text" size="12" name="calendarId" value="${calendarData.calendarId?if_exists}"></td>
</tr>
@@ -69,4 +69,4 @@
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendar}</a>
</td>
</tr>
-</table>
\ No newline at end of file
+</table>