This is an automated email from the ASF dual-hosted git repository.
jamesyong 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 9d0e531 Improved: apply buttontext class for links inside screenlet
title bar (OFBIZ-12112)
9d0e531 is described below
commit 9d0e5313bcd236a7867e20d25b3737fea64d7df0
Author: James Yong <[email protected]>
AuthorDate: Sat Dec 26 20:25:47 2020 +0800
Improved: apply buttontext class for links inside screenlet title bar
(OFBIZ-12112)
For Order application
---
applications/order/template/entry/CheckInits.ftl | 8 ++++----
applications/order/template/order/FindOrders.ftl | 6 +++---
applications/order/template/order/ViewAllocationPlan.ftl | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/applications/order/template/entry/CheckInits.ftl
b/applications/order/template/entry/CheckInits.ftl
index 5317c70..0f96fe0 100644
--- a/applications/order/template/entry/CheckInits.ftl
+++ b/applications/order/template/entry/CheckInits.ftl
@@ -39,8 +39,8 @@ under the License.
<li class="h3">${uiLabelMap.OrderSalesOrder}<#if
shoppingCart??> ${uiLabelMap.OrderInProgress}</#if></li>
<div class="basic-nav">
<ul>
- <li><a
href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li>
- <li><a href="<@ofbizUrl
controlPath="/partymgr/control">findparty</@ofbizUrl>">${uiLabelMap.PartyFindParty}</a></li>
+ <li><a class="buttontext"
href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li>
+ <li><a class="buttontext" href="<@ofbizUrl
controlPath="/partymgr/control">findparty</@ofbizUrl>">${uiLabelMap.PartyFindParty}</a></li>
</ul>
</div>
</ul>
@@ -125,8 +125,8 @@ under the License.
<li class="h3">${uiLabelMap.OrderPurchaseOrder}<#if
shoppingCart??> ${uiLabelMap.OrderInProgress}</#if></li>
<div class="basic-nav">
<ul>
- <li><a
href="javascript:document.poentryform.submit();">${uiLabelMap.CommonContinue}</a></li>
- <li><a href="<@ofbizUrl
controlPath="/partymgr/control">findparty</@ofbizUrl>">${uiLabelMap.PartyFindParty}</a></li>
+ <li><a class="buttontext"
href="javascript:document.poentryform.submit();">${uiLabelMap.CommonContinue}</a></li>
+ <li><a class="buttontext" href="<@ofbizUrl
controlPath="/partymgr/control">findparty</@ofbizUrl>">${uiLabelMap.PartyFindParty}</a></li>
</ul>
</div>
</ul>
diff --git a/applications/order/template/order/FindOrders.ftl
b/applications/order/template/order/FindOrders.ftl
index d50e07c..2f7efbf 100644
--- a/applications/order/template/order/FindOrders.ftl
+++ b/applications/order/template/order/FindOrders.ftl
@@ -143,11 +143,11 @@ function paginateOrderList(viewSize, viewIndex,
hideFields) {
<div class="basic-nav">
<ul>
<#if "Y" == requestParameters.hideFields?default("N")>
- <li><a
href="javascript:document.lookupandhidefields${requestParameters.hideFields}.submit()">${uiLabelMap.CommonShowLookupFields}</a></li>
+ <li><a class="buttontext"
href="javascript:document.lookupandhidefields${requestParameters.hideFields}.submit()">${uiLabelMap.CommonShowLookupFields}</a></li>
<#else>
<#if orderList??><li><a
href="javascript:document.lookupandhidefields${requestParameters.hideFields?default("Y")}.submit()">${uiLabelMap.CommonHideFields}</a></li></#if>
- <li><a href="<@ofbizUrl
controlPath="/partymgr/control">findparty?externalLoginKey=${requestAttributes.externalLoginKey!}</@ofbizUrl>">${uiLabelMap.PartyLookupParty}</a></li>
- <li><a
href="javascript:lookupOrders(true);">${uiLabelMap.OrderLookupOrder}</a></li>
+ <li><a class="buttontext" href="<@ofbizUrl
controlPath="/partymgr/control">findparty?externalLoginKey=${requestAttributes.externalLoginKey!}</@ofbizUrl>">${uiLabelMap.PartyLookupParty}</a></li>
+ <li><a class="buttontext"
href="javascript:lookupOrders(true);">${uiLabelMap.OrderLookupOrder}</a></li>
</#if>
</ul>
</div>
diff --git a/applications/order/template/order/ViewAllocationPlan.ftl
b/applications/order/template/order/ViewAllocationPlan.ftl
index 3bb374a..1b9fc91 100644
--- a/applications/order/template/order/ViewAllocationPlan.ftl
+++ b/applications/order/template/order/ViewAllocationPlan.ftl
@@ -97,7 +97,7 @@ under the License.
<li class="h3">${uiLabelMap.OrderOverview}
[${uiLabelMap.CommonId}:${allocationPlanInfo.planId!}]</li>
<#if (allocationPlanInfo.statusId! == "ALLOC_PLAN_CREATED" ||
allocationPlanInfo.statusId! == "ALLOC_PLAN_APPROVED") &&
security.hasPermission("ALLOCPLAN_CANCEL", session)>
<li>
- <a
href="javascript:document.CancelPlan.submit()">${uiLabelMap.OrderCancelPlan}</a>
+ <a class="buttontext"
href="javascript:document.CancelPlan.submit()">${uiLabelMap.OrderCancelPlan}</a>
<form class="basic-form" name="CancelPlan" method="post"
action="<@ofbizUrl>changeAllocationPlanStatus/orderview</@ofbizUrl>">
<input type="hidden" name="planId"
value="${allocationPlanInfo.planId!}"/>
<input type="hidden" name="statusId"
value="ALLOC_PLAN_CANCELLED"/>
@@ -106,7 +106,7 @@ under the License.
</#if>
<#if (allocationPlanInfo.statusId! == "ALLOC_PLAN_CREATED") &&
security.hasPermission("ALLOCPLAN_APPROVE", session)>
<li>
- <a
href="javascript:document.ApprovePlan.submit()">${uiLabelMap.OrderApprovePlan}</a>
+ <a class="buttontext"
href="javascript:document.ApprovePlan.submit()">${uiLabelMap.OrderApprovePlan}</a>
<form class="basic-form" name="ApprovePlan" method="post"
action="<@ofbizUrl>changeAllocationPlanStatus/orderview</@ofbizUrl>">
<input type="hidden" name="planId"
value="${allocationPlanInfo.planId!}"/>
<input type="hidden" name="statusId"
value="ALLOC_PLAN_APPROVED"/>
