diff --git a/debian/changelog b/debian/changelog
index a238d56a..026d8642 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.211-1) stable; urgency=low
+hedera-web (1.211-deb8) stable; urgency=low
* Initial Release.
diff --git a/web/forms/ecomerce/catalog/catalog.js b/web/forms/ecomerce/catalog/catalog.js
index f07ac632..2f0b1791 100755
--- a/web/forms/ecomerce/catalog/catalog.js
+++ b/web/forms/ecomerce/catalog/catalog.js
@@ -11,8 +11,21 @@ Vn.Catalog = new Class
,activate: function ()
{
- Vn.BasketChecker.check (this.conn,
- this.onBasketCheck.bind (this));
+ if (!Vn.Url.getQuery ('guest'))
+ {
+ Vn.BasketChecker.check (this.conn,
+ this.onBasketCheck.bind (this));
+ }
+ else
+ {
+ var query = 'CALL basket_configure_for_guest ()';
+ this.conn.execQuery (query, this.onBasketForGuest.bind (this));
+ }
+ }
+
+ ,onBasketForGuest: function ()
+ {
+ this.onBasketCheck (true);
}
,onBasketCheck: function (isOk)
@@ -144,7 +157,10 @@ Vn.Catalog = new Class
,onBasketClick: function ()
{
- this.hash.set ({'form': 'ecomerce/basket'});
+ if (!Vn.Url.getQuery ('guest'))
+ this.hash.set ({'form': 'ecomerce/basket'});
+ else
+ Htk.Toast.showError (_('YouMustBeLoggedIn'));
}
,featuresRender: function (renderer, form)
@@ -186,6 +202,12 @@ Vn.Catalog = new Class
,onAddItemClick: function (column, value, row, button)
{
+ if (Vn.Url.getQuery ('guest'))
+ {
+ Htk.Toast.showError (_('YouMustBeLoggedIn'));
+ return;
+ }
+
var itemId = this.$('items-model').get (row, 'item_id')
this.$('lots-batch').addValue ('item', itemId);
diff --git a/web/index.php b/web/index.php
index 09e749af..475164f6 100755
--- a/web/index.php
+++ b/web/index.php
@@ -94,6 +94,14 @@ if (!isset ($_SESSION['skipBrowser']) && $page != 'update-browser')
$_SESSION['skipBrowser'] = TRUE;
}
+// If enabled, requests the user to choose between two web versions
+
+if (FALSE && !isset ($_SESSION['skipVersionMenu']) && $page != 'version-menu')
+{
+ $_SESSION['skipVersionMenu'] = TRUE;
+ header ('Location: ?page=version-menu');
+}
+
// Setting the version
setcookie ('hedera_version', Web::getVersion ());
diff --git a/web/locale/ca/js/htk.js b/web/locale/ca/js/htk.js
index 0ef06bcb..ac9f9338 100755
--- a/web/locale/ca/js/htk.js
+++ b/web/locale/ca/js/htk.js
@@ -12,6 +12,7 @@ Vn.Locale.add
,"Loading": "Carregant"
,"Loading...": "Carregant..."
,"ReallyDelete": "Estàs segur que vols esborrar la línia?"
+ ,"YouMustBeLoggedIn": "Has d'estar registrat com a usuari"
,"EmptyList": "Llistat buit"
,"NoData": "Sense dades"
,"ErrorLoadingData": "Error"
diff --git a/web/locale/ca/pages/version-menu.json b/web/locale/ca/pages/version-menu.json
new file mode 100755
index 00000000..3f51080b
--- /dev/null
+++ b/web/locale/ca/pages/version-menu.json
@@ -0,0 +1,8 @@
+{
+ "Welcome to Verdnatura, where are you going?": "Benvingut a Verdnatura, On vols anar?"
+
+ ,"New website": "Nova web"
+ ,"(Fantastic)": "(Fantàstica)"
+ ,"Old website": "Antiga web"
+ ,"(Best choose new)": "(Millor triï la nova)"
+}
diff --git a/web/locale/es/js/htk.js b/web/locale/es/js/htk.js
index f0af05da..fad8c3a5 100755
--- a/web/locale/es/js/htk.js
+++ b/web/locale/es/js/htk.js
@@ -12,6 +12,7 @@ Vn.Locale.add
,"Loading": "Cargando"
,"Loading...": "Cargando..."
,"ReallyDelete": "¿Estás seguro de que quieres borrar la línea?"
+ ,"YouMustBeLoggedIn": "Debes estar registrado como usuario"
,"EmptyList": "Lista vacía"
,"NoData": "Sin datos"
,"ErrorLoadingData": "Error"
diff --git a/web/locale/es/pages/version-menu.json b/web/locale/es/pages/version-menu.json
new file mode 100755
index 00000000..ed3396a8
--- /dev/null
+++ b/web/locale/es/pages/version-menu.json
@@ -0,0 +1,8 @@
+{
+ "Welcome to Verdnatura, where are you going?": "Bienvenido a Verdnatura, ¿Dónde quieres ir?"
+
+ ,"New website": "Nueva web"
+ ,"(Fantastic)": "(Fantástica)"
+ ,"Old website": "Antigua web"
+ ,"(Best choose new)": "(Mejor elige la nueva)"
+}
diff --git a/web/locale/fr/js/htk.js b/web/locale/fr/js/htk.js
index 97c8aec5..88d614b6 100755
--- a/web/locale/fr/js/htk.js
+++ b/web/locale/fr/js/htk.js
@@ -12,6 +12,7 @@ Vn.Locale.add
,"Loading": "Chargement"
,"Loading...": "Chargement..."
,"ReallyDelete": "Voulez-vous vraiment supprimer la ligne?"
+ ,"YouMustBeLoggedIn": "Vous devez être un utilisateur enregistré"
,"EmptyList": "Vider la liste"
,"NoData": "Aucune donnée"
,"ErrorLoadingData": "Erreur"
diff --git a/web/locale/fr/pages/version-menu.json b/web/locale/fr/pages/version-menu.json
new file mode 100755
index 00000000..6b8f80be
--- /dev/null
+++ b/web/locale/fr/pages/version-menu.json
@@ -0,0 +1,8 @@
+{
+ "Welcome to Verdnatura, where are you going?": "Bienvenue à Verdnatura, où allez-vous?"
+
+ ,"New website": "Nouveau site web"
+ ,"(Fantastic)": "(Fantastique)"
+ ,"Old website": "Vieux web"
+ ,"(Best choose new)": "(Meilleur choisir nouveau)"
+}
diff --git a/web/pages/version-menu/html.php b/web/pages/version-menu/html.php
new file mode 100755
index 00000000..a0b2a5f2
--- /dev/null
+++ b/web/pages/version-menu/html.php
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+ Verdnatura
+
+
+
+
+
diff --git a/web/pages/version-menu/new-web.svg b/web/pages/version-menu/new-web.svg
new file mode 100644
index 00000000..0b055e28
--- /dev/null
+++ b/web/pages/version-menu/new-web.svg
@@ -0,0 +1,233 @@
+
+
+
+
\ No newline at end of file
diff --git a/web/pages/version-menu/old-web.svg b/web/pages/version-menu/old-web.svg
new file mode 100644
index 00000000..f0e5f656
--- /dev/null
+++ b/web/pages/version-menu/old-web.svg
@@ -0,0 +1,198 @@
+
+
+
+
\ No newline at end of file
diff --git a/web/pages/version-menu/style.css b/web/pages/version-menu/style.css
new file mode 100755
index 00000000..0aa06615
--- /dev/null
+++ b/web/pages/version-menu/style.css
@@ -0,0 +1,90 @@
+/*
+@media
+ (min-resolution: 120dpi) and (min-width: 800px),
+ (max-resolution: 119dpi) and (max-width: 800px)
+{
+
+}
+*/
+@media
+ (min-resolution: 120dpi) and (orientation: portrait)
+{
+ * { font-size: 18pt; }
+}
+@media
+ (min-resolution: 120dpi) and (orientation: landscape)
+{
+ * { font-size: 10pt; }
+}
+@media (orientation: portrait)
+{
+ #main
+ {
+ padding: 0;
+ }
+ #main > div
+ {
+ display: block;
+ width: 80%;
+ padding: 0 10%;
+ }
+ #main > div
+ {
+ padding-bottom: 2em;
+ }
+}
+@media (orientation: landscape)
+{
+ #main
+ {
+ padding: 0;
+ }
+ #main > div
+ {
+ display: inline-block;
+ vertical-align: top;
+ width: 24%;
+ padding: 0 5%;
+ }
+}
+
+*
+{
+ font-family: 'Open Sans';
+}
+body
+{
+ position: absolute;
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ height: 100%;
+}
+#main
+{
+ position: relative;
+ text-align: center;
+}
+h1
+{
+ font-size: 2.5em;
+ font-weight: normal;
+ margin: 1.2em 1em;
+ padding: 0;
+}
+img
+{
+ width: 100%;
+ margin-bottom: .8em;
+}
+p
+{
+ text-align: center;
+ font-size: 1.6em;
+ margin: 0;
+}
+a
+{
+ color: black;
+ text-decoration: none;
+}
+ 
+