[ofbiz-framework] branch trunk updated: Improved: Apply CSS Grid to Find Orders (OFBIZ-12116)

[jamesyong]

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 ba5536f  Improved: Apply CSS Grid to Find Orders (OFBIZ-12116)
ba5536f is described below

commit ba5536fe5735fcddc7eb8b515372cab932c0a913
Author: James Yong <jamesy...@apache.org>
AuthorDate: Sun Jan 3 11:13:13 2021 +0800

    Improved: Apply CSS Grid to Find Orders (OFBIZ-12116)
    
    Improve naming
---
 applications/order/template/order/FindOrders.ftl |  4 ++--
 themes/common-theme/webapp/common/css/info.css   | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/applications/order/template/order/FindOrders.ftl 
b/applications/order/template/order/FindOrders.ftl
index 21d9e10..24231f7 100644
--- a/applications/order/template/order/FindOrders.ftl
+++ b/applications/order/template/order/FindOrders.ftl
@@ -155,7 +155,7 @@ function paginateOrderList(viewSize, viewIndex, hideFields) 
{
     <br class="clear"/>
   </div>
   <#if parameters.hideFields?default("N") != "Y">
-      <div class="ofbiz-form">
+      <div class="ofbiz-form with-left-right-columns">
 
           <label for="orderId">${uiLabelMap.OrderOrderId}</label>
           <input id="orderId" type='text' name='orderId'/>
@@ -246,7 +246,7 @@ function paginateOrderList(viewSize, viewIndex, hideFields) 
{
           <input id='softIdentifier' type='text' name='softIdentifier' 
value='${requestParameters.softIdentifier!}'/>
 
           <label class="left-column">${uiLabelMap.CommonStatus}</label>
-          <div class="full-width-control">
+          <div class="full-span-field">
               <#list orderStatuses as orderStatus>
                   <label>
                       <input type="checkbox" name="orderStatusId" 
value="${orderStatus.statusId}" <#if currentStatuses?has_content && 
currentStatuses.contains(orderStatus.statusId)>checked</#if>/>
diff --git a/themes/common-theme/webapp/common/css/info.css 
b/themes/common-theme/webapp/common/css/info.css
index f791b3e..acde038 100644
--- a/themes/common-theme/webapp/common/css/info.css
+++ b/themes/common-theme/webapp/common/css/info.css
@@ -40,11 +40,13 @@ limitations under the License.
 /* used by ofbiz-form on CSS Grid Layout */
 .ofbiz-form {
     display: grid;
-    grid-template-columns: [col1-label] minmax(150px, auto) 1fr [col2-label] 
minmax(150px, auto) 1fr;
     grid-auto-flow: row;
     grid-gap: .4em;
     padding: 1em;
 }
+.with-left-right-columns {
+    grid-template-columns: [left-col-label] minmax(150px, auto) 1fr 
[right-col-label] minmax(150px, auto) 1fr;
+}
 .ofbiz-form label {
     text-align: right;
     padding: 0.4em;
@@ -55,10 +57,10 @@ limitations under the License.
 }
 .ofbiz-form > label.left-column,
 .ofbiz-form > fieldset.left-column  {
-    grid-column: col1-label;
+    grid-column: left-col-label;
 }
 .ofbiz-form > label.right-column {
-    grid-column: col2-label;
+    grid-column: right-col-label;
 }
 .ofbiz-form > input,
 .ofbiz-form > select,
@@ -67,7 +69,7 @@ limitations under the License.
     padding: .1em;
     border: 1px solid lightgray;
 }
-.ofbiz-form .full-width-control {
+.ofbiz-form .full-span-field {
     grid-column: 2 / span 3;
 }
 .ofbiz-form .full-width-center {