From 6a28912da542be6c38875b1a65149d0ac84ecbf3 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 15 Jan 2016 13:31:08 +0100 Subject: [PATCH] =?UTF-8?q?Formulario=20de=20confirmar=20pedido=20muestra?= =?UTF-8?q?=20informaci=C3=B3n=20de=20saldo,=20ahora=20se=20usa=20la=20fue?= =?UTF-8?q?nte=20Roboto,=20ahora=20ofrece=20la=20opci=C3=B3n=20de=20reinte?= =?UTF-8?q?ntar=20pago=20cuando=20hay=20un=20error,=20varios=20errores=20s?= =?UTF-8?q?olucionados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 +- web/forms/account/address-list/style.css | 4 + web/forms/admin/connections/style.css | 1 + web/forms/admin/queries/queries.js | 102 ++++++++++ web/forms/admin/queries/style.css | 25 +++ web/forms/admin/queries/ui.xml | 40 ++++ web/forms/admin/users/style.css | 1 + web/forms/ecomerce/catalog/style.css | 143 +++++--------- web/forms/ecomerce/catalog/ui.xml | 3 +- web/forms/ecomerce/confirm/confirm.js | 115 +++++++++-- web/forms/ecomerce/confirm/style.css | 133 +++++++++---- web/forms/ecomerce/confirm/ui.xml | 229 +++++++++++++++++----- web/forms/ecomerce/orders/orders.js | 22 ++- web/forms/ecomerce/orders/ui.xml | 18 +- web/forms/news/news/style.css | 1 + web/image/dark/ok.svg | 36 ++-- web/image/ok.svg | 32 +-- web/js/db/conn.js | 6 +- web/js/hedera/gui.css | 15 +- web/js/hedera/gui.xml | 7 +- web/js/hedera/login.xml | 3 - web/js/hedera/opensans.ttf | Bin 217360 -> 0 bytes web/js/hedera/report.css | 6 +- web/js/hedera/roboto.ttf | Bin 0 -> 162876 bytes web/js/hedera/style.css | 35 +++- web/js/hedera/tpv.js | 60 ++++-- web/js/htk/field/entry.js | 4 +- web/js/htk/field/spin.js | 41 ++-- web/js/htk/style.css | 9 +- web/js/vn/date.js | 5 + web/locale/ca/forms/admin/queries.json | 11 ++ web/locale/ca/forms/ecomerce/confirm.json | 40 ++-- web/locale/ca/forms/ecomerce/orders.json | 4 +- web/locale/ca/js/vn.js | 2 + web/locale/en/forms/admin/queries.json | 11 ++ web/locale/en/forms/ecomerce/confirm.json | 37 ++-- web/locale/en/forms/ecomerce/orders.json | 4 +- web/locale/en/js/vn.js | 2 + web/locale/es/forms/admin/queries.json | 11 ++ web/locale/es/forms/ecomerce/confirm.json | 37 ++-- web/locale/es/forms/ecomerce/orders.json | 4 +- web/locale/es/js/vn.js | 2 + web/locale/fr/forms/admin/queries.json | 11 ++ web/locale/fr/forms/ecomerce/confirm.json | 39 ++-- web/locale/fr/forms/ecomerce/orders.json | 4 +- web/locale/fr/js/vn.js | 2 + web/locale/mn/forms/admin/queries.json | 11 ++ web/locale/mn/forms/ecomerce/confirm.json | 37 ++-- web/locale/mn/forms/ecomerce/orders.json | 4 +- web/locale/mn/js/vn.js | 2 + web/locale/pt/forms/admin/queries.json | 11 ++ web/locale/pt/forms/ecomerce/confirm.json | 37 ++-- web/locale/pt/forms/ecomerce/orders.json | 4 +- web/locale/pt/js/vn.js | 2 + web/pages/main/style.css | 4 +- 55 files changed, 1039 insertions(+), 392 deletions(-) create mode 100755 web/forms/admin/queries/queries.js create mode 100755 web/forms/admin/queries/style.css create mode 100755 web/forms/admin/queries/ui.xml delete mode 100755 web/js/hedera/opensans.ttf create mode 100644 web/js/hedera/roboto.ttf create mode 100755 web/locale/ca/forms/admin/queries.json create mode 100755 web/locale/en/forms/admin/queries.json create mode 100755 web/locale/es/forms/admin/queries.json create mode 100755 web/locale/fr/forms/admin/queries.json create mode 100755 web/locale/mn/forms/admin/queries.json create mode 100755 web/locale/pt/forms/admin/queries.json diff --git a/debian/changelog b/debian/changelog index 949a7147..2ebdca3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.322-deb8) stable; urgency=low +hedera-web (1.323-deb8) stable; urgency=low * Initial Release. diff --git a/web/forms/account/address-list/style.css b/web/forms/account/address-list/style.css index e45c6e9e..8bd9a259 100755 --- a/web/forms/account/address-list/style.css +++ b/web/forms/account/address-list/style.css @@ -33,6 +33,10 @@ { float: right; } +.address .actions > .htk-button +{ + margin: 0; +} .address .actions > * { display: inline-block; diff --git a/web/forms/admin/connections/style.css b/web/forms/admin/connections/style.css index b4ef6949..b27e9449 100755 --- a/web/forms/admin/connections/style.css +++ b/web/forms/admin/connections/style.css @@ -28,6 +28,7 @@ .connections .item > button { float: right; + margin: 0; } .connections .item > p { diff --git a/web/forms/admin/queries/queries.js b/web/forms/admin/queries/queries.js new file mode 100755 index 00000000..4e273761 --- /dev/null +++ b/web/forms/admin/queries/queries.js @@ -0,0 +1,102 @@ + +Vn.Queries = new Class +({ + Extends: Vn.Form + + ,activate: function () + { + this.$('result-index').value = 0; + } + + ,clean: function () + { + if (this._grid) + { + this.$('grid-holder').removeChild (this._grid.getNode ()); + this._grid.unref (); + this._grid = null; + } + } + + ,_onExecuteClick: function () + { + this.clean (); + + var model = new Db.Model ({ + conn: this.conn, + query: this.$('sql').value, + resultIndex: this.$('result-index').value, + updatable: this.$('updatable').value + }); + model.on ('status-changed', this._onModelChange, this); + } + + ,_onCleanClick: function () + { + this.clean (); + } + + ,_onModelChange: function (model, status) + { + if (status !== Db.Model.Status.LOADING) + { + model.disconnect ('status-changed', this._onModelChange, this); + model.unref (); + } + + if (status !== Db.Model.Status.READY) + return; + + Htk.Toast.showMessage (_('Query executed!')); + + var gridHolder = this.$('grid-holder'); + + if (gridHolder.firstChild) + gridHolder.removeChilds (gridHolder.firstChild); + + var grid = new Htk.Grid (); + + var columns = model.columns; + + for (var i = 0; i < columns.length; i++) + { + var c = columns[i]; + + switch (c.type) + { + case Db.Conn.Type.BOOLEAN: + var column = new Htk.ColumnCheck (); + break; + case Db.Conn.Type.INTEGER: + var column = new Htk.ColumnSpin (); + break; + case Db.Conn.Type.DOUBLE: + var column = new Htk.ColumnSpin ({digits: 2}); + break; + case Db.Conn.Type.DATE: + var column = new Htk.ColumnDate ({format: '%a, %e %b %Y'}); + break; + case Db.Conn.Type.DATE_TIME: + var column = new Htk.ColumnDate ({format: '%a, %e %b %Y, %T'}); + break; + case Db.Conn.Type.STRING: + default: + var column = new Htk.ColumnText (); + } + + column.setProperties ({ + title: c.name, + editable: this.$('updatable').value, + columnIndex: i + }); + + grid.appendColumn (column); + } + + grid.model = model; + gridHolder.appendChild (grid.getNode ()); + this._grid = grid; + + } +}); + diff --git a/web/forms/admin/queries/style.css b/web/forms/admin/queries/style.css new file mode 100755 index 00000000..e3c925ca --- /dev/null +++ b/web/forms/admin/queries/style.css @@ -0,0 +1,25 @@ +.queries +{ + padding: 1em; +} +.queries .box +{ + max-width: 40em; + margin: 0 auto; +} +.queries .form +{ + box-sizing: border-box; + padding: 2em; +} +.queries textarea +{ + display: block; + width: 100%; + height: 8em; +} +.queries .result +{ + margin-top: 1em; + overflow: auto; +} diff --git a/web/forms/admin/queries/ui.xml b/web/forms/admin/queries/ui.xml new file mode 100755 index 00000000..a944946f --- /dev/null +++ b/web/forms/admin/queries/ui.xml @@ -0,0 +1,40 @@ + +
+

Queries

+
+
+ + +
+
+
+
+ +