You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2020/12/27 07:30:28 UTC
[ofbiz-framework] branch trunk updated: Reverted: apply buttontext
class for links inside screenlet title bar (OFBIZ-12112)
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 816a2a6 Reverted: apply buttontext class for links inside screenlet title bar (OFBIZ-12112)
816a2a6 is described below
commit 816a2a6ac1ae410cb85087bb986a4e3c1dc4b9bc
Author: James Yong <ja...@apache.org>
AuthorDate: Sun Dec 27 15:29:03 2020 +0800
Reverted: apply buttontext class for links inside screenlet title bar (OFBIZ-12112)
Links not showing correctly for themes like Bluelight, Tomahawk.
This reverts commit 9d0e5313
---
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 0f96fe0..5317c70 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 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>
+ <li><a href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li>
+ <li><a 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 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>
+ <li><a href="javascript:document.poentryform.submit();">${uiLabelMap.CommonContinue}</a></li>
+ <li><a 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 2f7efbf..d50e07c 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 class="buttontext" href="javascript:document.lookupandhidefields${requestParameters.hideFields}.submit()">${uiLabelMap.CommonShowLookupFields}</a></li>
+ <li><a 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 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>
+ <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>
</#if>
</ul>
</div>
diff --git a/applications/order/template/order/ViewAllocationPlan.ftl b/applications/order/template/order/ViewAllocationPlan.ftl
index 1b9fc91..3bb374a 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 class="buttontext" href="javascript:document.CancelPlan.submit()">${uiLabelMap.OrderCancelPlan}</a>
+ <a href="javascript:document.CancelPlan.submit()">${uiLabelMap.OrderCancelPlan}</a>
<form class="basic-form" name="CancelPlan" method="post" action="<@o...@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 class="buttontext" href="javascript:document.ApprovePlan.submit()">${uiLabelMap.OrderApprovePlan}</a>
+ <a href="javascript:document.ApprovePlan.submit()">${uiLabelMap.OrderApprovePlan}</a>
<form class="basic-form" name="ApprovePlan" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="planId" value="${allocationPlanInfo.planId!}"/>
<input type="hidden" name="statusId" value="ALLOC_PLAN_APPROVED"/>