svn commit: r929243 - in /ofbiz/trunk/specialpurpose/webpos/webapp/webpos: buttons/Main.ftl cart/ShowCart.ftl includes/Header.ftl payment/ClearPayment.ftl search/SearchProducts.ftl

[buscob]

Author: buscob
Date: Tue Mar 30 20:09:19 2010
New Revision: 929243

URL: http://svn.apache.org/viewvc?rev=929243&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3619 - XHTML validation errors (specialpurpose_webpos)
XHTML validation errors
- Unclosed INPUT
- attributes without values (nowrap, checked, selected)
- Unencoded ampersands in urls.
- Duplicated DOCTYPE definition

Modified:
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Main.ftl
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Main.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Main.ftl?rev=929243&r1=929242&r2=929243&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Main.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/buttons/Main.ftl Tue Mar 30 
20:09:19 2010
@@ -73,40 +73,40 @@ under the License.
     </tr>
     <tr>
         <td>
-            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-1001&quantity=1</@ofbizUrl>" 
class="posButton">NAN GIZMO</a>
+            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-1001&amp;quantity=1</@ofbizUrl>" 
class="posButton">NAN GIZMO</a>
         </td>
         <td>
-            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-5005&quantity=1</@ofbizUrl>" 
class="posButton">PURPLE GIZMO</a>
+            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-5005&amp;quantity=1</@ofbizUrl>" 
class="posButton">PURPLE GIZMO</a>
         </td>
         <td>
-            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-2644&quantity=1</@ofbizUrl>" 
class="posButton">ROUND GIZMO</a>
+            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-2644&amp;quantity=1</@ofbizUrl>" 
class="posButton">ROUND GIZMO</a>
         </td>
     </tr>
     <tr>
         <td>
-            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-2002&quantity=1</@ofbizUrl>" 
class="posButton">SQUARE GIZMO</a>
+            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-2002&amp;quantity=1</@ofbizUrl>" 
class="posButton">SQUARE GIZMO</a>
         </td>
         <td>
-            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-7000&quantity=1</@ofbizUrl>" 
class="posButton">MASSIVE GIZMO</a>
+            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-7000&amp;quantity=1</@ofbizUrl>" 
class="posButton">MASSIVE GIZMO</a>
         </td>
         <td>
-            <a 
href="<@ofbizUrl>AddItem?add_product_id=WG-5569&quantity=1</@ofbizUrl>" 
class="posButton">TINY WIDGET</a>
+            <a 
href="<@ofbizUrl>AddItem?add_product_id=WG-5569&amp;quantity=1</@ofbizUrl>" 
class="posButton">TINY WIDGET</a>
         </td>
     </tr>
     <tr>
         <td>
-            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-1004&quantity=1</@ofbizUrl>" 
class="posButton">RAINBOW GIZMO</a>
+            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-1004&amp;quantity=1</@ofbizUrl>" 
class="posButton">RAINBOW GIZMO</a>
         </td>
         <td>
-            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-1005&quantity=1</@ofbizUrl>" 
class="posButton">NIT GIZMO</a>
+            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-1005&amp;quantity=1</@ofbizUrl>" 
class="posButton">NIT GIZMO</a>
         </td>
         <td>
-            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-8544&quantity=1</@ofbizUrl>" 
class="posButton">BIG GIZMO</a>
+            <a 
href="<@ofbizUrl>AddItem?add_product_id=GZ-8544&amp;quantity=1</@ofbizUrl>" 
class="posButton">BIG GIZMO</a>
         </td>
     </tr>
     <tr>
         <td>
-            <a 
href="<@ofbizUrl>AddItem?add_product_id=WG-1111&quantity=1</@ofbizUrl>" 
class="posButton">MICRO WIDGET</a>
+            <a 
href="<@ofbizUrl>AddItem?add_product_id=WG-1111&amp;quantity=1</@ofbizUrl>" 
class="posButton">MICRO WIDGET</a>
         </td>
         <td>
             &nbsp;

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl?rev=929243&r1=929242&r2=929243&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl Tue Mar 
30 20:09:19 2010
@@ -58,18 +58,18 @@ under the License.
 <div class="pos-cart-scroll">
     <table class="basic-table" cellspacing="0">
         <tr class="header-row">
-            <td nowrap>&nbsp;</td>
-            <td nowrap><b>${uiLabelMap.OrderProduct}</b></td>
-            <td nowrap>&nbsp;</td>
-            <td nowrap align="center"><b>${uiLabelMap.CommonQuantity}</b></td>
-            <td nowrap align="right"><b>${uiLabelMap.WebPosUnitPrice}</b></td>
-            <td nowrap 
align="right"><b>${uiLabelMap.WebPosAdjustments}</b></td>
-            <td nowrap align="right"><b>${uiLabelMap.WebPosItemTotal}</b></td>
-            <td nowrap align="center"><input type="checkbox" name="selectAll" 
value="0" onclick="javascript:toggleAll(this);"></td>
+            <td nowrap="nowrap">&nbsp;</td>
+            <td nowrap="nowrap"><b>${uiLabelMap.OrderProduct}</b></td>
+            <td nowrap="nowrap">&nbsp;</td>
+            <td nowrap="nowrap" 
align="center"><b>${uiLabelMap.CommonQuantity}</b></td>
+            <td nowrap="nowrap" 
align="right"><b>${uiLabelMap.WebPosUnitPrice}</b></td>
+            <td nowrap="nowrap" 
align="right"><b>${uiLabelMap.WebPosAdjustments}</b></td>
+            <td nowrap="nowrap" 
align="right"><b>${uiLabelMap.WebPosItemTotal}</b></td>
+            <td nowrap="nowrap" align="center"><input type="checkbox" 
name="selectAll" value="0" onclick="javascript:toggleAll(this);" /></td>
         </tr>
         <#if (shoppingCartSize > 0)>
             <form method="post" action="<@ofbizUrl>ModifyCart</@ofbizUrl>" 
name="cartform">
-              <input type="hidden" name="removeSelected" value="false">
+              <input type="hidden" name="removeSelected" value="false" />
                 <#assign itemsFromList = false>
                 <#-- set initial row color -->
                 <#assign alt_row = false>
@@ -104,18 +104,18 @@ under the License.
                           </#if>
                         </div>
                     </td>
-                    <td nowrap align="right">
+                    <td nowrap="nowrap" align="right">
                         &nbsp;
                     </td>
-                    <td nowrap align="center">
+                    <td nowrap="nowrap" align="center">
                       <div>
-                        <input size="6" type="text" 
name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}">
+                        <input size="6" type="text" 
name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}" 
/>
                       </div>
                     </td>
-                    <td nowrap align="right"><div><@ofbizCurrency 
amount=cartLine.getDisplayPrice() 
isoCode=shoppingCart.getCurrency()/></div></td>
-                    <td nowrap align="right"><div><@ofbizCurrency 
amount=cartLine.getOtherAdjustments() 
isoCode=shoppingCart.getCurrency()/></div></td>
-                    <td nowrap align="right"><div><@ofbizCurrency 
amount=cartLine.getDisplayItemSubTotal() 
isoCode=shoppingCart.getCurrency()/></div></td>
-                    <td nowrap align="center"><div><#if 
!cartLine.getIsPromo()><input type="checkbox" name="selectedItem" 
value="${cartLineIndex}" 
onclick="javascript:checkToggle(this);"><#else>&nbsp;</#if></div></td>
+                    <td nowrap="nowrap" align="right"><div><@ofbizCurrency 
amount=cartLine.getDisplayPrice() 
isoCode=shoppingCart.getCurrency()/></div></td>
+                    <td nowrap="nowrap" align="right"><div><@ofbizCurrency 
amount=cartLine.getOtherAdjustments() 
isoCode=shoppingCart.getCurrency()/></div></td>
+                    <td nowrap="nowrap" align="right"><div><@ofbizCurrency 
amount=cartLine.getDisplayItemSubTotal() 
isoCode=shoppingCart.getCurrency()/></div></td>
+                    <td nowrap="nowrap" align="center"><div><#if 
!cartLine.getIsPromo()><input type="checkbox" name="selectedItem" 
value="${cartLineIndex}" onclick="javascript:checkToggle(this);" 
/><#else>&nbsp;</#if></div></td>
                   </tr>
                   <#-- toggle the row color -->
                   <#assign alt_row = !alt_row>

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl?rev=929243&r1=929242&r2=929243&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl 
(original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl Tue Mar 
30 20:09:19 2010
@@ -16,7 +16,7 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<#-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> -->
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <#-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> -->
 <head>

Modified: 
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl?rev=929243&r1=929242&r2=929243&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl 
(original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl 
Tue Mar 30 20:09:19 2010
@@ -28,28 +28,28 @@ under the License.
       <tr>
         <td><b>${(paymentCash.get("description", locale))?if_exists}</b></td>
         <td align="right"><@ofbizCurrency amount=cashAmount 
isoCode=shoppingCart.getCurrency()/></td>
-        <td align="center"><input type="checkbox" name="clearCash" value="Y" 
checked/></td>
+        <td align="center"><input type="checkbox" name="clearCash" value="Y" 
checked="checked" /></td>
       </tr>
       </#if>
       <#if (checkAmount?default(0) > 0.00)>
       <tr>
         <td><b>${(paymentCheck.get("description", locale))?if_exists}</b></td>
         <td align="right"><@ofbizCurrency amount=checkAmount 
isoCode=shoppingCart.getCurrency()/></td>
-        <td align="center"><input type="checkbox" name="clearCheck" value="Y" 
checked/></td>
+        <td align="center"><input type="checkbox" name="clearCheck" value="Y" 
checked="checked" /></td>
       </tr>
       </#if>
       <#if (giftAmount?default(0) > 0.00)>
       <tr>
         <td><b>${(paymentGift.get("description", locale))?if_exists}</b></td>
         <td align="right"><@ofbizCurrency amount=giftAmount 
isoCode=shoppingCart.getCurrency()/></td>
-        <td align="center"><input type="checkbox" name="clearGift" value="Y" 
checked/></td>
+        <td align="center"><input type="checkbox" name="clearGift" value="Y" 
checked="checked" /></td>
       </tr>
       </#if>
       <#if (creditAmount?default(0) > 0.00)>
       <tr>
         <td><b>${(paymentCredit.get("description", locale))?if_exists}</b></td>
         <td align="right"><@ofbizCurrency amount=creditAmount 
isoCode=shoppingCart.getCurrency()/></td>
-        <td align="center"><input type="checkbox" name="clearCredit" value="Y" 
checked/></td>
+        <td align="center"><input type="checkbox" name="clearCredit" value="Y" 
checked="checked" /></td>
       </tr>
       </#if>
       <tr>

Modified: 
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl?rev=929243&r1=929242&r2=929243&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl 
(original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl 
Tue Mar 30 20:09:19 2010
@@ -19,19 +19,19 @@ under the License.
 
 <form name="SearchProducts" method="post" 
action="<@ofbizUrl>AddItem</@ofbizUrl>">
     <div>
-        <input type="hidden" id="quantity" name="quantity" value="1">
-        <input type="hidden" id="add_product_id" name="add_product_id" 
value="${parameters.add_product_id?if_exists}">
+        <input type="hidden" id="quantity" name="quantity" value="1" />
+        <input type="hidden" id="add_product_id" name="add_product_id" 
value="${parameters.add_product_id?if_exists}" />
         <label 
for="productGoodIdentification"><b>&nbsp;${uiLabelMap.ProductGoodIdentification}</b></label>
-        <input type="text" id="productGoodIdentification" 
name="productGoodIdentification" size="40" maxlength="100">
+        <input type="text" id="productGoodIdentification" 
name="productGoodIdentification" size="40" maxlength="100" />
         <div id="productsIdent" class="autocomplete" 
style="display:none"></div>
-        <input type="submit" id="submitButton" name="submitButton" 
value="${uiLabelMap.OrderAddToCart}" 
onclick="ajaxSubmitFormUpdateAreas('SearchProducts', 'CartScreen, 
webpos/control/ShowCart,')">
+        <input type="submit" id="submitButton" name="submitButton" 
value="${uiLabelMap.OrderAddToCart}" 
onclick="ajaxSubmitFormUpdateAreas('SearchProducts', 'CartScreen, 
webpos/control/ShowCart,')" />
         <br />
         <label for="searchBy"><b>&nbsp;${uiLabelMap.WebPosSearchBy}</b></label>
         <select id="searchBy" name="searchBy">
-          <option value="productName" 
selected>${uiLabelMap.ProductProductName}</option>
+          <option value="productName" 
selected="selected">${uiLabelMap.ProductProductName}</option>
           <option 
value="productDescription">${uiLabelMap.ProductProductDescription}</option>
         </select>
-        <input type="text" id="productToSearch" name="productToSearch" 
size="40" maxlength="100">
+        <input type="text" id="productToSearch" name="productToSearch" 
size="40" maxlength="100"/>
         <div id="products" class="autocomplete" style="display:none"></div>
     </div>
 </form>