[ofbiz-framework] branch trunk updated (91673f1 -> 3f01b0d)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] branch trunk updated (91673f1 -> 3f01b0d)

jleroux@apache.org
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


    from 91673f1  Fixed: Specified key was too long; max key length is 767 bytes for ProductPromoCodeEmail entity.(OFBIZ-5426) (#44)
     new 5767da5  Improved: style alignment properties
     new 3c5224c  Improved: unify style application
     new 1f1d25b  Improved: unify style application
     new 3f01b0d  Improved: unify style application

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../template/ar/payment/BatchPayments.ftl          |  4 +--
 applications/humanres/template/FindEmployee.ftl    |  2 +-
 .../party/template/party/EditShoppingList.ftl      |  2 +-
 applications/party/template/visit/ShowVisits.ftl   |  4 +--
 applications/party/template/visit/VisitDetail.ftl  |  4 +--
 themes/bluelight/webapp/bluelight/style.css        | 25 +++++++++++++------
 themes/flatgrey/webapp/flatgrey/style.css          | 29 +++++++++++++++-------
 themes/flatgrey/webapp/flatgrey/stylertl.css       | 25 +++++++++++++++----
 themes/rainbowstone/webapp/rainbowstone/style.css  | 28 +++++++++++++++------
 .../rainbowstone/webapp/rainbowstone/stylertl.css  | 24 +++++++++++++++---
 themes/tomahawk/webapp/tomahawk/css/style.css      | 25 +++++++++++++------
 themes/tomahawk/webapp/tomahawk/css/stylertl.css   | 24 +++++++++++++++---
 12 files changed, 142 insertions(+), 54 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] 01/04: Improved: style alignment properties

jleroux@apache.org
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 5767da5e15c1dad7a53b0898fae69594725bffda
Author: Pierre Smits <[hidden email]>
AuthorDate: Sun Mar 15 09:45:32 2020 +0100

    Improved: style alignment properties
   
    (OFBIZ-11458)
   
    Adding alignment properties (creating consistency across themes.
---
 themes/bluelight/webapp/bluelight/style.css        | 24 ++++++++++++++-----
 themes/flatgrey/webapp/flatgrey/style.css          | 28 ++++++++++++++++------
 themes/flatgrey/webapp/flatgrey/stylertl.css       | 24 ++++++++++++++++---
 themes/rainbowstone/webapp/rainbowstone/style.css  | 27 ++++++++++++++++-----
 .../rainbowstone/webapp/rainbowstone/stylertl.css  | 23 ++++++++++++++++--
 themes/tomahawk/webapp/tomahawk/css/style.css      | 24 ++++++++++++++-----
 themes/tomahawk/webapp/tomahawk/css/stylertl.css   | 23 ++++++++++++++++--
 7 files changed, 141 insertions(+), 32 deletions(-)

diff --git a/themes/bluelight/webapp/bluelight/style.css b/themes/bluelight/webapp/bluelight/style.css
index 4de925c..7fdccf6 100644
--- a/themes/bluelight/webapp/bluelight/style.css
+++ b/themes/bluelight/webapp/bluelight/style.css
@@ -904,22 +904,34 @@ in contained elements. */
 /* ================================== */
 /* ===== Used to align elements ===== */
 /* ================================== */
+.align-bottom {
+    vertical-align: bottom;;
+}
+.align-center {
+    text-align: center;
+}
 .align-float {
     float: right;
 }
-
+.align-justify {
+    text-align: justify;
+}
+.align-left {
+    text-align: left;
+}
+.align-middle {
+    vertical-align: bottom;;
+}
+.align-right {
+    text-align: right;
+}
 .align-text {
     text-align: right;
 }
-
 .align-top {
     vertical-align: top;
 }
 
-.centered {
-    text-align: center;
-}
-
 .page-container {
     background-color: #B8DFFC;
 }
diff --git a/themes/flatgrey/webapp/flatgrey/style.css b/themes/flatgrey/webapp/flatgrey/style.css
index a0dd301..0b502f8 100644
--- a/themes/flatgrey/webapp/flatgrey/style.css
+++ b/themes/flatgrey/webapp/flatgrey/style.css
@@ -223,22 +223,36 @@ th, th a {
     /*background: url("images/big-fade.png") repeat-x 0 90px transparent;*/
 }
 
+/* ================================== */
+/* ===== Used to align elements ===== */
+/* ================================== */
+.align-bottom {
+    vertical-align: bottom;;
+}
+.align-center {
+    text-align: center;
+}
 .align-float {
     float: right;
 }
-
+.align-justify {
+    text-align: justify;
+}
+.align-left {
+    text-align: left;
+}
+.align-middle {
+    vertical-align: bottom;;
+}
+.align-right {
+    text-align: right;
+}
 .align-text {
     text-align: right;
 }
-
 .align-top {
     vertical-align: top;
 }
-
-.centered {
-    text-align: center;
-}
-
 .page-title {
     color: #557996;
     margin-bottom: 0.5em;
diff --git a/themes/flatgrey/webapp/flatgrey/stylertl.css b/themes/flatgrey/webapp/flatgrey/stylertl.css
index 85796d3..2deded7 100644
--- a/themes/flatgrey/webapp/flatgrey/stylertl.css
+++ b/themes/flatgrey/webapp/flatgrey/stylertl.css
@@ -169,15 +169,33 @@ DIV.column-left-wide {
 /* ================================== */
 /* ===== Used to align elements ===== */
 /* ================================== */
-
+.align-bottom {
+    vertical-align: bottom;;
+}
+.align-center {
+    text-align: center;
+}
 .align-float {
     float: left;
 }
-
+.align-justify {
+    text-align: justify;
+}
+.align-left {
+    text-align: left;
+}
+.align-middle {
+    vertical-align: bottom;;
+}
+.align-right {
+    text-align: right;
+}
 .align-text {
     text-align: left;
 }
-
+.align-top {
+    vertical-align: top;
+}
 /* ==================================== */
 /* ===== Masthead (Header) Styles ===== */
 /* ==================================== */
diff --git a/themes/rainbowstone/webapp/rainbowstone/style.css b/themes/rainbowstone/webapp/rainbowstone/style.css
index a8ad664..09cc770 100644
--- a/themes/rainbowstone/webapp/rainbowstone/style.css
+++ b/themes/rainbowstone/webapp/rainbowstone/style.css
@@ -225,22 +225,37 @@ th, th a {
     /*background: url("images/big-fade.png") repeat-x 0 90px transparent;*/
 }
 
+/* ================================== */
+/* ===== Used to align elements ===== */
+/* ================================== */
+.align-bottom {
+    vertical-align: bottom;;
+}
+.align-center {
+    text-align: center;
+}
 .align-float {
     float: right;
 }
-
+.align-justify {
+    text-align: justify;
+}
+.align-left {
+    text-align: left;
+}
+.align-middle {
+    vertical-align: bottom;;
+}
+.align-right {
+    text-align: right;
+}
 .align-text {
     text-align: right;
 }
-
 .align-top {
     vertical-align: top;
 }
 
-.centered {
-    text-align: center;
-}
-
 .page-title {
     color: #557996;
     margin-bottom: 0.5em;
diff --git a/themes/rainbowstone/webapp/rainbowstone/stylertl.css b/themes/rainbowstone/webapp/rainbowstone/stylertl.css
index 85796d3..8d36745 100644
--- a/themes/rainbowstone/webapp/rainbowstone/stylertl.css
+++ b/themes/rainbowstone/webapp/rainbowstone/stylertl.css
@@ -169,14 +169,33 @@ DIV.column-left-wide {
 /* ================================== */
 /* ===== Used to align elements ===== */
 /* ================================== */
-
+.align-bottom {
+    vertical-align: bottom;;
+}
+.align-center {
+    text-align: center;
+}
 .align-float {
     float: left;
 }
-
+.align-justify {
+    text-align: justify;
+}
+.align-left {
+    text-align: left;
+}
+.align-middle {
+    vertical-align: bottom;;
+}
+.align-right {
+    text-align: right;
+}
 .align-text {
     text-align: left;
 }
+.align-top {
+    vertical-align: top;
+}
 
 /* ==================================== */
 /* ===== Masthead (Header) Styles ===== */
diff --git a/themes/tomahawk/webapp/tomahawk/css/style.css b/themes/tomahawk/webapp/tomahawk/css/style.css
index e5d6cd8..0b38c79 100644
--- a/themes/tomahawk/webapp/tomahawk/css/style.css
+++ b/themes/tomahawk/webapp/tomahawk/css/style.css
@@ -933,22 +933,34 @@ in contained elements. */
 /* ================================== */
 /* ===== Used to align elements ===== */
 /* ================================== */
+.align-bottom {
+    vertical-align: bottom;;
+}
+.align-center {
+    text-align: center;
+}
 .align-float {
     float: right;
 }
-
+.align-justify {
+    text-align: justify;
+}
+.align-left {
+    text-align: left;
+}
+.align-middle {
+    vertical-align: bottom;;
+}
+.align-right {
+    text-align: right;
+}
 .align-text {
     text-align: right;
 }
-
 .align-top {
     vertical-align: top;
 }
 
-.centered {
-    text-align: center;
-}
-
 /* ==================================== */
 /* ===== Masthead (Header) Styles ===== */
 /* ==================================== */
diff --git a/themes/tomahawk/webapp/tomahawk/css/stylertl.css b/themes/tomahawk/webapp/tomahawk/css/stylertl.css
index 5016d2d..82d773e 100644
--- a/themes/tomahawk/webapp/tomahawk/css/stylertl.css
+++ b/themes/tomahawk/webapp/tomahawk/css/stylertl.css
@@ -169,14 +169,33 @@ DIV.column-left-wide {
 /* ================================== */
 /* ===== Used to align elements ===== */
 /* ================================== */
-
+.align-bottom {
+    vertical-align: bottom;;
+}
+.align-center {
+    text-align: center;
+}
 .align-float {
     float: left;
 }
-
+.align-justify {
+    text-align: justify;
+}
+.align-left {
+    text-align: left;
+}
+.align-middle {
+    vertical-align: bottom;;
+}
+.align-right {
+    text-align: right;
+}
 .align-text {
     text-align: left;
 }
+.align-top {
+    vertical-align: top;
+}
 
 /* ==================================== */
 /* ===== Masthead (Header) Styles ===== */

Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] 02/04: Improved: unify style application

jleroux@apache.org
In reply to this post by jleroux@apache.org
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 3c5224c35157d6f94e0eb60844b5304876e66f19
Author: Pierre Smits <[hidden email]>
AuthorDate: Sun Mar 15 10:01:23 2020 +0100

    Improved: unify style application
   
    (OFBIZ-11458)
   
    replace 'align-float' with 'align-text'
---
 applications/accounting/template/ar/payment/BatchPayments.ftl | 4 ++--
 applications/party/template/visit/ShowVisits.ftl              | 4 ++--
 applications/party/template/visit/VisitDetail.ftl             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/applications/accounting/template/ar/payment/BatchPayments.ftl b/applications/accounting/template/ar/payment/BatchPayments.ftl
index 17cb591..fe40363 100644
--- a/applications/accounting/template/ar/payment/BatchPayments.ftl
+++ b/applications/accounting/template/ar/payment/BatchPayments.ftl
@@ -128,7 +128,7 @@ function setServiceName(selection) {
                     <span class="label">${uiLabelMap.AccountingRunningTotal} :</span>
                     <span class="label" id="showPaymentRunningTotal"></span>
                 </div>
-                <div class="align-float">
+                <div class="align-text">
                     <select name="serviceName" id="serviceName" onchange="javascript:setServiceName(this);">
                         <option value="">${uiLabelMap.AccountingSelectAction}</option>
                         <option value="<@ofbizUrl>createPaymentBatch</@ofbizUrl>" id="processBatchPayment">${uiLabelMap.AccountingCreateBatch}</option>
@@ -154,7 +154,7 @@ function setServiceName(selection) {
                     <input type="hidden" name='thruDate' value="${thruDate!}" />
                 </div>
                 </div>
-                <div id="createPaymentBatch" style="display: none;" class="align-float">
+                <div id="createPaymentBatch" style="display: none;" class="text">
                     <label for="paymentGroupName">${uiLabelMap.AccountingPaymentGroupName}</label>
                     <input type="text" size='25' id="paymentGroupName" name='paymentGroupName' />
                     <#if finAccounts?has_content>
diff --git a/applications/party/template/visit/ShowVisits.ftl b/applications/party/template/visit/ShowVisits.ftl
index 4e27e01..946b152 100644
--- a/applications/party/template/visit/ShowVisits.ftl
+++ b/applications/party/template/visit/ShowVisits.ftl
@@ -35,7 +35,7 @@ under the License.
   </div>
   <div class="screenlet-body">
       <br />
-        <div class="align-float">
+        <div class="align-text">
             <span class="label">
             <#if (visitSize > 0)>
                 <#if (viewIndex > 1)>
@@ -79,7 +79,7 @@ under the License.
         </#list>
       </table>
       <br />
-      <div class="align-float">
+      <div class="align-text">
           <span class="label">
           <#if (visitSize > 0)>
               <#if (viewIndex > 1)>
diff --git a/applications/party/template/visit/VisitDetail.ftl b/applications/party/template/visit/VisitDetail.ftl
index 9a516a1..6a5cbc7 100644
--- a/applications/party/template/visit/VisitDetail.ftl
+++ b/applications/party/template/visit/VisitDetail.ftl
@@ -95,7 +95,7 @@ under the License.
   </div>
   <div class="screenlet-body">
       <#if serverHits?has_content>
-        <div class="align-float">
+        <div class="align-text">
           <span class="label">
             <#if 0 < viewIndex>
               <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&amp;VIEW_SIZE=${viewSize}&amp;VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> |
@@ -151,7 +151,7 @@ under the License.
         </#if>
       </table>
       <#if serverHits?has_content>
-        <div class="align-float">
+        <div class="align-text">
           <span class="label">
             <#if 0 < viewIndex>
               <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&amp;VIEW_SIZE=${viewSize}&amp;VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> |

Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] 03/04: Improved: unify style application

jleroux@apache.org
In reply to this post by jleroux@apache.org
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 1f1d25b39ff8a4f129d00d89b41cd3745d9990d0
Author: Pierre Smits <[hidden email]>
AuthorDate: Sun Mar 15 10:03:14 2020 +0100

    Improved: unify style application
   
    (OFBIZ-11458)
   
    replace 'align-float' with 'align-text'
---
 applications/humanres/template/FindEmployee.ftl        | 2 +-
 applications/party/template/party/EditShoppingList.ftl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/humanres/template/FindEmployee.ftl b/applications/humanres/template/FindEmployee.ftl
index 3d47ef3..62581fd 100644
--- a/applications/humanres/template/FindEmployee.ftl
+++ b/applications/humanres/template/FindEmployee.ftl
@@ -213,7 +213,7 @@ under the License.
                     <td>${partyRow.postalCode!}</td>
                 </#if>
                 <td><#if partyType.description??>${partyType.get("description", locale)}<#else>???</#if></td>
-                <td class="button-col align-float">
+                <td class="button-col align-text">
                     <a href="<@ofbizUrl>EmployeeProfile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a>
                 </td>
             </tr>
diff --git a/applications/party/template/party/EditShoppingList.ftl b/applications/party/template/party/EditShoppingList.ftl
index 04efafe..fb98a23 100644
--- a/applications/party/template/party/EditShoppingList.ftl
+++ b/applications/party/template/party/EditShoppingList.ftl
@@ -155,7 +155,7 @@ under the License.
         <#assign childShoppingList = childShoppingListData.childShoppingList>
         <tr>
           <td class="button-col"><a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>">${childShoppingList.listName?default(childShoppingList.shoppingListId)}</a></li>
-          <td class="button-col align-float">
+          <td class="button-col align-text">
             <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>">${uiLabelMap.PartyGotoList}</a>
             <a href="<@ofbizUrl>addListToCart?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>">${uiLabelMap.PartyAddListToCart}</a>
           </td>

Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] 04/04: Improved: unify style application

jleroux@apache.org
In reply to this post by jleroux@apache.org
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 3f01b0d422576dadfd68048d5cdc35b3b923715f
Author: Pierre Smits <[hidden email]>
AuthorDate: Sun Mar 15 10:05:03 2020 +0100

    Improved: unify style application
   
    (OFBIZ-11458)
   
    remove unused property 'align-float'
---
 themes/bluelight/webapp/bluelight/style.css          | 3 ---
 themes/flatgrey/webapp/flatgrey/style.css            | 3 ---
 themes/flatgrey/webapp/flatgrey/stylertl.css         | 3 ---
 themes/rainbowstone/webapp/rainbowstone/style.css    | 3 ---
 themes/rainbowstone/webapp/rainbowstone/stylertl.css | 3 ---
 themes/tomahawk/webapp/tomahawk/css/style.css        | 3 ---
 themes/tomahawk/webapp/tomahawk/css/stylertl.css     | 3 ---
 7 files changed, 21 deletions(-)

diff --git a/themes/bluelight/webapp/bluelight/style.css b/themes/bluelight/webapp/bluelight/style.css
index 7fdccf6..39e4af5 100644
--- a/themes/bluelight/webapp/bluelight/style.css
+++ b/themes/bluelight/webapp/bluelight/style.css
@@ -910,9 +910,6 @@ in contained elements. */
 .align-center {
     text-align: center;
 }
-.align-float {
-    float: right;
-}
 .align-justify {
     text-align: justify;
 }
diff --git a/themes/flatgrey/webapp/flatgrey/style.css b/themes/flatgrey/webapp/flatgrey/style.css
index 0b502f8..e79a5ec 100644
--- a/themes/flatgrey/webapp/flatgrey/style.css
+++ b/themes/flatgrey/webapp/flatgrey/style.css
@@ -232,9 +232,6 @@ th, th a {
 .align-center {
     text-align: center;
 }
-.align-float {
-    float: right;
-}
 .align-justify {
     text-align: justify;
 }
diff --git a/themes/flatgrey/webapp/flatgrey/stylertl.css b/themes/flatgrey/webapp/flatgrey/stylertl.css
index 2deded7..4d4acfd 100644
--- a/themes/flatgrey/webapp/flatgrey/stylertl.css
+++ b/themes/flatgrey/webapp/flatgrey/stylertl.css
@@ -175,9 +175,6 @@ DIV.column-left-wide {
 .align-center {
     text-align: center;
 }
-.align-float {
-    float: left;
-}
 .align-justify {
     text-align: justify;
 }
diff --git a/themes/rainbowstone/webapp/rainbowstone/style.css b/themes/rainbowstone/webapp/rainbowstone/style.css
index 09cc770..0d30b26 100644
--- a/themes/rainbowstone/webapp/rainbowstone/style.css
+++ b/themes/rainbowstone/webapp/rainbowstone/style.css
@@ -234,9 +234,6 @@ th, th a {
 .align-center {
     text-align: center;
 }
-.align-float {
-    float: right;
-}
 .align-justify {
     text-align: justify;
 }
diff --git a/themes/rainbowstone/webapp/rainbowstone/stylertl.css b/themes/rainbowstone/webapp/rainbowstone/stylertl.css
index 8d36745..dc31732 100644
--- a/themes/rainbowstone/webapp/rainbowstone/stylertl.css
+++ b/themes/rainbowstone/webapp/rainbowstone/stylertl.css
@@ -175,9 +175,6 @@ DIV.column-left-wide {
 .align-center {
     text-align: center;
 }
-.align-float {
-    float: left;
-}
 .align-justify {
     text-align: justify;
 }
diff --git a/themes/tomahawk/webapp/tomahawk/css/style.css b/themes/tomahawk/webapp/tomahawk/css/style.css
index 0b38c79..4118020 100644
--- a/themes/tomahawk/webapp/tomahawk/css/style.css
+++ b/themes/tomahawk/webapp/tomahawk/css/style.css
@@ -939,9 +939,6 @@ in contained elements. */
 .align-center {
     text-align: center;
 }
-.align-float {
-    float: right;
-}
 .align-justify {
     text-align: justify;
 }
diff --git a/themes/tomahawk/webapp/tomahawk/css/stylertl.css b/themes/tomahawk/webapp/tomahawk/css/stylertl.css
index 82d773e..df77ad3 100644
--- a/themes/tomahawk/webapp/tomahawk/css/stylertl.css
+++ b/themes/tomahawk/webapp/tomahawk/css/stylertl.css
@@ -175,9 +175,6 @@ DIV.column-left-wide {
 .align-center {
     text-align: center;
 }
-.align-float {
-    float: left;
-}
 .align-justify {
     text-align: justify;
 }