svn commit: r607742 - in /ofbiz/trunk/applications: accounting/webapp/accounting/agreement/ accounting/webapp/accounting/common/ accounting/webapp/accounting/invoice/ party/templates/email/

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

svn commit: r607742 - in /ofbiz/trunk/applications: accounting/webapp/accounting/agreement/ accounting/webapp/accounting/common/ accounting/webapp/accounting/invoice/ party/templates/email/

adrianc
Author: adrianc
Date: Mon Dec 31 07:46:39 2007
New Revision: 607742

URL: http://svn.apache.org/viewvc?rev=607742&view=rev
Log:
Removed some deprecated styles from the accounting and party manager components.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl
    ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
    ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl
    ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl
    ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?rev=607742&r1=607741&r2=607742&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Mon Dec 31 07:46:39 2007
@@ -285,7 +285,7 @@
         <field name="internalName" entry-name="productId">
             <display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/>
         </field>
-        <field name="price" title-area-style="tableheadmedium" widget-area-style="tabletextright"><display/></field>
+        <field name="price" title-area-style="tableheadmedium" widget-area-style="align-text"><display/></field>
     </form>
     <form name="ListAgreementItemSupplierProductsForReport" list-name="agreementProducts" target="" title="" type="list">
         <field name="productId" title-area-style="tableheadmedium"><display/></field>
@@ -293,7 +293,7 @@
         <field name="internalName" entry-name="productId">
             <display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/>
         </field>
-        <field name="lastPrice" title-area-style="tableheadmedium" widget-area-style="tabletextright"><display/></field>
+        <field name="lastPrice" title-area-style="tableheadmedium" widget-area-style="align-text"><display/></field>
     </form>
     <form name="EditAgreementItemProduct" type="single" target="updateAgreementItemProduct" title="" default-map-name="agreementProductAppl">
         <alt-target use-when="agreementProductAppl==null" target="createAgreementItemProduct"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl?rev=607742&r1=607741&r2=607742&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl Mon Dec 31 07:46:39 2007
@@ -26,17 +26,17 @@
 </#if>
 
   <tr>
-    <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCompanyNameCard}</div></td>
+    <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCompanyNameCard}</td>
     <td width="5">&nbsp;</td>
     <td width="74%">
-      <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/>
+      <input type="text" size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/>
     </td>
   </tr>
   <tr>
-    <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingPrefixCard}</div></td>
+    <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingPrefixCard}</td>
     <td width="5">&nbsp;</td>
     <td width="74%">
-      <select name="titleOnCard" class="selectBox">
+      <select name="titleOnCard">
         <option value="">${uiLabelMap.CommonSelectOne}</option>
         <option<#if ((creditCard.titleOnCard)?default("") == "${uiLabelMap.CommonTitleMr}")> selected</#if>>${uiLabelMap.CommonTitleMr}</option>
         <option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> selected</#if>>${uiLabelMap.CommonTitleMrs}</option>
@@ -46,31 +46,31 @@
     </td>
   </tr>
   <tr>
-    <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingFirstNameCard}</div></td>
+    <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingFirstNameCard}</td>
     <td width="5">&nbsp;</td>
     <td width="74%">
-      <input type="text" class="inputBox" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/>
+      <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/>
     <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td>
   </tr>
   <tr>
-    <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingMiddleNameCard}</div></td>
+    <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingMiddleNameCard}</td>
     <td width="5">&nbsp;</td>
     <td width="74%">
-      <input type="text" class="inputBox" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/>
+      <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/>
     </td>
   </tr>
   <tr>
-    <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingLastNameCard}</div></td>
+    <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingLastNameCard}</td>
     <td width="5">&nbsp;</td>
     <td width="74%">
-      <input type="text" class="inputBox" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/>
+      <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/>
     <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td>
   </tr>
   <tr>
-    <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingSuffixCard}</div></td>
+    <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingSuffixCard}</td>
     <td width="5">&nbsp;</td>
     <td width="74%">
-      <select name="suffixOnCard" class="selectBox">
+      <select name="suffixOnCard">
         <option value="">${uiLabelMap.CommonSelectOne}</option>
         <option<#if ((creditCard.suffixOnCard)?default("") == "Jr.")> selected</#if>>Jr.</option>
         <option<#if ((creditCard.suffixOnCard)?default("") == "Sr.")> selected</#if>>Sr.</option>
@@ -84,10 +84,10 @@
   </tr>
 
   <tr>
-    <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCardType}</div></td>
+    <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardType}</td>
     <td width="5">&nbsp;</td>
     <td width="74%">
-      <select name="cardType" class="selectBox">
+      <select name="cardType">
         <#if creditCard.cardType?exists>
           <option>${creditCard.cardType}</option>
           <option value="${creditCard.cardType}">---</option>
@@ -97,7 +97,7 @@
     <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td>
   </tr>
   <tr>
-    <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td>
+    <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardNumber}</td>
     <td width="5">&nbsp;</td>
     <td width="74%">
         <#if creditCard?has_content>
@@ -119,22 +119,22 @@
                 </#if>
                 <input type="text" class="required" size="20" maxlength="30" name="cardNumber" onfocus="javascript:this.value = '';" value="${cardNumberDisplay?if_exists}">
             <#else>
-                <input type="text" class="inputBox" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/>
+                <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/>
             </#if>
         <#else>
-            <input type="text" class="inputBox" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/>
+            <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/>
         </#if>
     <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td>
   </tr>
   <#--<tr>
-    <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCardSecurityCode}</div></td>
+    <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardSecurityCode}</td>
     <td width="5">&nbsp;</td>
     <td width="74%">
-        <input type="text" class="inputBox" size="5" maxlength="10" name="cardSecurityCode" value="${creditCard.cardSecurityCode?if_exists}">
+        <input type="text" size="5" maxlength="10" name="cardSecurityCode" value="${creditCard.cardSecurityCode?if_exists}">
     </td>
   </tr>-->
   <tr>
-    <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingExpirationDate}</div></td>
+    <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingExpirationDate}</td>
     <td width="5">&nbsp;</td>
     <td width="74%">
       <#assign expMonth = "">
@@ -146,7 +146,7 @@
           <#assign expYear = expDate.substring(expDate.indexOf("/")+1)>
         </#if>
       </#if>
-      <select name="expMonth" class="selectBox">
+      <select name="expMonth">
         <#if creditCard?has_content && expMonth?has_content>
           <#assign ccExprMonth = expMonth>
         <#else>
@@ -157,7 +157,7 @@
         </#if>
         ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
       </select>
-      <select name="expYear" class="selectBox">
+      <select name="expYear">
         <#if creditCard?has_content && expYear?has_content>
           <#assign ccExprYear = expYear>
         <#else>
@@ -171,10 +171,10 @@
     <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td>
   </tr>
   <tr>
-    <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+    <td width="26%" align="right" valign="middle">${uiLabelMap.CommonDescription}</td>
     <td width="5">&nbsp;</td>
     <td width="74%">
-      <input type="text" class="inputBox" size="20" maxlength="30" name="description" value="${paymentMethod.description?if_exists}"/>
+      <input type="text" size="20" maxlength="30" name="description" value="${paymentMethod.description?if_exists}"/>
     </td>
   </tr>
 

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=607742&r1=607741&r2=607742&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Mon Dec 31 07:46:39 2007
@@ -299,7 +299,7 @@
        <field name="description"><text size="30"/></field>
        <!--field name="overrideGlAccountId"><text size="10"/></field-->
        <field name="amount" title="${uiLabelMap.AccountingUnitPrice}"><text size="7"/></field>
-       <field name="total" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field>  <!-- this should not look like something you can modify, hence "tabletext" -->
+       <field name="total" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field>  <!-- this should not look like something you can modify, hence display -->
        <field name="uomId"><hidden/></field>
        <field name="taxableFlag"><hidden/></field>
        <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" ><submit button-type="text-link"/></field>

Modified: ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl?rev=607742&r1=607741&r2=607742&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl (original)
+++ ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl Mon Dec 31 07:46:39 2007
@@ -25,7 +25,7 @@
     </head>
     <body>
         <h1>${title}</h1>
-        <p class="tabletext">Hello ${(parameters.partyAndPerson.salutation)?if_exists} ${(parameters.partyAndPerson.personalTitle)?if_exists} ${(parameters.partyAndPerson.firstName)?if_exists} ${(parameters.partyAndPerson.middleName)?if_exists} ${(parameters.partyAndPerson.lastName)?if_exists} ${(parameters.partyAndPerson.suffix)?if_exists},</b></p>
-        <p class="tabletext">Your personal information has been updated successfully.</p>
+        <p>Hello ${(parameters.partyAndPerson.salutation)?if_exists} ${(parameters.partyAndPerson.personalTitle)?if_exists} ${(parameters.partyAndPerson.firstName)?if_exists} ${(parameters.partyAndPerson.middleName)?if_exists} ${(parameters.partyAndPerson.lastName)?if_exists} ${(parameters.partyAndPerson.suffix)?if_exists},</p>
+        <p>Your personal information has been updated successfully.</p>
     </body>
 </html>

Modified: ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl?rev=607742&r1=607741&r2=607742&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl (original)
+++ ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl Mon Dec 31 07:46:39 2007
@@ -25,7 +25,7 @@
     </head>
     <body>
         <h1>${title}</h1>
-        <p class="tabletext">Hello ${parameters.USER_TITLE?if_exists} ${parameters.USER_FIRST_NAME?if_exists} ${parameters.USER_MIDDLE_NAME?if_exists} ${parameters.USER_LAST_NAME?if_exists} ${parameters.USER_SUFFIX?if_exists},</p>
-        <p class="tabletext">Your account has been created.</p>
+        <p>Hello ${parameters.USER_TITLE?if_exists} ${parameters.USER_FIRST_NAME?if_exists} ${parameters.USER_MIDDLE_NAME?if_exists} ${parameters.USER_LAST_NAME?if_exists} ${parameters.USER_SUFFIX?if_exists},</p>
+        <p>Your account has been created.</p>
     </body>
 </html>

Modified: ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl?rev=607742&r1=607741&r2=607742&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl (original)
+++ ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl Mon Dec 31 07:46:39 2007
@@ -25,7 +25,7 @@
     </head>
     <body>
         <h1>${title}</h1>                
-        <p class="tabletext">Thank you for registering. Please click the link below to complete your registration.</p>
+        <p>Thank you for registering. Please click the link below to complete your registration.</p>
         <br><br>
         <a href="${baseUrl}/cmssite/cms/verifyEmailAddress?verifyHash=${parameters.verifyHash}">www.cmssite.com/cms/registration.html</a>
     </body>