diff --git a/forms/account/address-list/address-list.js b/forms/account/address-list/address-list.js index 86aeb89c..cffeb50a 100644 --- a/forms/account/address-list/address-list.js +++ b/forms/account/address-list/address-list.js @@ -30,10 +30,10 @@ Hedera.AddressList = new Class form.refresh (); } } - - ,onEditAddressClick: function (button, form) + + ,repeaterFunc: function (res, form) { - this.hash.set ({ + res.$('link').href = this.hash.make ({ 'form': 'account/address', 'address': form.get ('id') }); diff --git a/forms/account/address-list/style.css b/forms/account/address-list/style.css index 8bd9a259..8b137891 100644 --- a/forms/account/address-list/style.css +++ b/forms/account/address-list/style.css @@ -1,48 +1 @@ -.address-list -{ - padding: 1em; -} -.address-list .box -{ - max-width: 30em; -} -.address-list .form -{ - margin: 0 auto; - max-width: 25em; - padding: 2em; -} -.address -{ - padding: 1em; - border-bottom: 1px solid #DDD; -} -.address p -{ - margin: 0.2em 0; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; -} -.address p.important -{ - font-size: 1.2em; -} -.address .actions -{ - float: right; -} -.address .actions > .htk-button -{ - margin: 0; -} -.address .actions > * -{ - display: inline-block; - vertical-align: middle; -} -.address .actions > input -{ - margin: .6em; -} diff --git a/forms/account/address-list/ui.xml b/forms/account/address-list/ui.xml index b1203d3f..2496a87c 100755 --- a/forms/account/address-list/ui.xml +++ b/forms/account/address-list/ui.xml @@ -29,14 +29,14 @@ on-click="onAddAddressClick"/>
-
+
- + -
+
-

@@ -66,7 +60,7 @@ ,

-
+
diff --git a/forms/account/address/style.css b/forms/account/address/style.css index 1fa559d2..8b137891 100644 --- a/forms/account/address/style.css +++ b/forms/account/address/style.css @@ -1,16 +1 @@ -.address -{ - padding: 1em; -} -.address .box -{ - max-width: 30em; - padding: 2em; -} -.address .form -{ - margin: 0 auto; - max-width: 25em; -} - diff --git a/forms/account/address/ui.xml b/forms/account/address/ui.xml index 750f37fe..8650697b 100755 --- a/forms/account/address/ui.xml +++ b/forms/account/address/ui.xml @@ -38,58 +38,56 @@ on-click="onReturnClick"/>
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - - +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + + + + SELECT Id, Pais FROM vn2008.Paises + ORDER BY Pais + + + +
+
+ + + + + SELECT province_id, name FROM vn2008.province + WHERE Paises_Id = #country + ORDER BY name + + - SELECT Id, Pais FROM vn2008.Paises - ORDER BY Pais + - - -
-
- - - - - SELECT province_id, name FROM vn2008.province - WHERE Paises_Id = #country - ORDER BY name - - - - - - - - -
+ + +
diff --git a/forms/account/conf/conf.js b/forms/account/conf/conf.js index 0e7246d6..27aa6dea 100644 --- a/forms/account/conf/conf.js +++ b/forms/account/conf/conf.js @@ -15,7 +15,7 @@ Hedera.Conf = new Class this.$('new-password').value = ''; this.$('repeat-password').value = ''; - var recoverPass = this.$('user-form').get ('recoverPass'); + var recoverPass = this.$('user').get ('recoverPass'); this.$('old-password').style.display = recoverPass ? 'none' : 'block'; this.$('change-password').show (); @@ -56,7 +56,7 @@ Hedera.Conf = new Class { this.$('change-password').hide (); Htk.Toast.showMessage (_('Password changed!')); - this.$('user-form').refresh (); + this.$('user').refresh (); } else { diff --git a/forms/account/conf/style.css b/forms/account/conf/style.css index 5cb03475..218434b6 100644 --- a/forms/account/conf/style.css +++ b/forms/account/conf/style.css @@ -1,18 +1,4 @@ -.conf -{ - padding: 1em; -} -.conf .box -{ - max-width: 30em; - padding: 2em; -} -.conf .form -{ - margin: 0 auto; - max-width: 25em; -} .conf .form-group input[type=password] { margin-bottom: 0.5em; diff --git a/forms/account/conf/ui.xml b/forms/account/conf/ui.xml index 84f1344a..4823885c 100755 --- a/forms/account/conf/ui.xml +++ b/forms/account/conf/ui.xml @@ -8,7 +8,7 @@ - + SELECT u.id, u.name, u.recoverPass, @@ -44,20 +44,18 @@ on-click="onPassChangeClick"/>
-
-
-
- - -
-
- - -
-
- - -
+
+
+ + +
+
+ + +
+
+ +
diff --git a/forms/admin/access-log/style.css b/forms/admin/access-log/style.css index 9a6b0cfe..f2252e07 100644 --- a/forms/admin/access-log/style.css +++ b/forms/admin/access-log/style.css @@ -1,36 +1,12 @@ -.access-log + +.access-log .card { - padding: 1em; -} -.access-log .box -{ - max-width: 25em; - margin: 0 auto; -} -.access-log .form -{ - padding: 2em; + max-width: 28em; } + .access-log .form > p { font-size: 1.2em; margin: .1em 0; } -/* List */ - -.access-log .list -{ - margin-top: 1em; -} -.access-log .item -{ - display: block; - padding: 1em; - border-bottom: 1px solid #DDD; -} -.access-log .item > p -{ - margin: .1em 0; -} - diff --git a/forms/admin/access-log/ui.xml b/forms/admin/access-log/ui.xml index 25c7fc28..c3f85f34 100755 --- a/forms/admin/access-log/ui.xml +++ b/forms/admin/access-log/ui.xml @@ -20,23 +20,21 @@

AccessLog

-
-
-

- -

-

- -

-

- -

-

- -

-
+
+

+ +

+

+ +

+

+ +

+

+ +

-
+
@@ -56,7 +54,7 @@ -
+

diff --git a/forms/admin/connections/connections.js b/forms/admin/connections/connections.js index bb5c2993..32738f82 100644 --- a/forms/admin/connections/connections.js +++ b/forms/admin/connections/connections.js @@ -26,11 +26,11 @@ Hedera.Connections = new Class this.$('sessions').refresh (); } - ,onAccessLogClick: function (button, form) + ,repeaterFunc: function (res, form) { - this.hash.set ({ - 'form': 'admin/access-log' - ,'user': form.get ('userId') + res.$('link').href = this.hash.make ({ + 'form': 'admin/access-log', + 'user': form.get ('userId') }); } diff --git a/forms/admin/connections/style.css b/forms/admin/connections/style.css index b27e9449..8c4a81d3 100644 --- a/forms/admin/connections/style.css +++ b/forms/admin/connections/style.css @@ -1,12 +1,4 @@ -.connections -{ - padding: 1em; -} -.connections .box -{ - max-width: 25em; - margin: 0 auto; -} + .action-bar .connections-sum { padding: .4em; @@ -16,29 +8,3 @@ border-radius: 0.1em; box-shadow: 0 0 0.4em #666; } - -/* List */ - -.connections .item -{ - display: block; - padding: 1em; - border-bottom: 1px solid #DDD; -} -.connections .item > button -{ - float: right; - margin: 0; -} -.connections .item > p -{ - margin: .1em 0; -} -.connections .item > p.important -{ - font-size: 1.2em; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; -} - diff --git a/forms/admin/connections/ui.xml b/forms/admin/connections/ui.xml index ecc8761d..dd71cf54 100755 --- a/forms/admin/connections/ui.xml +++ b/forms/admin/connections/ui.xml @@ -18,8 +18,8 @@
-
- +
+ SELECT vu.user userId, vu.stamp, c.Cliente, s.lastUpdate, @@ -35,19 +35,15 @@ -
- - + +
+ +

@@ -60,7 +56,7 @@

-
+
diff --git a/forms/admin/items/style.css b/forms/admin/items/style.css index ff9ba1be..e69de29b 100644 --- a/forms/admin/items/style.css +++ b/forms/admin/items/style.css @@ -1,43 +0,0 @@ - -.items -{ - padding: 1em; -} -.items .box -{ - max-width: 30em; - padding: 2em; -} -.items .form -{ - max-width: 25em; - margin: auto; -} -.items .form-group -{ - padding: 0.4em; -} -.items form label -{ - display: block; - margin-bottom: 0.5em; -} -.items input[type=text], -.items select -{ - margin: 0; - width: 100%; -} - -/* Footer */ - -.items .footer -{ - text-align: center; - margin-top: 1.5em; -} -.items .footer > button -{ - margin: 0 .2em; -} - diff --git a/forms/admin/items/ui.xml b/forms/admin/items/ui.xml index 07fc6174..ce78c0a5 100755 --- a/forms/admin/items/ui.xml +++ b/forms/admin/items/ui.xml @@ -9,40 +9,38 @@ on-click="onPreviewClick"/>
-
-
-
- - - - - - SELECT id, name FROM vn2008.warehouse - WHERE reserve ORDER BY name - - - -
-
- - - - - - SELECT id, reino FROM vn2008.reinos - WHERE display != FALSE ORDER BY reino - - - -
-
- - -
+
+
+ + + + + + SELECT id, name FROM vn2008.warehouse + WHERE reserve ORDER BY name + + + +
+
+ + + + + + SELECT id, reino FROM vn2008.reinos + WHERE display != FALSE ORDER BY reino + + + +
+
+ +
diff --git a/forms/admin/links/style.css b/forms/admin/links/style.css index b74a6af2..2ebd47b1 100644 --- a/forms/admin/links/style.css +++ b/forms/admin/links/style.css @@ -1,38 +1,13 @@ -.cpanel -{ - padding: 1em; -} -.cpanel .box -{ - max-width: 30em; -} - -/* Items */ - -.cpanel .item -{ - display: block; - padding: 1em; - border-bottom: 1px solid #DDD; -} -.cpanel .item:hover +.cpanel .list-row:hover { background-color: rgba(1, 1, 1, 0.05); } -.cpanel .item > .htk-image +.cpanel .list-row > .htk-image { margin: 0; margin-right: 1em; float: left; - max-height: 2.8em; - max-width: 2.8em; -} -.cpanel .item > p -{ - margin: .1em 0; -} -.cpanel .item > p.important -{ - font-size: 1.2em; + height: 2.8em; + width: 2.8em; } diff --git a/forms/admin/links/ui.xml b/forms/admin/links/ui.xml index 79540fd9..c3024377 100755 --- a/forms/admin/links/ui.xml +++ b/forms/admin/links/ui.xml @@ -3,7 +3,7 @@

ControlPanel

-
+
@@ -12,7 +12,7 @@ - + Photos
-
-
-
- -
- - -
-
- - -
-
- - - - - SELECT name, `desc` FROM image_schema ORDER BY `desc` - - - - -
-
- - -
- -
+
+
+ +
+ +
+
+ + +
+
+ + + + + SELECT name, `desc` FROM image_schema ORDER BY `desc` + + + + +
+
+ + +
+
+
diff --git a/forms/admin/queries/style.css b/forms/admin/queries/style.css index e3c925ca..8acd29f2 100644 --- a/forms/admin/queries/style.css +++ b/forms/admin/queries/style.css @@ -1,16 +1,7 @@ -.queries -{ - padding: 1em; -} -.queries .box + +.queries .card { max-width: 40em; - margin: 0 auto; -} -.queries .form -{ - box-sizing: border-box; - padding: 2em; } .queries textarea { diff --git a/forms/admin/queries/ui.xml b/forms/admin/queries/ui.xml index 6d1b6745..9616ef2f 100755 --- a/forms/admin/queries/ui.xml +++ b/forms/admin/queries/ui.xml @@ -13,8 +13,8 @@ on-click="_onCleanClick"/>
-
-
+
+