From a17a92b5ebfe70f1750a5735fe267f09ca50f200 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Wed, 30 Sep 2015 08:45:42 +0200
Subject: [PATCH] =?UTF-8?q?Opci=C3=B3n=20de=20configurar=20pedido=20m?=
 =?UTF-8?q?=C3=A1s=20clara?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/changelog                        |  2 +-
 web/forms/ecomerce/basket/ui.xml        |  3 ++-
 web/forms/ecomerce/catalog/catalog.js   |  8 ++++++++
 web/forms/ecomerce/catalog/style.css    | 23 +++++++++++++++--------
 web/forms/ecomerce/catalog/ui.xml       |  4 +++-
 web/forms/ecomerce/checkout/checkout.js | 10 +++-------
 6 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 29a902f1..00ca32b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.224-deb8) stable; urgency=low
+hedera-web (1.225-deb8) stable; urgency=low
 
   * Initial Release.
 
diff --git a/web/forms/ecomerce/basket/ui.xml b/web/forms/ecomerce/basket/ui.xml
index 089e28b5..bced3573 100755
--- a/web/forms/ecomerce/basket/ui.xml
+++ b/web/forms/ecomerce/basket/ui.xml
@@ -2,10 +2,11 @@
 <div id="form" class="basket">
 <div class="box">
 	<div class="header">
-		<h1><t>ShoppingBasket</t></h1>
+		<h1><t>Basket</t></h1>
 		<div class="action-bar">
 			<button on-click="onConfigureClick" title="_ConfigureOrder">
 				<img class="config" src="image/dark/preferences.svg" alt=""/>
+				<t>ConfigureOrder</t>
 			</button>
 			<button on-click="onCatalogClick">
 				<img src="image/dark/menu.svg" alt=""/>
diff --git a/web/forms/ecomerce/catalog/catalog.js b/web/forms/ecomerce/catalog/catalog.js
index ec3d8ded..bfe38473 100755
--- a/web/forms/ecomerce/catalog/catalog.js
+++ b/web/forms/ecomerce/catalog/catalog.js
@@ -165,6 +165,14 @@ Vn.Catalog = new Class
 			Htk.Toast.showError (_('YouMustBeLoggedIn'));
 	}
 	
+	,onConfigClick: function ()
+	{
+		if (!Vn.Url.getQuery ('guest'))
+			this.hash.set ({'form': 'ecomerce/checkout'});
+		else
+			Htk.Toast.showError (_('YouMustBeLoggedIn'));
+	}
+	
 	,nameRenderer: function (renderer, form)
 	{
 		renderer.subtitle = form.get ('producer');
diff --git a/web/forms/ecomerce/catalog/style.css b/web/forms/ecomerce/catalog/style.css
index c6b8a1e5..c9fe1889 100755
--- a/web/forms/ecomerce/catalog/style.css
+++ b/web/forms/ecomerce/catalog/style.css
@@ -86,7 +86,7 @@
 	height: 1.8em;
 }
 
-/* Menu */
+/* Right panel */
 
 .catalog div.menu
 {
@@ -99,7 +99,8 @@
 	background-color: white;
 	box-shadow: 0 0.2em 0.2em #AAA;
 }
-button.basket
+button.basket,
+button.configure
 {
 	width: 100%;
 	height: 3em;
@@ -107,14 +108,23 @@ button.basket
 	text-align: center;
 	background-color: #00BCD4;
 	border-radius: 0;
+	display: inline-block;
+	width: 50%;
+	margin: 0;
+	padding: 0;
 }
 button.basket:hover
 {
 	background-color: #0AB;
 }
-
-/* Realms */
-
+button.configure
+{
+	background-color: #0097A7;
+}
+button.configure:hover
+{
+	background-color: #00838F;
+}
 .realms-box
 {
 	box-shadow: 0 0 0.4em #AAA;
@@ -138,9 +148,6 @@ button.basket:hover
 {
 	opacity: 0.85;
 }
-
-/* Types */
-
 .types-box
 {
 	position: absolute;
diff --git a/web/forms/ecomerce/catalog/ui.xml b/web/forms/ecomerce/catalog/ui.xml
index 6df57a05..eb0c0e9f 100755
--- a/web/forms/ecomerce/catalog/ui.xml
+++ b/web/forms/ecomerce/catalog/ui.xml
@@ -109,7 +109,9 @@
 	</div>
 	<div id="menu" class="menu" on-click="onMenuClick">
 		<button class="basket" on-click="onBasketClick">
-			<t>ShoppingBasket</t>
+			<t>Basket</t>
+		</button><button class="configure" on-click="onConfigClick">
+			<t>Configuration</t>
 		</button>
 		<htk-repeater
 			model="realms-model"
diff --git a/web/forms/ecomerce/checkout/checkout.js b/web/forms/ecomerce/checkout/checkout.js
index 70ded3b5..24781616 100755
--- a/web/forms/ecomerce/checkout/checkout.js
+++ b/web/forms/ecomerce/checkout/checkout.js
@@ -65,21 +65,17 @@ Vn.Checkout = new Class
 			return;
 	
 		if (this.$('order-form').numRows > 0)
-		{
 			Htk.Toast.showMessage (_('OrderUpdated'));
-			window.history.back();
-		}
 		else
-		{
 			Htk.Toast.showMessage (_('OrderStarted'));
-			this.hash.set ({'form': 'ecomerce/catalog'});
-		}
+
+		this.hash.set ({'form': 'ecomerce/catalog'});
 	}
 
 	,onCancelClick: function ()
 	{
 		if (this.$('order-form').numRows > 0)
-			this.hash.set ({'form': 'ecomerce/basket'});
+			window.history.back();
 		else
 			this.hash.set ({'form': 'ecomerce/orders'});
 	}