This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new f3a9f05 Improved: Remove Whitespaces before checkboxes (OFBIZ-10461)
f3a9f05 is described below
commit f3a9f05a30431f3aecb67edbc094d5e855ae9ac2
Author: Benjamin Jugl <benjamin.j...@ecomify.de>
AuthorDate: Mon Dec 6 09:43:42 2021 +0100
Improved: Remove Whitespaces before checkboxes (OFBIZ-10461)
---
.../order/template/order/AppendOrderItem.ftl | 2 +-
applications/order/template/order/OrderList.ftl | 41 +++++++++++++---------
framework/webtools/template/entity/CheckDb.ftl | 10 +++---
3 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/applications/order/template/order/AppendOrderItem.ftl
b/applications/order/template/order/AppendOrderItem.ftl
index 42abfc5..1f6bb15 100644
--- a/applications/order/template/order/AppendOrderItem.ftl
+++ b/applications/order/template/order/AppendOrderItem.ftl
@@ -69,7 +69,7 @@ under the License.
<td class="label">${uiLabelMap.OrderPrice}</td>
<td>
<input type="text" size="6" name="basePrice"
value="${requestParameters.price!}"/>
- <label><input type="checkbox" name="overridePrice"
value="Y"/> ${uiLabelMap.OrderOverridePrice}</label>
+ <label><input type="checkbox" name="overridePrice"
value="Y"/>${uiLabelMap.OrderOverridePrice}</label>
</td>
</tr>
<tr>
diff --git a/applications/order/template/order/OrderList.ftl
b/applications/order/template/order/OrderList.ftl
index 8ef7e5c..562f630 100644
--- a/applications/order/template/order/OrderList.ftl
+++ b/applications/order/template/order/OrderList.ftl
@@ -101,10 +101,12 @@ under the License.
<td align="right" class="label">${uiLabelMap.CommonType}</td>
<td nowrap="nowrap">
<div>
- <label><input type="checkbox" name="view_SALES_ORDER"
value="Y" <#if state.hasType('view_SALES_ORDER')>checked="checked"</#if>/>
- ${descr_SALES_ORDER}</label>
- <label><input type="checkbox" name="view_PURCHASE_ORDER"
value="Y" <#if state.hasType('view_PURCHASE_ORDER')>checked="checked"</#if>/>
- ${descr_PURCHASE_ORDER}</label>
+ <#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
+ <label><input type="checkbox" name="view_SALES_ORDER"
value="Y"
+ <#if
state.hasType('view_SALES_ORDER')>checked="checked"</#if>/>${descr_SALES_ORDER}</label>
+ <#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
+ <label><input type="checkbox" name="view_PURCHASE_ORDER"
value="Y"
+ <#if
state.hasType('view_PURCHASE_ORDER')>checked="checked"</#if>/>${descr_PURCHASE_ORDER}</label>
</div>
</td>
</tr>
@@ -113,13 +115,13 @@ under the License.
<td nowrap="nowrap">
<div>
<label>
+ <#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
<input type="checkbox" name="filterInventoryProblems"
value="Y"
- <#if
state.hasFilter('filterInventoryProblems')>checked="checked"</#if>/>
- ${uiLabelMap.OrderFilterInventoryProblems}</label>
+ <#if
state.hasFilter('filterInventoryProblems')>checked="checked"</#if>/>${uiLabelMap.OrderFilterInventoryProblems}</label>
<label>
+ <#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
<input type="checkbox" name="filterAuthProblems" value="Y"
- <#if
state.hasFilter('filterAuthProblems')>checked="checked"</#if>/>
- ${uiLabelMap.OrderFilterAuthProblems}</label>
+ <#if
state.hasFilter('filterAuthProblems')>checked="checked"</#if>/>${uiLabelMap.OrderFilterAuthProblems}</label>
</div>
</td>
</tr>
@@ -127,16 +129,21 @@ under the License.
<td align="right" class="label">${uiLabelMap.CommonFilter}
(${uiLabelMap.OrderFilterPOs})</td>
<td nowrap="nowrap">
<div>
+ <#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
<label>
- <input type="checkbox" name="filterPartiallyReceivedPOs"
value="Y"
- <#if
state.hasFilter('filterPartiallyReceivedPOs')>checked="checked"</#if>/>
- ${uiLabelMap.OrderFilterPartiallyReceivedPOs}</label>
- <label><input type="checkbox"
name="filterPOsOpenPastTheirETA" value="Y"
- <#if
state.hasFilter('filterPOsOpenPastTheirETA')>checked="checked"</#if>/>
- ${uiLabelMap.OrderFilterPOsOpenPastTheirETA}</label>
- <label><input type="checkbox"
name="filterPOsWithRejectedItems" value="Y"
- <#if
state.hasFilter('filterPOsWithRejectedItems')>checked="checked"</#if>/>
- ${uiLabelMap.OrderFilterPOsWithRejectedItems}</label>
+ <input type="checkbox"
name="filterPartiallyReceivedPOs" value="Y"
+ <#if
state.hasFilter('filterPartiallyReceivedPOs')>checked="checked"</#if>/>${uiLabelMap.OrderFilterPartiallyReceivedPOs}
+ </label>
+ <#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
+ <label>
+ <input type="checkbox"
name="filterPOsOpenPastTheirETA" value="Y"
+ <#if
state.hasFilter('filterPOsOpenPastTheirETA')>checked="checked"</#if>/>${uiLabelMap.OrderFilterPOsOpenPastTheirETA}
+ </label>
+ <#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
+ <label>
+ <input type="checkbox" name="filterPOsWithRejectedItems"
value="Y"
+ <#if
state.hasFilter('filterPOsWithRejectedItems')>checked="checked"</#if>/>${uiLabelMap.OrderFilterPOsWithRejectedItems}
+ </label>
</div>
</td>
</tr>
diff --git a/framework/webtools/template/entity/CheckDb.ftl
b/framework/webtools/template/entity/CheckDb.ftl
index 91cf8d3..01f04a8 100644
--- a/framework/webtools/template/entity/CheckDb.ftl
+++ b/framework/webtools/template/entity/CheckDb.ftl
@@ -37,11 +37,11 @@ under the License.
<td class="label">
</td>
<td>
- <label> <input type="checkbox" name="checkPks"
value="true" checked="checked"/> ${uiLabelMap.WebtoolsPks}</label>
- <label> <input type="checkbox" name="checkFks"
value="true"/> ${uiLabelMap.WebtoolsFks}</label>
- <label> <input type="checkbox" name="checkFkIdx"
value="true"/> ${uiLabelMap.WebtoolsFkIdx}</label>
- <label> <input type="checkbox" name="addMissing"
value="true"/> ${uiLabelMap.WebtoolsAddMissing}</label>
- <label> <input type="checkbox" name="repair"
value="true"/> ${uiLabelMap.WebtoolsRepairColumnSizes}</label>
+ <label> <input type="checkbox" name="checkPks"
value="true" checked="checked"/>${uiLabelMap.WebtoolsPks}</label>
+ <label> <input type="checkbox" name="checkFks"
value="true"/>${uiLabelMap.WebtoolsFks}</label>
+ <label> <input type="checkbox" name="checkFkIdx"
value="true"/>${uiLabelMap.WebtoolsFkIdx}</label>
+ <label> <input type="checkbox" name="addMissing"
value="true"/>${uiLabelMap.WebtoolsAddMissing}</label>
+ <label> <input type="checkbox" name="repair"
value="true"/>${uiLabelMap.WebtoolsRepairColumnSizes}</label>
</td>
</tr>
<tr>
