From 45852245a1c829602983ecb280706ec60435d419 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Tue, 16 Apr 2019 15:54:55 +0200
Subject: [PATCH] Artificial type adjustments

---
 debian/changelog                 |  2 +-
 forms/ecomerce/catalog/style.css | 51 ++++++++++++-----------------
 forms/ecomerce/catalog/ui.xml    | 55 +++++++++++++++-----------------
 package.json                     |  2 +-
 4 files changed, 49 insertions(+), 61 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a146ac90..b5c4bf83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.406.40) stable; urgency=low
+hedera-web (1.406.41) stable; urgency=low
 
   * Initial Release.
 
diff --git a/forms/ecomerce/catalog/style.css b/forms/ecomerce/catalog/style.css
index 7ca2f282..0f8307f3 100644
--- a/forms/ecomerce/catalog/style.css
+++ b/forms/ecomerce/catalog/style.css
@@ -157,7 +157,7 @@
 .item-info > h2
 {
 	padding: 0;
-	padding-bottom: .15em;
+	margin-bottom: .15em;
 	font-weight: normal;
 	font-size: 1em;
 	text-overflow: ellipsis;
@@ -178,7 +178,7 @@
 {
 	text-transform: uppercase;
 	padding: 0;
-	padding-bottom: .2em;
+	margin-bottom: .2em;
 	font-size: .9em;
 }
 .item-info > .htk-button
@@ -215,6 +215,7 @@
 }
 .tags td:first-child {
 	color: #999;
+	padding-right: .5em;
 }
 
 /* List view */
@@ -270,25 +271,11 @@
 {
 	float: right;
 }
-.list-view .item-info .extra
-{
-	position: absolute;
-	bottom: 0;
-	width: 100%;
-	margin-top: .3em;
-}
 .list-view .item-info .available-price
 {
+	clear: both;
 	float: right;
-	right: .3em;
-}
-.list-view .item-info .tags
-{
-	display: block;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	overflow: hidden;
-	margin-top: .3em;
+	padding-top: 1.2em;
 }
 .list-view .item-info .tags
 {
@@ -304,7 +291,7 @@
 .list-view .item-info .tags td
 {
 	display: inline-block;
-	padding-right: .5em
+	padding-right: .5em;
 }
 .list-view .item-info .tags td:first-child
 {
@@ -368,11 +355,6 @@
 	max-width: 4em;
 	vertical-align: bottom;
 }
-.grid-view .item-info .tags
-{
-	position: absolute;
-	top: 6.6em;
-}
 .grid-view .item-info .tags td {
 	overflow: hidden;
 	white-space: nowrap;
@@ -381,12 +363,6 @@
 	width: 6em;
 	line-height: 1.1em;
 }
-.grid-view .item-info .tags td:last-child {
-	padding-left: .5em;
-}
-.grid-view .item-info .tags td:first-child {
-	color: #999;
-}
 
 /* Card */
 
@@ -429,6 +405,21 @@
 {
 	height: 3em;
 }
+.item-card .lots-grid .cell-spin
+{
+	max-width: initial;
+	width: 3em;
+}
+.item-card .lots-grid .cell-text
+{
+	max-width: initial;
+	width: auto;
+}
+.item-card .lots-grid .cell-button
+{
+	max-width: initial;
+	width: 1em;
+}
 .item-card .footer
 {
 	text-align: center;
diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml
index 1a615264..0e2bbb46 100644
--- a/forms/ecomerce/catalog/ui.xml
+++ b/forms/ecomerce/catalog/ui.xml
@@ -122,39 +122,37 @@
 					icon="add"
 					on-click="onAddItemClick"
 					class="add-button"/>
+				<div class="available-price">
+					<span class="available">
+						<htk-text form="item" column="available"/>
+					</span> 
+					<span class="from">
+						<t>from</t>
+					</span> 
+					<span class="price">
+						<htk-text form="item" column="price" format="%.2d€"/>
+					</span>
+				</div>
 				<h2>
 					<htk-text form="item" column="item"/>
 				</h2>
 				<p class="sub-name">
 					<htk-text form="item" column="subName"/>
 				</p>
-				<div class="extra">
-					<div class="available-price">
-						<span class="available">
-							<htk-text form="item" column="available"/>
-						</span> 
-						<span class="from">
-							<t>from</t>
-						</span> 
-						<span class="price">
-							<htk-text form="item" column="price" format="%.2d€"/>
-						</span>
-					</div>
-					<table class="tags">
-						<tr>
-							<td><htk-text form="item" column="tag5"/></td>
-							<td><htk-text form="item" column="value5"/></td>
-						</tr>
-						<tr>
-							<td><htk-text form="item" column="tag6"/></td>
-							<td><htk-text form="item" column="value6"/></td>
-						</tr>
-						<tr>
-							<td><htk-text form="item" column="tag7"/></td>
-							<td><htk-text form="item" column="value7"/></td>
-						</tr>
-					</table>
-				</div>
+				<table class="tags">
+					<tr>
+						<td><htk-text form="item" column="tag5"/></td>
+						<td><htk-text form="item" column="value5"/></td>
+					</tr>
+					<tr>
+						<td><htk-text form="item" column="tag6"/></td>
+						<td><htk-text form="item" column="value6"/></td>
+					</tr>
+					<tr>
+						<td><htk-text form="item" column="tag7"/></td>
+						<td><htk-text form="item" column="value7"/></td>
+					</tr>
+				</table>
 			</div>
 		</div>
 		</custom>
@@ -222,7 +220,7 @@
 							JOIN tmp.itemAvailable a ON a.id = i.id
 							JOIN vn.itemTypeL10n l ON l.id = t.id
 						WHERE #filter
-						ORDER BY name
+						ORDER BY t.`order`, l.name
 				</db-model>
 				<sql-filter property="filter" type="AND">
 					<sql-filter-item type="EQUAL">
@@ -444,7 +442,6 @@
 						JOIN vn.warehouse w ON w.id = p.warehouse_id
 					ORDER BY warehouseFk, `grouping`;
 			</db-model>
-			<htk-column-text title="_Store" column="warehouse"/>
 			<htk-column-spin title="_Price" column="price" unit="€" digits="2"/>
 			<htk-column-text title="_Pack" column="grouping" format="x%.0d"/>
 			<htk-column-button
diff --git a/package.json b/package.json
index b3dcdcc7..7318b56b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "1.406.40",
+  "version": "1.406.41",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {