Author: diveshdutta
Date: Mon Jul 4 16:59:06 2016
New Revision: 1751345
URL: http://svn.apache.org/viewvc?rev=1751345&view=rev
Log:
[OFBIZ-7583] Facility: Checkbox and Radio buttons should get selected on
clicking upon their labels. Thanks Mohammad Kathawala for your patch
Modified:
ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl
ofbiz/trunk/applications/product/template/facility/PicklistOptions.ftl
ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl
ofbiz/trunk/applications/product/template/returns/ReceiveReturn.ftl
ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl
ofbiz/trunk/applications/product/template/shipment/EditShipmentRouteSegments.ftl
ofbiz/trunk/applications/product/template/shipment/PackOrder.ftl
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
Modified: ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl?rev=1751345&r1=1751344&r2=1751345&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl
(original)
+++ ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl Mon
Jul 4 16:59:06 2016
@@ -58,8 +58,8 @@ under the License.
<td>${uiLabelMap.ProductMoveQuantity}</td>
<td>${uiLabelMap.CommonConfirm}</td>
<td align="right">
- ${uiLabelMap.ProductSelectAll}
- <input type="checkbox" name="selectAll" value="Y"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'moveInfoId_tableRow_', 'selectAllForm');" />
+ <label>${uiLabelMap.ProductSelectAll}
+ <input type="checkbox" name="selectAll" value="Y"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'moveInfoId_tableRow_', 'selectAllForm');" /></label>
</td>
</tr>
<#if moveByOisgirInfoList?has_content ||
moveByPflInfoList?has_content>
Modified: ofbiz/trunk/applications/product/template/facility/PicklistOptions.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/facility/PicklistOptions.ftl?rev=1751345&r1=1751344&r2=1751345&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/facility/PicklistOptions.ftl
(original)
+++ ofbiz/trunk/applications/product/template/facility/PicklistOptions.ftl Mon
Jul 4 16:59:06 2016
@@ -28,12 +28,9 @@ under the License.
<input type="hidden" name="facilityId" value="${facilityId}"/>
<table class="basic-table" cellspacing='0'>
<tr>
- <td class='label'>${uiLabelMap.FacilityGroupByShippingMethod}</td>
- <td><input type="checkbox" name="groupByShippingMethod" value="Y" <#if
"${requestParameters.groupByShippingMethod!}" ==
"Y">checked="checked"</#if>/></td>
- <td class='label'>${uiLabelMap.FacilityGroupByWarehouseArea}</td>
- <td><input type="checkbox" name="groupByWarehouseArea" value="Y" <#if
"${requestParameters.groupByWarehouseArea!}" ==
"Y">checked="checked"</#if>/></td>
- <td class='label'>${uiLabelMap.FacilityGroupByNoOfOrderItems}</td>
- <td><input type="checkbox" name="groupByNoOfOrderItems" value="Y" <#if
"${requestParameters.groupByNoOfOrderItems!}" ==
"Y">checked="checked"</#if>/></td>
+ <td><label class='label'>${uiLabelMap.FacilityGroupByShippingMethod}
<input type="checkbox" name="groupByShippingMethod" value="Y" <#if
"${requestParameters.groupByShippingMethod!}" ==
"Y">checked="checked"</#if>/></label></td>
+ <td><label class='label'>${uiLabelMap.FacilityGroupByWarehouseArea}
<input type="checkbox" name="groupByWarehouseArea" value="Y" <#if
"${requestParameters.groupByWarehouseArea!}" ==
"Y">checked="checked"</#if>/></label></td>
+ <td><label class='label'>${uiLabelMap.FacilityGroupByNoOfOrderItems}
<input type="checkbox" name="groupByNoOfOrderItems" value="Y" <#if
"${requestParameters.groupByNoOfOrderItems!}" ==
"Y">checked="checked"</#if>/></label></td>
</tr>
<tr><td> </td></tr>
</table>
Modified:
ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl?rev=1751345&r1=1751344&r2=1751345&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl
(original)
+++ ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl
Mon Jul 4 16:59:06 2016
@@ -312,8 +312,7 @@ under the License.
<td>
<table class="basic-table" cellspacing="0">
<tr>
- <td width="5%" nowrap="nowrap"><input type="radio"
name="shipmentId" value="${shipment.shipmentId}" /></td>
- <td width="5%"
nowrap="nowrap">${shipment.shipmentId}</td>
+ <td nowrap="nowrap"><label><input type="radio"
name="shipmentId" value="${shipment.shipmentId}" />
${shipment.shipmentId}</label></td>
<td>${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</td>
<td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td>
<td>${(originFacility.facilityName)!}
[${shipment.originFacilityId!}]</td>
@@ -331,8 +330,7 @@ under the License.
<td>
<table class="basic-table" cellspacing="0">
<tr>
- <td width="5%" nowrap="nowrap"><input type="radio"
name="shipmentId" value="_NA_" /></td>
- <td width="5%"
nowrap="nowrap">${uiLabelMap.ProductNoSpecificShipment}</td>
+ <td nowrap="nowrap"><label><input type="radio"
name="shipmentId" value="_NA_" />
${uiLabelMap.ProductNoSpecificShipment}</label></td>
<td colspan="5"></td>
</tr>
</table>
@@ -369,13 +367,13 @@ under the License.
<h3>${uiLabelMap.ProductReceivePurchaseOrder}
#${purchaseOrder.orderId}</h3>
<#if shipment?has_content>
<h3>${uiLabelMap.ProductShipmentId}
#${shipment.shipmentId}</h3>
- <span>Set Shipment As Received</span>
- <input type="checkbox" name="forceShipmentReceived"
value="Y"/>
+ <label><span>Set Shipment As Received</span>
+ <input type="checkbox" name="forceShipmentReceived"
value="Y"/></label>
</#if>
</td>
<td align="right">
- ${uiLabelMap.CommonSelectAll}
- <input type="checkbox" name="selectAll" value="Y"
onclick="javascript:toggleAll(this, 'selectAllForm');"/>
+ <label>${uiLabelMap.CommonSelectAll}
+ <input type="checkbox" name="selectAll" value="Y"
onclick="javascript:toggleAll(this, 'selectAllForm');"/></label>
</td>
</tr>
<#list purchaseOrderItems as orderItem>
Modified: ofbiz/trunk/applications/product/template/returns/ReceiveReturn.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/returns/ReceiveReturn.ftl?rev=1751345&r1=1751344&r2=1751345&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/returns/ReceiveReturn.ftl
(original)
+++ ofbiz/trunk/applications/product/template/returns/ReceiveReturn.ftl Mon Jul
4 16:59:06 2016
@@ -77,8 +77,8 @@ under the License.
</h3>
</td>
<td align="right">
- ${uiLabelMap.ProductSelectAll}
- <input type="checkbox" name="selectAll" value="Y"
onclick="javascript:toggleAll(this, 'selectAllForm');" />
+ <label>${uiLabelMap.ProductSelectAll}
+ <input type="checkbox" name="selectAll" value="Y"
onclick="javascript:toggleAll(this, 'selectAllForm');" /></label>
</td>
</tr>
Modified:
ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl?rev=1751345&r1=1751344&r2=1751345&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl
(original)
+++ ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl
Mon Jul 4 16:59:06 2016
@@ -98,7 +98,7 @@ under the License.
<td>${uiLabelMap.ProductIssue}</td>
<td align="right">
<div>${uiLabelMap.CommonSubmit} ?</div>
- <div>${uiLabelMap.CommonAll}<input type="checkbox"
name="selectAll" value="${uiLabelMap.CommonY}"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'orderItemData_tableRow_', 'selectAllForm');" /></div>
+ <div><label>${uiLabelMap.CommonAll}<input type="checkbox"
name="selectAll" value="${uiLabelMap.CommonY}"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'orderItemData_tableRow_', 'selectAllForm');" /></label></div>
</td>
</tr>
<#assign alt_row = false>
Modified:
ofbiz/trunk/applications/product/template/shipment/EditShipmentRouteSegments.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/EditShipmentRouteSegments.ftl?rev=1751345&r1=1751344&r2=1751345&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/template/shipment/EditShipmentRouteSegments.ftl
(original)
+++
ofbiz/trunk/applications/product/template/shipment/EditShipmentRouteSegments.ftl
Mon Jul 4 16:59:06 2016
@@ -174,8 +174,8 @@ under the License.
<#if
!shipmentRouteSegment.carrierServiceStatusId?has_content ||
"SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId!>
<a
href="javascript:document.upsShipmentConfirm_${shipmentRouteSegmentData_index}.submit()"
class="buttontext">${uiLabelMap.ProductConfirmShipmentUps}</a>
<br />
- ${uiLabelMap.ProductShipmentUpsResidential}:
- <input type="checkbox" name="homeDeliveryType"
value="Y"
${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")}
/>
+ <label>${uiLabelMap.ProductShipmentUpsResidential}:
+ <input type="checkbox" name="homeDeliveryType"
value="Y"
${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")}
/></label>
<#elseif "SHRSCS_CONFIRMED" ==
shipmentRouteSegment.carrierServiceStatusId!>
<a
href="javascript:document.upsShipmentAccept_${shipmentRouteSegmentData_index}.submit()"
class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a>
<br />
Modified: ofbiz/trunk/applications/product/template/shipment/PackOrder.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/PackOrder.ftl?rev=1751345&r1=1751344&r2=1751345&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/shipment/PackOrder.ftl (original)
+++ ofbiz/trunk/applications/product/template/shipment/PackOrder.ftl Mon Jul 4
16:59:06 2016
@@ -80,7 +80,7 @@ under the License.
/
<input type="text" name="shipGroupSeqId" size="6"
maxlength="6" value="${shipGroupSeqId?default("00001")}"/>
</td>
- <td><span
class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox"
name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if> /></td>
+ <td><label><span
class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox"
name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if>
/></label></td>
<td> </td>
</tr>
<tr>
@@ -105,7 +105,7 @@ under the License.
<td width="25%">
<input type="text" name="picklistBinId" size="29"
maxlength="60" value="${picklistBinId!}"/>
</td>
- <td><span
class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox"
name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if> /></td>
+ <td><label><span
class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox"
name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if>
/></label></td>
<td> </td>
</tr>
<tr>
Modified:
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=1751345&r1=1751344&r2=1751345&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
(original)
+++
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
Mon Jul 4 16:59:06 2016
@@ -114,7 +114,7 @@ under the License.
<td>${uiLabelMap.CommonReceive}</td>
<td>${uiLabelMap.ProductInventoryItemType}</td>
<td colspan="2" align="right">
- <div>${uiLabelMap.CommonAll}<input
type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'orderItemData_tableRow_', 'selectAllForm');" /></div>
+ <div><label>${uiLabelMap.CommonAll}<input
type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}"
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this,
'orderItemData_tableRow_', 'selectAllForm');" /></label></div>
</td>
</#if>
</tr>
