ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaco...@apache.org
Subject svn commit: r492187 - in /ofbiz/trunk: applications/manufacturing/webapp/manufacturing/bom/ applications/manufacturing/webapp/manufacturing/jobshopmgt/ applications/manufacturing/webapp/manufacturing/routing/ framework/images/webapp/images/
Date Wed, 03 Jan 2007 15:47:20 GMT
Author: jacopoc
Date: Wed Jan  3 07:47:19 2007
New Revision: 492187

URL: http://svn.apache.org/viewvc?view=rev&rev=492187
Log:
First small step done to cleanup the css styles in ftl templates.
As suggested in OFBIZ-241, I've replaced, in the manufacturing component, all the <div
class="head1"> tags with the <h1> tag and I've added the style definition for the
H1 element to the css file.

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/MrpReports.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/ListCalendarWeek.ftl
    ofbiz/trunk/framework/images/webapp/images/maincss.css

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=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl Wed
Jan  3 07:47:19 2007
@@ -21,7 +21,7 @@
 <hr/>
 <div class="tableheadtext">${uiLabelMap.ManufacturingSelectedFeatures}</div>
 <#list selectedFeatures as selectedFeature>
-    <div class="tabletext">${selectedFeature.productFeatureTypeId} = ${selectedFeature.description?if_exists}
[${selectedFeature.productFeatureId}]</div>
+    <p>${selectedFeature.productFeatureTypeId} = ${selectedFeature.description?if_exists}
[${selectedFeature.productFeatureId}]</p>
 </#list>
 </#if>
 <hr/>
@@ -112,7 +112,7 @@
           -->
         <#else>
           <tr>
-            <td colspan="6"><div class="head3">${uiLabelMap.CommonNoElementFound}.</div></td>
+            <td colspan="6"><h3>${uiLabelMap.CommonNoElementFound}.</h3></td>
           </tr>
         </#if>
       </table>

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=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Wed
Jan  3 07:47:19 2007
@@ -25,7 +25,7 @@
 // -->
 </script>
 
-    <div class="head1">${uiLabelMap.ManufacturingBillOfMaterials} <span class="head2">
<#if product?exists>${(product.internalName)?if_exists}</#if>[${uiLabelMap.CommonId}:${productId?if_exists}]</span></div>
+    <h1>${uiLabelMap.ManufacturingBillOfMaterials} <#if product?exists>${(product.internalName)?if_exists}</#if>[${uiLabelMap.CommonId}:${productId?if_exists}]</h1>
     <#if product?has_content>
         <a href="<@ofbizUrl>BomSimulation</@ofbizUrl>?productId=${productId}&bomType=${productAssocTypeId}"
class="buttontext">${uiLabelMap.ManufacturingBillOfMaterials}</a>
         <!--<a href="<@ofbizUrl>EditRoutingProductLink?byProduct=${productId}</@ofbizUrl>"
class="buttontext">[${uiLabelMap.ManufacturingProductRoutings}]</a></span>-->
@@ -235,7 +235,7 @@
     <#if productId?exists && product?exists>
         <hr class="sepbar">
         <a name="components"></a>
-        <div class="head2">${uiLabelMap.ManufacturingProductComponents}</div>
+        <h2>${uiLabelMap.ManufacturingProductComponents}</h2>
         
         <table border="1" cellpadding="2" cellspacing="0">
             <tr>
@@ -279,7 +279,7 @@
         </table>
         
         <hr class="sepbar">
-        <div class="head2">${uiLabelMap.ManufacturingProductComponentOf}</div>
+        <h2>${uiLabelMap.ManufacturingProductComponentOf}</h2>
         <table border="1" cellpadding="2" cellspacing="0">
             <tr>
             <td><div class="tabletext"><b>${uiLabelMap.ProductProductId}</b></div></td>

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=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/EditProductionRun.ftl
Wed Jan  3 07:47:19 2007
@@ -214,5 +214,5 @@
       </td></tr>
     </table>
 <#else>
-  <div class="head1">${uiLabelMap.ManufacturingNoProductionRunSelected}</div>
+  <h1>${uiLabelMap.ManufacturingNoProductionRunSelected}</h1>
 </#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=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl
Wed Jan  3 07:47:19 2007
@@ -16,7 +16,7 @@
 -->
 
 <#if mrpName?exists>
-  <div class="head1">${uiLabelMap.ManufacturingMrpName}: ${mrpName?if_exists}</div>
+  <h1>${uiLabelMap.ManufacturingMrpName}: ${mrpName?if_exists}</h1>
   <!--
   <div><a href="<@ofbizUrl>MRPPRunsProductsByFeature.pdf?mrpName=${mrpName}&taskNamePar=O-LAV_01b&productCategoryIdPar=</@ofbizUrl>"
class="buttontext" target="_report">[${uiLabelMap.ManufacturingMRPPRunsProductsByFeature}]</a></div>
   <div><a href="<@ofbizUrl>PRunsComponentsByFeature.pdf?showLocation=Y&mrpName=${mrpName}&taskNamePar=O-PREL_L&productCategoryIdPar=PANNELLI</@ofbizUrl>"
class="buttontext" target="_report">[${uiLabelMap.ManufacturingPRunsComponentsByFeature}]</a></div>

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=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
Wed Jan  3 07:47:19 2007
@@ -270,5 +270,5 @@
       </td></tr>
     </table>
 <#else>
-  <div class="head1">${uiLabelMap.ManufacturingNoProductionRunSelected}</div>
+  <h1>${uiLabelMap.ManufacturingNoProductionRunSelected}</h1>
 </#if>

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=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
Wed Jan  3 07:47:19 2007
@@ -16,7 +16,7 @@
 -->
 
 <#if shipment?exists>
-  <div class="head1">${uiLabelMap.ManufacturingWorkWithShipmentPlans}: ${shipment.shipmentId}</div>
+  <h1>${uiLabelMap.ManufacturingWorkWithShipmentPlans}: ${shipment.shipmentId}</h1>
   ${listShipmentPlanForm.renderFormString(context)}
   <#if workInProgress>
     <br/>
@@ -39,7 +39,7 @@
   <div><a href="<@ofbizUrl>PRunsInfoAndOrder.pdf?shipmentId=${shipmentId}&taskNamePar=O-PREL_L&productFeatureTypeIdPar=&productCategoryIdPar=HARDWARE</@ofbizUrl>"
class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsInfoAndOrder}</a></div>
   -->
 <#else>
-<div class="head1">${uiLabelMap.ManufacturingWorkWithShipmentPlans}</div>
+<h1>${uiLabelMap.ManufacturingWorkWithShipmentPlans}</h1>
 <#if listShipmentPlansForm?has_content>
   ${listShipmentPlansForm.renderFormString(context)}
 </#if>

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=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl Wed
Jan  3 07:47:19 2007
@@ -16,11 +16,11 @@
 -->
 
 <#if techDataCalendar?has_content>
-  <div class="head1">${uiLabelMap.ManufacturingUpdateCalendar} </div>
+  <h1>${uiLabelMap.ManufacturingUpdateCalendar} </h1>
   <form name="calendarform" method="post" action="<@ofbizUrl>UpdateCalendar</@ofbizUrl>">
     <input type="hidden" name="calendarId" value="${techDataCalendar.calendarId}">
 <#else>
-  <div class="head1">${uiLabelMap.ManufacturingCreateCalendar}</div>
+  <h1>${uiLabelMap.ManufacturingCreateCalendar}</h1>
   <form name="calendarform" method="post" action="<@ofbizUrl>CreateCalendar</@ofbizUrl>">
 </#if>
 

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=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl
Wed Jan  3 07:47:19 2007
@@ -15,12 +15,10 @@
 under the License.
 -->
 
-<div class="head1">${uiLabelMap.ManufacturingEditCalendarExceptionDayFor}&nbsp;

-    <span class='head2'>
+<h1>${uiLabelMap.ManufacturingEditCalendarExceptionDayFor}&nbsp; 
         <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}"</#if>

         [${uiLabelMap.CommonId}:${techDataCalendar.calendarId?if_exists}]
-    </span>
-</div>
+</h1>
 <br/>
 <#if techDataCalendar?has_content>
 ${listCalendarExceptionDayWrapper.renderFormString(context)}

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=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl
Wed Jan  3 07:47:19 2007
@@ -15,13 +15,11 @@
 under the License.
 -->
 
-<div class="head1">
+<h1>
     ${uiLabelMap.ManufacturingEditCalendarExceptionWeekFor}&nbsp; 
-    <span class='head2'>
-        <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}"</#if>

-        [${uiLabelMap.CommonId}:${techDataCalendar.calendarId?if_exists}]
-    </span>
-</div>
+    <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}"</#if>

+    [${uiLabelMap.CommonId}:${techDataCalendar.calendarId?if_exists}]
+</h1>
 <br/>
 <#if techDataCalendar?has_content>
     ${listCalendarExceptionWeekWrapper.renderFormString(context)}

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=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl
Wed Jan  3 07:47:19 2007
@@ -16,7 +16,7 @@
 -->
 
         <#if calendarWeek?has_content>
-            <div class="head1">${uiLabelMap.ManufacturingUpdateCalendarWeek} </div>
+            <h1>${uiLabelMap.ManufacturingUpdateCalendarWeek}</h1>
             <div>
                 <a href="<@ofbizUrl>EditCalendarWeek</@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendarWeek}</a>
             </div>
@@ -29,7 +29,7 @@
                 <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>
         <#else>
-            <div class="head1">${uiLabelMap.ManufacturingCreateCalendarWeek} </div>
+            <h1>${uiLabelMap.ManufacturingCreateCalendarWeek}</h1>
             <div>
                 <a href="<@ofbizUrl>EditCalendarWeek</@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendarWeek}</a>
             </div>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/ListCalendarWeek.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/ListCalendarWeek.ftl?view=diff&rev=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/ListCalendarWeek.ftl
(original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/ListCalendarWeek.ftl
Wed Jan  3 07:47:19 2007
@@ -15,7 +15,7 @@
 under the License.
 -->
 
-<div class="head1">${uiLabelMap.ManufacturingListCalendarWeek}&nbsp; </div>
+<h1>${uiLabelMap.ManufacturingListCalendarWeek}</h1>
 <div>
     <a href="<@ofbizUrl>EditCalendarWeek</@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendarWeek}</a>
 </div>

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=492187&r1=492186&r2=492187
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/maincss.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/maincss.css Wed Jan  3 07:47:19 2007
@@ -35,11 +35,36 @@
 margin-bottom: 0;
 }
 
+H1 {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+margin: 0px;
+font-size: 12pt;
+font-weight: bold;
+color: #000099;
+}
+
+H2 {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+margin: 0px;
+font-size: 10pt;
+font-weight: bold;
+color: #000000;
+}
+
+H3 {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+margin: 0px;
+font-size: 8pt;
+font-weight: bold;
+color: #000000;
+}
+
 .endcolumns {
 clear: both;
 height: 0px;
 visibility: hidden;
 }
+
 
 .head1 {
 font-family: Verdana, Arial, Helvetica, sans-serif;



Mime
View raw message