ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaco...@apache.org
Subject svn commit: r492201 - in /ofbiz/trunk: applications/manufacturing/webapp/manufacturing/bom/ applications/manufacturing/webapp/manufacturing/jobshopmgt/ applications/manufacturing/webapp/manufacturing/mrp/ applications/manufacturing/webapp/manufacturing...
Date Wed, 03 Jan 2007 16:34:49 GMT
Author: jacopoc
Date: Wed Jan  3 08:34:48 2007
New Revision: 492201

URL: http://svn.apache.org/viewvc?view=rev&rev=492201
Log:
Misc cleanups to the css styles and html of the manufacturing component.
As part of issue OFBIZ-588 I've also added the style information from the div.tabletext element
to the body element in the css file.

Modified:
    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/mrp/findInventoryEventPlan.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl
    ofbiz/trunk/framework/images/webapp/images/maincss.css

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=492201&r1=492200&r2=492201
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Wed
Jan  3 08:34:48 2007
@@ -59,7 +59,7 @@
             <td>&nbsp;</td>
             <td>
             <input type="text" class="inputBox" name="productId" size="20" maxlength="40"
value="${productId?if_exists}"/>
-            <a href="javascript:call_fieldlookup2(document.searchform.productId,'LookupProduct');"><img
src="/content/images/fieldlookup.gif" width="16" height="16" border="0" alt="Lookup"/></a>
+            <a href="javascript:call_fieldlookup2(document.searchform.productId,'LookupProduct');"><img
src="/images/fieldlookup.gif" width="16" height="16" border="0" alt="Lookup"/></a>
             <span class='tabletext'><a href="javascript:document.searchform.submit();"
class="buttontext">${uiLabelMap.ManufacturingShowBOMAssocs}</a></span>
             </td>
         </tr>
@@ -71,7 +71,7 @@
             <td>&nbsp;</td>
             <td>
             <input type="text" class="inputBox" name="copyToProductId" size="20" maxlength="40"
value=""/>
-            <a href="javascript:call_fieldlookup2(document.searchform.copyToProductId,'LookupProduct');"><img
src="/content/images/fieldlookup.gif" width="16" height="16" border="0" alt="Lookup"/></a>
+            <a href="javascript:call_fieldlookup2(document.searchform.copyToProductId,'LookupProduct');"><img
src="/images/fieldlookup.gif" 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>
             </td>
         </tr>
@@ -108,7 +108,7 @@
             <td>&nbsp;</td>
             <td>
                 <input type="text" class="inputBox" name="productId" size="20" maxlength="40"
value="${productId?if_exists}"/>
-                <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productId,'LookupProduct');"><img
src="/content/images/fieldlookup.gif" width="16" height="16" border="0" alt="Lookup"/></a>
+                <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productId,'LookupProduct');"><img
src="/images/fieldlookup.gif" width="16" height="16" border="0" alt="Lookup"/></a>
             </td>
             </tr>
             <tr>
@@ -116,18 +116,16 @@
             <td>&nbsp;</td>
             <td>
                 <input type="text" class="inputBox" name="productIdTo" size="20" maxlength="40"
value="${productIdTo?if_exists}"/>
-                <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productIdTo,'LookupProduct');"><img
src="/content/images/fieldlookup.gif" width="16" height="16" border="0" alt="Lookup"/></a>
+                <a href="javascript:call_fieldlookup2(document.editProductAssocForm.productIdTo,'LookupProduct');"><img
src="/images/fieldlookup.gif" width="16" height="16" border="0" alt="Lookup"/></a>
             </td>
             </tr>
             <tr>
             <td align="right"><div class='tableheadtext'>${uiLabelMap.CommonFromDate}:</div></td>
             <td>&nbsp;</td>
             <td>
-                <div class="tabletext">
-                    <input type="text" class="inputBox" name="fromDate" size="25" maxlength="40"
value=""/>
-                    <a href="javascript:call_cal(document.editProductAssocForm.fromDate,'${nowTimestampString}');"><img
src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"/></a>
-                    (${uiLabelMap.ManufacturingWillBeSetToNow})
-                </div>
+                <input type="text" class="inputBox" name="fromDate" size="25" maxlength="40"
value=""/>
+                <a href="javascript:call_cal(document.editProductAssocForm.fromDate,'${nowTimestampString}');"><img
src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"/></a>
+                (${uiLabelMap.ManufacturingWillBeSetToNow})
             </td>
             </tr>
     <#else>
@@ -163,10 +161,8 @@
         <td width="26%" align="right"><div class='tableheadtext'>${uiLabelMap.CommonThruDate}:</div></td>
         <td>&nbsp;</td>
         <td width="74%">
-        <div class="tabletext">
             <input type="text" class="inputBox" name="thruDate" <#if useValues>
value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("thruDate"))?if_exists}"</#if>
size="30" maxlength="30"/> 
             <a href="javascript:call_cal(document.editProductAssocForm.thruDate,<#if
useValues>'${productAssoc.thruDate?if_exists}'<#elseif (request.getParameter("thruDate"))?exists>'${request.getParameter("thruDate")}'<#else>'${nowTimestampString}'</#if>);"><img
src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"/></a>
-        </div>
         </td>
     </tr>
     <tr>
@@ -175,7 +171,7 @@
         <td width="74%"><input type="text" class="inputBox" 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="tabletext"><div class='tableheadtext'>${uiLabelMap.ManufacturingReason}:</div></div></td>
+        <td width="26%" align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingReason}:</div></td>
         <td>&nbsp;</td>
         <td width="74%"><input type="text" class="inputBox" name="reason" <#if
useValues>value="${(productAssoc.reason)?if_exists}"<#else>value="${(request.getParameter("reason"))?if_exists}"</#if>
size="60" maxlength="255"/></td>
     </tr>
@@ -239,17 +235,17 @@
         
         <table border="1" cellpadding="2" cellspacing="0">
             <tr>
-            <td><div class="tabletext"><b>${uiLabelMap.ProductProductId}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.ProductProductName}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.CommonFromDate}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.CommonThruDate}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.CommonSequenceNum}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.CommonQuantity}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.ManufacturingScrapFactor}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.ManufacturingFormula}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.ManufacturingRoutingTask}</b></div></td>
-            <td><div class="tabletext"><b>&nbsp;</b></div></td>
-            <td><div class="tabletext"><b>&nbsp;</b></div></td>
+            <td><b>${uiLabelMap.ProductProductId}</b></td>
+            <td><b>${uiLabelMap.ProductProductName}</b></td>
+            <td><b>${uiLabelMap.CommonFromDate}</b></td>
+            <td><b>${uiLabelMap.CommonThruDate}</b></td>
+            <td><b>${uiLabelMap.CommonSequenceNum}</b></td>
+            <td><b>${uiLabelMap.CommonQuantity}</b></td>
+            <td><b>${uiLabelMap.ManufacturingScrapFactor}</b></td>
+            <td><b>${uiLabelMap.ManufacturingFormula}</b></td>
+            <td><b>${uiLabelMap.ManufacturingRoutingTask}</b></td>
+            <td><b>&nbsp;</b></td>
+            <td><b>&nbsp;</b></td>
             </tr>
             <#list assocFromProducts as assocFromProduct>
             <#assign listToProduct = assocFromProduct.getRelatedOneCache("AssocProduct")>
@@ -261,11 +257,11 @@
                 ${(assocFromProduct.fromDate)?if_exists}&nbsp;</div></td>
                 <td><div class="tabletext" <#if (assocFromProduct.getTimestamp("thruDate"))?exists
&& nowDate.after(assocFromProduct.getTimestamp("thruDate"))> style="color: red;"</#if>>
                 ${(assocFromProduct.thruDate)?if_exists}&nbsp;</div></td>
-                <td><div class="tabletext">&nbsp;${(assocFromProduct.sequenceNum)?if_exists}</div></td>
-                <td><div class="tabletext">&nbsp;${(assocFromProduct.quantity)?if_exists}</div></td>
-                <td><div class="tabletext">&nbsp;${(assocFromProduct.scrapFactor)?if_exists}</div></td>
-                <td><div class="tabletext">&nbsp;${(assocFromProduct.estimateCalcMethod)?if_exists}</div></td>
-                <td><div class="tabletext">&nbsp;${(assocFromProduct.routingWorkEffortId)?if_exists}</div></td>
+                <td>&nbsp;${(assocFromProduct.sequenceNum)?if_exists}</td>
+                <td>&nbsp;${(assocFromProduct.quantity)?if_exists}</td>
+                <td>&nbsp;${(assocFromProduct.scrapFactor)?if_exists}</td>
+                <td>&nbsp;${(assocFromProduct.estimateCalcMethod)?if_exists}</td>
+                <td>&nbsp;${(assocFromProduct.routingWorkEffortId)?if_exists}</td>
                 <td>
                 <a href="<@ofbizUrl>UpdateProductBom?UPDATE_MODE=DELETE&productId=${productId}&productIdTo=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(assocFromProduct.getTimestamp("fromDate").toString())}&useValues=true</@ofbizUrl>"
class="buttontext">
                 ${uiLabelMap.CommonDelete}</a>
@@ -282,12 +278,12 @@
         <h2>${uiLabelMap.ManufacturingProductComponentOf}</h2>
         <table border="1" cellpadding="2" cellspacing="0">
             <tr>
-            <td><div class="tabletext"><b>${uiLabelMap.ProductProductId}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.ProductProductName}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.CommonFromDate}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.CommonThruDate}</b></div></td>
-            <td><div class="tabletext"><b>${uiLabelMap.CommonQuantity}</b></div></td>
-            <td><div class="tabletext"><b>&nbsp;</b></div></td>
+            <td><b>${uiLabelMap.ProductProductId}</b></td>
+            <td><b>${uiLabelMap.ProductProductName}</b></td>
+            <td><b>${uiLabelMap.CommonFromDate}</b></td>
+            <td><b>${uiLabelMap.CommonThruDate}</b></td>
+            <td><b>${uiLabelMap.CommonQuantity}</b></td>
+            <td><b>&nbsp;</b></td>
             </tr>
             <#list assocToProducts as assocToProduct>
             <#assign listToProduct = assocToProduct.getRelatedOneCache("MainProduct")>
@@ -296,9 +292,9 @@
                 <td><a href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)?if_exists}&productAssocTypeId=${(assocToProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>"
class="buttontext">${(assocToProduct.productId)?if_exists}</a></td>
 <!--                <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProduct?productId=${(assocToProduct.productId)?if_exists}</@ofbizUrl>"
class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td>
-->
                 <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)?if_exists}&productAssocTypeId=${(assocToProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>"
class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td>
-                <td><div class="tabletext">${(assocToProduct.getTimestamp("fromDate"))?if_exists}&nbsp;</div></td>
-                <td><div class="tabletext">${(assocToProduct.getTimestamp("thruDate"))?if_exists}&nbsp;</div></td>
-                <td><div class="tabletext">${(assocToProduct.quantity)?if_exists}&nbsp;</div></td>
+                <td>${(assocToProduct.getTimestamp("fromDate"))?if_exists}&nbsp;</td>
+                <td>${(assocToProduct.getTimestamp("thruDate"))?if_exists}&nbsp;</td>
+                <td>${(assocToProduct.quantity)?if_exists}&nbsp;</td>
                 <td>
                 <a href="<@ofbizUrl>UpdateProductBom?UPDATE_MODE=DELETE&productId=${(assocToProduct.productId)?if_exists}&productIdTo=${(assocToProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocToProduct.productAssocTypeId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(assocToProduct.getTimestamp("fromDate").toString())}&useValues=true</@ofbizUrl>"
class="buttontext">
                 ${uiLabelMap.CommonDelete}</a>
@@ -308,5 +304,5 @@
         </table>
 
         <br/>
-        <div class="tabletext">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>).</div>
+        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>).
     </#if>

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=492201&r1=492200&r2=492201
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl
Wed Jan  3 08:34:48 2007
@@ -18,7 +18,7 @@
 <#if productionRunId?has_content>
 <#-- Mandatory work efforts -->
 <#if mandatoryWorkEfforts?has_content>
-    <div class="tabletext">
+    <p>
     ${uiLabelMap.ManufacturingMandatoryProductionRuns}:
     <#list mandatoryWorkEfforts as mandatoryWorkEffortAssoc>
         <#assign mandatoryWorkEffort = mandatoryWorkEffortAssoc.getRelatedOne("FromWorkEffort")>
@@ -32,11 +32,11 @@
             </#if>
         </#if>
     </#list>
-    </div>
+    </p>
 </#if>
 <#-- Dependent work efforts -->
 <#if dependentWorkEfforts?has_content>
-    <div class="tabletext">
+    <p>
     ${uiLabelMap.ManufacturingDependentProductionRuns}: 
     <#list dependentWorkEfforts as dependentWorkEffortAssoc>
         <#assign dependentWorkEffort = dependentWorkEffortAssoc.getRelatedOne("ToWorkEffort")>
@@ -50,7 +50,7 @@
             </#if>
         </#if>
     </#list>
-    </div>
+    </p>
 </#if>
 
 
@@ -172,7 +172,7 @@
         <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
             <tr>
                 <td><div class="boxhead">${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}</div></td>
-                <td align="right"><div class="tabletext">
+                <td align="right">
                     <a href="<@ofbizUrl>EditProductionRun?productionRunId=${productionRunId}&amp;actionForm=AddRoutingTask</@ofbizUrl>"
class="submenutextright">
                                     ${uiLabelMap.ManufacturingAddRoutingTask}</a>
                 </td>    
@@ -188,7 +188,7 @@
         <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
             <tr>
                 <td><div class="boxhead">${uiLabelMap.ManufacturingListOfProductionRunComponents}</div></td>
-                <td align="right"><div class="tabletext">
+                <td align="right">
                     <a href="<@ofbizUrl>EditProductionRun?productionRunId=${productionRunId}&amp;actionForm=AddProductComponent</@ofbizUrl>"
class="submenutextright">
                                     ${uiLabelMap.ManufacturingAddProductionRunProductComponent}</a>
                 </td>
@@ -204,7 +204,7 @@
         <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
             <tr>
                 <td><div class="boxhead">${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}</div></td>
-                <td align="right"><div class="tabletext">
+                <td align="right">
                     <a href="<@ofbizUrl>EditProductionRun?productionRunId=${productionRunId}&amp;actionForm=AddFixedAsset</@ofbizUrl>"
class="submenutextright">
                                     ${uiLabelMap.ManufacturingAddProductionRunFixedAssetAssign}</a>
                 </td>

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=492201&r1=492200&r2=492201
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
Wed Jan  3 08:34:48 2007
@@ -19,7 +19,7 @@
 
 <#-- Mandatory work efforts -->
 <#if mandatoryWorkEfforts?has_content>
-    <div class="tabletext">
+    <p>
     ${uiLabelMap.ManufacturingMandatoryProductionRuns}:
     <#list mandatoryWorkEfforts as mandatoryWorkEffortAssoc>
         <#assign mandatoryWorkEffort = mandatoryWorkEffortAssoc.getRelatedOne("FromWorkEffort")>
@@ -33,11 +33,11 @@
             </#if>
         </#if>
     </#list>
-    </div>
+    </p>
 </#if>
 <#-- Dependent work efforts -->
 <#if dependentWorkEfforts?has_content>
-    <div class="tabletext">
+    <p>
     ${uiLabelMap.ManufacturingDependentProductionRuns}: 
     <#list dependentWorkEfforts as dependentWorkEffortAssoc>
         <#assign dependentWorkEffort = dependentWorkEffortAssoc.getRelatedOne("ToWorkEffort")>
@@ -51,7 +51,7 @@
             </#if>
         </#if>
     </#list>
-    </div>
+    </p>
 </#if>
 
 <table border="0" width="100%" cellspacing="0" cellpadding="0">
@@ -250,8 +250,7 @@
         <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
             <tr>
                 <td><div class="boxhead">${uiLabelMap.ManufacturingListOfProductionRunComponents}</div></td>
-                <td align="right"><div class="tabletext">
-                </td>
+                <td align="right"></td>
             </tr>
         </table>
         ${ListProductionRunComponentsWrapper.renderFormString(context)}

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=492201&r1=492200&r2=492201
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
Wed Jan  3 08:34:48 2007
@@ -33,7 +33,7 @@
         <tr>
           <td><div class='boxhead'></div></td>
           <td align='right'>
-            <div class="tabletext">
+            <p>
               <#if requestParameters.hideFields?default("N") == "Y">
                 <a href="<@ofbizUrl>FindInventoryEventPlan?hideFields=N${paramList}</@ofbizUrl>"
class="submenutextright">${uiLabelMap.CommonShowLookupFields}</a>
               <#else>
@@ -42,7 +42,7 @@
                 </#if>
                 <a href="javascript:lookupInventory();" class="submenutextright">${uiLabelMap.CommonLookup}</a>
               
               </#if>
-            </div>
+            </p>
           </td>
         </tr>
       </table>

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=492201&r1=492200&r2=492201
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl Wed
Jan  3 08:34:48 2007
@@ -28,24 +28,24 @@
   <table width="90%" border="0" cellpadding="2" cellspacing="0">
     <#if techDataCalendar?has_content>
     <tr>
-      <td width='26%' align='right' valign='top'><div class="tabletext">${uiLabelMap.ManufacturingCalendarId}</div></td>
+      <td width='26%' align='right' valign='top'>${uiLabelMap.ManufacturingCalendarId}</td>
       <td width="5">&nbsp;</td>
-      <td width="74%" valign="top"><div class="tabletext"><b>${techDataCalendar.calendarId?if_exists}</b>
(${uiLabelMap.CommonNotModifRecreat})</td>
+      <td width="74%" valign="top"><b>${techDataCalendar.calendarId?if_exists}</b>
(${uiLabelMap.CommonNotModifRecreat})</td>
     </tr>
     <#else>
     <tr>
-      <td width='26%' align='right' valign='top'><div class="tabletext">${uiLabelMap.ManufacturingCalendarId}</div></td>
+      <td width='26%' align='right' valign="top">${uiLabelMap.ManufacturingCalendarId}</div></td>
       <td width="5">&nbsp;</td>
       <td width="74%"><input type="text" class="inputBox" size="12" name="calendarId"
value="${calendarData.calendarId?if_exists}"></td>
     </tr>
     </#if>
     <tr>
-      <td width='26%' align='right' valign='top'><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+      <td width='26%' align='right' valign='top'>${uiLabelMap.CommonDescription}</td>
       <td width="5">&nbsp;</td>
       <td width="74%"><input type="text" class="inputBox" size="40" name="description"
value="${calendarData.description?if_exists}"></td>
     </tr>
     <tr>
-      <td width='26%' align='right' valign='top'><div class="tabletext">${uiLabelMap.ManufacturingCalendarWeekId}</div></td>
+      <td width='26%' align='right' valign='top'>${uiLabelMap.ManufacturingCalendarWeekId}</td>
       <td width="5">&nbsp;</td>
       <td width="74%">
          <select class="selectBox" name="calendarWeekId">

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl?view=diff&rev=492201&r1=492200&r2=492201
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl
Wed Jan  3 08:34:48 2007
@@ -24,10 +24,10 @@
             <form name="calendarWeekform" method="post" action="<@ofbizUrl>UpdateCalendarWeek</@ofbizUrl>">
             <table width="90%" border="0" cellpadding="2" cellspacing="0">
               <tr>
-                  <td width="26%" align="right" valign="top" ><div class="tabletext">${uiLabelMap.ManufacturingCalendarWeekId}</div></td>
+                  <td width="26%" align="right" valign="top">${uiLabelMap.ManufacturingCalendarWeekId}</td>
                   <td width="5">&nbsp;</td>
                 <input type="hidden" name="calendarWeekId" value="${calendarWeek.calendarWeekId}">
-                  <td width="74%" valign="top" colspan="5"><div class="tabletext"><b>${calendarWeek.calendarWeekId?if_exists}</b>
(${uiLabelMap.CommonNotModifRecreat})</td>
+                  <td width="74%" valign="top" colspan="5"><b>${calendarWeek.calendarWeekId?if_exists}</b>
(${uiLabelMap.CommonNotModifRecreat})</td>
         <#else>
             <h1>${uiLabelMap.ManufacturingCreateCalendarWeek}</h1>
             <div>
@@ -37,76 +37,76 @@
               <form name="calendarWeekform" method="post" action="<@ofbizUrl>CreateCalendarWeek</@ofbizUrl>">
             <table width="90%" border="0" cellpadding="2" cellspacing="0">
               <tr>
-                  <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ManufacturingCalendarWeekId}</div></td>
+                  <td width="26%" align="right" valign="top">${uiLabelMap.ManufacturingCalendarWeekId}</td>
                   <td width="5">&nbsp;</td>
                   <td width="74%" colspan="5"><input type="text" class="inputBox"
size="12" name="calendarWeekId" value="${calendarWeekData.calendarWeekId?if_exists}"></td>
         </#if>
             </tr>
             <tr>
-                  <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+                  <td width="26%" align="right" valign="top">${uiLabelMap.CommonDescription}</td>
                   <td width="5">&nbsp;</td>
                   <td width="74%" colspan="5"><input type="text" class="inputBox"
size="30" name="description" value="${calendarWeekData.description?if_exists}"></td>
             </tr>
             <tr>
-                  <td width="26%" align="right" valign="top"><div class="tabletext"><b>${uiLabelMap.CommonMonday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</div></td>
+                  <td width="26%" align="right" valign="top"><b>${uiLabelMap.CommonMonday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</td>
                   <td width="5">&nbsp;</td>
                   <td width="1%"><input type="text" class="inputBox" size="12" name="mondayStartTime"
value="${calendarWeekData.mondayStartTime?if_exists}"></td>
                   <td width="5">&nbsp;</td>
-                  <td width="1%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ManufacturingCalendarCapacity}</div></td>
+                  <td width="1%" align="right" valign="top">${uiLabelMap.ManufacturingCalendarCapacity}</td>
                   <td width="1%">&nbsp;</td>
                   <td width="40%"><input type="text" class="inputBox" size="8" name="mondayCapacity"
value="${calendarWeekData.mondayCapacity?if_exists}"></td>
             </tr>
              <tr>
-                  <td width="26%" align="right" valign="top"><div class="tabletext"><b>${uiLabelMap.CommonTuesday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</div></td>
+                  <td width="26%" align="right" valign="top"><b>${uiLabelMap.CommonTuesday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</td>
                   <td width="5">&nbsp;</td>
                   <td width="1%"><input type="text" class="inputBox" size="12" name="tuesdayStartTime"
value="${calendarWeekData.tuesdayStartTime?if_exists}"></td>
                   <td width="5">&nbsp;</td>
-                  <td width="1%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ManufacturingCalendarCapacity}</div></td>
+                  <td width="1%" align="right" valign="top">${uiLabelMap.ManufacturingCalendarCapacity}</td>
                   <td width="1%">&nbsp;</td>
                   <td width="40%"><input type="text" class="inputBox" size="8" name="tuesdayCapacity"
value="${calendarWeekData.tuesdayCapacity?if_exists}"></td>
             </tr>
              <tr>
-                  <td width="26%" align="right" valign="top"><div class="tabletext"><b>${uiLabelMap.CommonWednesday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</div></td>
+                  <td width="26%" align="right" valign="top"><b>${uiLabelMap.CommonWednesday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</td>
                   <td width="5">&nbsp;</td>
                   <td width="1%"><input type="text" class="inputBox" size="12" name="wednesdayStartTime"
value="${calendarWeekData.wednesdayStartTime?if_exists}"></td>
                   <td width="5">&nbsp;</td>
-                  <td width="1%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ManufacturingCalendarCapacity}</div></td>
+                  <td width="1%" align="right" valign="top">${uiLabelMap.ManufacturingCalendarCapacity}</td>
                   <td width="1%">&nbsp;</td>
                   <td width="40%"><input type="text" class="inputBox" size="8" name="wednesdayCapacity"
value="${calendarWeekData.wednesdayCapacity?if_exists}"></td>
             </tr>
              <tr>
-                  <td width="26%" align="right" valign="top"><div class="tabletext"><b>${uiLabelMap.CommonThursday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</div></td>
+                  <td width="26%" align="right" valign="top"><b>${uiLabelMap.CommonThursday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</td>
                   <td width="5">&nbsp;</td>
                   <td width="1%"><input type="text" class="inputBox" size="12" name="thursdayStartTime"
value="${calendarWeekData.thursdayStartTime?if_exists}"></td>
                   <td width="5">&nbsp;</td>
-                  <td width="1%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ManufacturingCalendarCapacity}</div></td>
+                  <td width="1%" align="right" valign="top">${uiLabelMap.ManufacturingCalendarCapacity}</td>
                   <td width="1%">&nbsp;</td>
                   <td width="40%"><input type="text" class="inputBox" size="8" name="thursdayCapacity"
value="${calendarWeekData.thursdayCapacity?if_exists}"></td>
             </tr>
              <tr>
-                  <td width="26%" align="right" valign="top"><div class="tabletext"><b>${uiLabelMap.CommonFriday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</div></td>
+                  <td width="26%" align="right" valign="top"><b>${uiLabelMap.CommonFriday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</td>
                   <td width="5">&nbsp;</td>
                   <td width="1%"><input type="text" class="inputBox" size="12" name="fridayStartTime"
value="${calendarWeekData.fridayStartTime?if_exists}"></td>
                   <td width="5">&nbsp;</td>
-                  <td width="1%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ManufacturingCalendarCapacity}</div></td>
+                  <td width="1%" align="right" valign="top">${uiLabelMap.ManufacturingCalendarCapacity}</td>
                   <td width="1%">&nbsp;</td>
                   <td width="40%"><input type="text" class="inputBox" size="8" name="fridayCapacity"
value="${calendarWeekData.fridayCapacity?if_exists}"></td>
             </tr>
              <tr>
-                  <td width="26%" align="right" valign="top"><div class="tabletext"><b>${uiLabelMap.CommonSaturday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</div></td>
+                  <td width="26%" align="right" valign="top"><b>${uiLabelMap.CommonSaturday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</td>
                   <td width="5">&nbsp;</td>
                   <td width="1%"><input type="text" class="inputBox" size="12" name="saturdayStartTime"
value="${calendarWeekData.saturdayStartTime?if_exists}"></td>
                   <td width="5">&nbsp;</td>
-                  <td width="1%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ManufacturingCalendarCapacity}</div></td>
+                  <td width="1%" align="right" valign="top">${uiLabelMap.ManufacturingCalendarCapacity}</td>
                   <td width="1%">&nbsp;</td>
                   <td width="40%"><input type="text" class="inputBox" size="8" name="saturdayCapacity"
value="${calendarWeekData.saturdayCapacity?if_exists}"></td>
             </tr>
              <tr>
-                  <td width="26%" align="right" valign="top"><div class="tabletext"><b>${uiLabelMap.CommonSunday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</div></td>
+                  <td width="26%" align="right" valign="top"><b>${uiLabelMap.CommonSunday}</b>&nbsp;${uiLabelMap.ManufacturingStartTime}</td>
                   <td width="5">&nbsp;</td>
                   <td width="1%"><input type="text" class="inputBox" size="12" name="sundayStartTime"
value="${calendarWeekData.sundayStartTime?if_exists}"></td>
                   <td width="5">&nbsp;</td>
-                  <td width="1%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ManufacturingCalendarCapacity}</div></td>
+                  <td width="1%" align="right" valign="top">${uiLabelMap.ManufacturingCalendarCapacity}</td>
                   <td width="1%">&nbsp;</td>
                   <td width="40%"><input type="text" class="inputBox" size="8" name="sundayCapacity"
value="${calendarWeekData.sundayCapacity?if_exists}"></td>
             </tr>

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=492201&r1=492200&r2=492201
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl Wed
Jan  3 08:34:48 2007
@@ -29,9 +29,9 @@
   <#if techDataCalendars?has_content>
     <#list techDataCalendars as techDataCalendar>
       <tr>
-        <td><div class="tabletext">${techDataCalendar.calendarId}</div></td>
-        <td><div class="tabletext">${techDataCalendar.get("description",locale)?if_exists}</div></td>
-        <td><div class="tabletext">${techDataCalendar.calendarWeekId?if_exists}</div></td>
+        <td>${techDataCalendar.calendarId}</td>
+        <td>${techDataCalendar.get("description",locale)?if_exists}</td>
+        <td>${techDataCalendar.calendarWeekId?if_exists}</td>
         <td align="right">
           <a href="<@ofbizUrl>EditCalendar?calendarId=${techDataCalendar.calendarId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonEdit}</a>
           <a href="<@ofbizUrl>RemoveCalendar?calendarId=${techDataCalendar.calendarId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonDelete}</a>

Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?view=diff&rev=492201&r1=492200&r2=492201
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/maincss.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/maincss.css Wed Jan  3 08:34:48 2007
@@ -19,6 +19,9 @@
 
 /* ===== General Styles ===== */
 BODY {
+font-size: 10px;
+text-decoration: none;
+font-family: Verdana, Arial, Helvetica, sans-serif;
 background: #D4D0C8;
 margin-top: 0px;
 margin-right: 0px;
@@ -1070,30 +1073,33 @@
 }
 
 /* ==== Styles For The Html Log === */
-.DEBUG{
+.DEBUG {
 font-size: 10px;
 text-decoration: none;
 font-family: Verdana, Arial, Helvetica, sans-serif;
-color:gray;
+color: gray;
 }
-.WARN{
+
+.WARN {
 font-size: 10px;
 text-decoration: none;
 font-family: Verdana, Arial, Helvetica, sans-serif;
-font-weight:bold;
-color:blue;
+font-weight: bold;
+color: blue;
 }
+
 .INFO{
 font-size: 10px;
 text-decoration: none;
 font-family: Verdana, Arial, Helvetica, sans-serif;
 color:green;
 }
-.ERROR{
+
+.ERROR {
 font-size: 10px;
 text-decoration: none;
 font-family: Verdana, Arial, Helvetica, sans-serif;
-font-weight:bold;
-color:red;
+font-weight: bold;
+color: red;
 border: 2px solid red;
 }



Mime
View raw message