diff --git a/package/DEBIAN/control b/package/DEBIAN/control index 9d184d91..17527ca4 100644 --- a/package/DEBIAN/control +++ b/package/DEBIAN/control @@ -1,5 +1,5 @@ Package: hedera-web -Version: 1.0-45 +Version: 1.0-47 Architecture: all Maintainer: Juan Ferrer Toribio Depends: apache2, php5-mysql, php-vn-web diff --git a/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css b/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css index 1e64af7f..17575f93 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css +++ b/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css @@ -102,9 +102,10 @@ button.basket { width: 100%; height: 2.5em; + font-size: 1.1em; text-align: center; background-color: #00BCD4; - font-size: 1.1em; + box-shadow: 0 0.2em 0.2em #BBB; } button.basket:hover { @@ -129,6 +130,7 @@ button.basket:hover text-align: center; margin-top: 1em; vertical-align: middle; + box-shadow: 0 0 0.4em #AAA; } .htk-realm img { diff --git a/package/usr/share/hedera-web/forms/ecomerce/ticket/ui.xml b/package/usr/share/hedera-web/forms/ecomerce/ticket/ui.xml index cf1c19fe..298693d4 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/ticket/ui.xml +++ b/package/usr/share/hedera-web/forms/ecomerce/ticket/ui.xml @@ -37,7 +37,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -69,9 +69,9 @@ - + - + diff --git a/package/usr/share/hedera-web/js/db/model.js b/package/usr/share/hedera-web/js/db/model.js index f52ae5b8..17c93c9e 100755 --- a/package/usr/share/hedera-web/js/db/model.js +++ b/package/usr/share/hedera-web/js/db/model.js @@ -414,8 +414,7 @@ Db.Model.implement ,_checkTableUpdatable: function (tableIndex) { - var tableUpdatable = this._updatable - && tableIndex !== null + var tableUpdatable = tableIndex !== null && this.tables[tableIndex].pks.length > 0; if (!tableUpdatable) diff --git a/package/usr/share/hedera-web/js/htk/grid.js b/package/usr/share/hedera-web/js/htk/grid.js index cd5fca9d..d746ecb8 100755 --- a/package/usr/share/hedera-web/js/htk/grid.js +++ b/package/usr/share/hedera-web/js/htk/grid.js @@ -40,6 +40,8 @@ Htk.Grid = new Class ,columns: new Array () ,internalColumn: null ,internalColumns: 0 + ,sortColumn: -1 + ,sortWay: null ,initialize: function () { @@ -237,7 +239,17 @@ Htk.Grid = new Class var columnIndex = column.columnIndex; if (this._model && columnIndex != -1) - this._model.sort (columnIndex); + { + if (this.sortColumn === columnIndex + && this.sortWay === Db.Model.SortWay.ASC) + this.sortWay = Db.Model.SortWay.DESC; + else + this.sortWay = Db.Model.SortWay.ASC; + + this.sortColumn = columnIndex; + + this._model.sort (columnIndex, this.sortWay); + } } ,columnChanged: function (column, row, newValue)