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
+
+
+
+
+
+
+
diff --git a/web/forms/admin/users/style.css b/web/forms/admin/users/style.css
index 25ec92c8..5dc8d8c8 100755
--- a/web/forms/admin/users/style.css
+++ b/web/forms/admin/users/style.css
@@ -15,6 +15,7 @@
.users-box > button
{
float: right;
+ margin: 0;
}
.users-box > p
{
diff --git a/web/forms/ecomerce/catalog/style.css b/web/forms/ecomerce/catalog/style.css
index 4a1241a5..1fd94884 100755
--- a/web/forms/ecomerce/catalog/style.css
+++ b/web/forms/ecomerce/catalog/style.css
@@ -159,68 +159,41 @@
/* Lots popup*/
-div.amount
+.lots-popup .footer
{
text-align: center;
background-color: #009688;
color: white;
- line-height: 2.5em;
- padding: 0.2em;
+ line-height: 2em;
+ padding: .4em;
}
-button.erase
+.lots-popup .footer > button
+{
+ margin: 0;
+}
+.lots-popup .erase
{
float: left;
}
-button.confirm
+.lots-popup .confirm
{
float: right;
}
-button.erase > img,
-button.confirm > img
+.lots-popup .erase > img,
+.lots-popup .confirm > img
{
+ display: block;
height: 1em;
}
/* Items */
-/*
-.catalog .list-view
-{
- margin: 0 auto;
- padding: 1em;
- max-width: 45em;
- min-width: 25em;
-}
-.items
-{
- width: 100%;
-}
-.catalog div.box div.header,
-.items > thead > tr,
-.realms-bar
-{
- background-color: #777;
-}
-.items > tbody > tr
-{
- height: 4em;
-}
-.items .icon
-{
- width: 4em;
- padding: 0;
-}
-.items .icon > img
-{
- max-height: 2.5em;
- max-width: 2.5em;
- border-radius: 50%;
-}*/
-td.second-category
+
+.catalog .second-category
{
font-weight: bold;
color: orange;
}
-td.third-category
+.catalog .third-category
{
font-weight: bold;
color: red;
@@ -235,6 +208,38 @@ td.third-category
padding-bottom: 1em;
text-align: center;
}
+.catalog .item-info > h2
+{
+ font-weight: normal;
+}
+.catalog .item-info > p
+{
+ margin: 0;
+ padding: 0;
+ color: #777;
+ font-size: .8em;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+}
+.grid-view .item-info > .producer
+{
+ text-transform: uppercase;
+}
+.catalog .item-info > .htk-button
+{
+ margin: -0.3em;
+ padding: .3em;
+}
+.catalog .item-info > .htk-button > img
+{
+ vertical-align: middle;
+}
+.catalog .item-info .from
+{
+ font-size: .8em;
+ font-style: italic;
+}
/* List view */
@@ -273,35 +278,21 @@ td.third-category
.list-view .item-info
{
position: absolute;
- left: 4.6em;
+ left: 5.5em;
right: 0;
top: 0;
bottom: 0;
margin: .9em;
+ margin-left: 0;
}
.list-view .item-info > h2
{
font-size: 1em;
- font-weight: normal;
padding: 0;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
-.list-view .item-info > p
-{
- margin: 0;
- padding: 0;
- color: #777;
- font-size: .8em;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
-}
-.list-view .item-info > .producer
-{
- text-transform: uppercase;
-}
.list-view .item-info > .color
{
display: none;
@@ -312,20 +303,9 @@ td.third-category
bottom: 0;
right: .3em;
}
-.list-view .item-info .from
-{
- font-size: .8em;
- font-style: italic;
-}
.list-view .item-info > .htk-button
{
float: right;
- margin: -0.3em;
- padding: .3em;
-}
-.list-view .item-info > .htk-button > img
-{
- vertical-align: middle;
}
.list-view .item-info > .info-button
{
@@ -377,45 +357,20 @@ td.third-category
}
.grid-view .item-info > h2
{
- font-size: 1.2em;
font-weight: normal;
padding-top: 0;
}
-.grid-view .item-info > p
-{
- margin: 0;
- padding: 0;
- color: #777;
- font-size: .8em;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
-}
-.grid-view .item-info > .producer
-{
- text-transform: uppercase;
-}
.grid-view .item-info > .aval-price
{
position: absolute;
bottom: 0;
right: 2.8em;
}
-.grid-view .item-info .from
-{
- font-size: .8em;
- font-style: italic;
-}
.grid-view .item-info .add-button
{
position: absolute;
bottom: 0;
right: 0;
- padding: .3em;
-}
-.grid-view .item-info .add-button > img
-{
- vertical-align: middle;
}
.grid-view .item-info > .info-button
{
diff --git a/web/forms/ecomerce/catalog/ui.xml b/web/forms/ecomerce/catalog/ui.xml
index 9be85304..9908a124 100755
--- a/web/forms/ecomerce/catalog/ui.xml
+++ b/web/forms/ecomerce/catalog/ui.xml
@@ -120,7 +120,6 @@