diff --git a/forms/account/address-list/style.css b/forms/account/address-list/style.css index 2b28eb1f..92b791ba 100644 --- a/forms/account/address-list/style.css +++ b/forms/account/address-list/style.css @@ -1,15 +1,4 @@ -.address-list { - padding: 1em; -} -.address-list .box { - max-width: 420px; -} -.address-list .form { - margin: 0 auto; - max-width: 25em; - padding: 2em; -} .address-list .htk-list .side { padding-right: 16px; } diff --git a/forms/account/address-list/ui.xml b/forms/account/address-list/ui.xml index 03d9f753..9232a038 100644 --- a/forms/account/address-list/ui.xml +++ b/forms/account/address-list/ui.xml @@ -28,7 +28,7 @@ on-click="this.onAddAddressClick()"/>
-
+
-
-
-

AddEditAddress

-
- -
-
- -
-
- -
-
- -
-
- - - - SELECT id, country FROM vn.country - ORDER BY country - - -
-
- - - SELECT id, name FROM vn.province - WHERE countryFk = #country - ORDER BY name - - - - - - - -
+
+
+ AddEditAddress +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + + SELECT id, country FROM vn.country + ORDER BY country + + +
+
+ + + SELECT id, name FROM vn.province + WHERE countryFk = #country + ORDER BY name + + + + + + +
diff --git a/forms/account/conf/conf.js b/forms/account/conf/conf.js index 4e82f0d4..5a7c37d1 100644 --- a/forms/account/conf/conf.js +++ b/forms/account/conf/conf.js @@ -4,6 +4,7 @@ Hedera.Conf = new Class({ ,activate: function() { this.$('user-model').setInfo('c', 'myClient', 'hedera'); + this.$('user-model').setInfo('u', 'myUser', 'account'); if (this.hash.get('verificationToken')) this.onPassChangeClick(); diff --git a/forms/account/conf/style.css b/forms/account/conf/style.css index 9efb1a03..13dbdcf8 100644 --- a/forms/account/conf/style.css +++ b/forms/account/conf/style.css @@ -1,18 +1,4 @@ -.conf { - padding: 1em; -} -.conf .box { - max-width: 420px; - padding: 3em; -} -.pass-change { - max-width: 15em; - padding: 2.5em; -} -.pass-info { - width: 15em; -} .pass-info ul { list-style-type: none; } diff --git a/forms/account/conf/ui.xml b/forms/account/conf/ui.xml index c21aa80f..d8f3119a 100644 --- a/forms/account/conf/ui.xml +++ b/forms/account/conf/ui.xml @@ -34,9 +34,10 @@ on-click="this.onPassChangeClick()"/>
-
-
-

Personal information

+
+
+ Personal information +
-
-
+
-

Change password

+
+ Change password +
-
-

+
+
Password requirements -
+

  • diff --git a/forms/admin/access-log/style.css b/forms/admin/access-log/style.css index 604b0438..b9edd1c4 100644 --- a/forms/admin/access-log/style.css +++ b/forms/admin/access-log/style.css @@ -1,13 +1,4 @@ -.access-log { - padding: 1em; -} -.access-log .box { - max-width: 25em; - margin: 0 auto; -} -.access-log .form { - padding: 2em; -} + .access-log .form > p { font-size: 1.2em; margin: .1em 0; @@ -15,15 +6,7 @@ /* 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; +.access-log .htk-list { + margin-top: 16px; } diff --git a/forms/admin/access-log/ui.xml b/forms/admin/access-log/ui.xml index 9747a1ff..eb3b8661 100644 --- a/forms/admin/access-log/ui.xml +++ b/forms/admin/access-log/ui.xml @@ -22,7 +22,7 @@

    AccessLog

-
+

#{{$.userForm.id}}

{{$.userForm.nickname}}

@@ -30,39 +30,35 @@

{{$.userForm.phone}}

-
-
- - - - SELECT u.stamp, a.platform, a.browser, a.version, a.javascript, a.cookies - FROM visitUser u - JOIN visitAccess c ON c.id = u.accessFk - JOIN visitAgent a ON a.id = c.agentFk - WHERE u.userFk = #user - ORDER BY u.stamp DESC - LIMIT 8 - - - - - - - + + + + SELECT u.stamp, a.platform, a.browser, a.version, a.javascript, a.cookies + FROM visitUser u + JOIN visitAccess c ON c.id = u.accessFk + JOIN visitAgent a ON a.id = c.agentFk + WHERE u.userFk = #user + ORDER BY u.stamp DESC + LIMIT 8 + + -
-

- {{Vn.Value.format(iter.stamp, _('%a, %e %b %Y at %T'))}} -

-

- {{iter.platform}} - - {{iter.browser}} - {{iter.version}} -

-
+ - -
-
+ + + +
+
+

+ {{Vn.Value.format(iter.stamp, _('%a, %e %b %Y at %T'))}} +

+

+ {{iter.platform}} - {{iter.browser}} {{iter.version}} +

+
+
+ +
diff --git a/forms/admin/connections/style.css b/forms/admin/connections/style.css index c004ce98..b7ac80ac 100644 --- a/forms/admin/connections/style.css +++ b/forms/admin/connections/style.css @@ -1,13 +1,6 @@ -.connections { - padding: 1em; -} -.connections .box { - max-width: 420px; - margin: 0 auto; -} + .action-bar .connections-sum { padding: .4em; background-color: #1e88e5; - border-radius: 0.1em; - box-shadow: 0 0 0.4em rgba(255, 255, 255, .1); + border-radius: .1em; } diff --git a/forms/admin/connections/ui.xml b/forms/admin/connections/ui.xml index 790c7e00..6482b5c4 100644 --- a/forms/admin/connections/ui.xml +++ b/forms/admin/connections/ui.xml @@ -18,50 +18,48 @@
-
- - - - SELECT vu.userFk userId, vu.stamp, u.nickname, s.lastUpdate, - a.platform, a.browser, a.version, u.name user - FROM userSession s - JOIN visitUser vu ON vu.id = s.userVisitFk - JOIN visitAccess ac ON ac.id = vu.accessFk - JOIN visitAgent a ON a.id = ac.agentFk - JOIN visit v ON v.id = a.visitFk - JOIN account.user u ON u.id = vu.userFk - ORDER BY lastUpdate DESC - - + + - -
-

- {{iter.nickname}} -

-

- {{Vn.Value.format(iter.stamp, '%a, %T')}} - - {{Vn.Value.format(iter.lastUpdate, '%T')}} -

-

- {{iter.platform}} - {{iter.browser}} {{iter.version}} -

-
-
- -
- + SELECT vu.userFk userId, vu.stamp, u.nickname, s.lastUpdate, + a.platform, a.browser, a.version, u.name user + FROM userSession s + JOIN visitUser vu ON vu.id = s.userVisitFk + JOIN visitAccess ac ON ac.id = vu.accessFk + JOIN visitAgent a ON a.id = ac.agentFk + JOIN visit v ON v.id = a.visitFk + JOIN account.user u ON u.id = vu.userFk + ORDER BY lastUpdate DESC - -
+ + + +
+

+ {{iter.nickname}} +

+

+ {{Vn.Value.format(iter.stamp, '%a, %T')}} - + {{Vn.Value.format(iter.lastUpdate, '%T')}} +

+

+ {{iter.platform}} - {{iter.browser}} {{iter.version}} +

+
+
+ +
+ + +
diff --git a/forms/admin/items/style.css b/forms/admin/items/style.css index 72a14708..f79beab4 100644 --- a/forms/admin/items/style.css +++ b/forms/admin/items/style.css @@ -1,15 +1,5 @@ -.items { - padding: 1em; -} -.items .box { - max-width: 420px; - margin: 0 auto; -} - -/* Row */ .items .item .photo { - margin-right: 1em; border-radius: 50%; height: 80px; width: 80px; diff --git a/forms/admin/items/ui.xml b/forms/admin/items/ui.xml index 47a23a77..974c60f0 100644 --- a/forms/admin/items/ui.xml +++ b/forms/admin/items/ui.xml @@ -10,56 +10,57 @@
-
- - - SELECT i.id, i.longName, i.size, i.category, - i.value5, i.value6, i.value7, - i.image, im.updated - FROM vn.item i - LEFT JOIN image im - ON im.collectionFk = 'catalog' - AND im.name = i.image - WHERE i.longName LIKE CONCAT('%', #filter, '%') - OR i.id = #filter - ORDER BY i.longName LIMIT 50 - - - - - - - -
-
- -
-
-

- {{iter.longName}} -

-

- {{iter.value5}} {{iter.value6}} {{iter.value7}} -

-

- {{iter.id}} -

-

- {{iter.image}} -

-
+ + + SELECT i.id, i.longName, i.size, i.category, + i.value5, i.value6, i.value7, + i.image, im.updated + FROM vn.item i + LEFT JOIN image im + ON im.collectionFk = 'catalog' + AND im.name = i.image + WHERE i.longName LIKE CONCAT('%', #filter, '%') + OR i.id = #filter + ORDER BY i.longName LIMIT 50 + + + + + + + +
+
+
- - -
+
+

+ {{iter.longName}} +

+

+ {{iter.value5}} {{iter.value6}} {{iter.value7}} +

+

+ {{iter.id}} +

+

+ {{iter.image}} +

+
+
+ +
diff --git a/forms/admin/links/style.css b/forms/admin/links/style.css index 6718e605..4ec8fa2c 100644 --- a/forms/admin/links/style.css +++ b/forms/admin/links/style.css @@ -1,19 +1,10 @@ -.cpanel { - padding: 1em; -} -.cpanel .box { - max-width: 420px; -} - -/* Items */ - .cpanel .items > div { - max-width: 800px; + max-width: 900px; display: flex; flex-wrap: wrap; justify-content: center; - gap: 12px; + gap: 16px; margin: 0 auto; } .cpanel .item { @@ -21,7 +12,7 @@ flex-direction: column; align-items: center; margin: 0; - width: 120px; + width: 140px; padding: 15px; text-align: center; transition: background-color 250ms ease-out; @@ -42,7 +33,7 @@ max-width: 60px; padding: 0; } -.cpanel .item > h3 { +.cpanel .item > h6 { flex: none; margin: .1em 0; font-size: .9rem; @@ -50,11 +41,10 @@ white-space: nowrap; overflow: hidden; } -.cpanel .item > .secondary { +.cpanel .item > .text-secondary { flex: none; margin: 0; font-size: .8rem; - color: #666; height: 40px; overflow: hidden; } diff --git a/forms/admin/links/ui.xml b/forms/admin/links/ui.xml index 5c300e82..c5e166c9 100644 --- a/forms/admin/links/ui.xml +++ b/forms/admin/links/ui.xml @@ -18,10 +18,10 @@ value="{{iter.image}}" directory="link" subdir="full"/> -

+

{{iter.name}} -
-

+ +

{{iter.description}}

diff --git a/forms/admin/photos/photos.js b/forms/admin/photos/photos.js index 7130d0a0..ecffa24a 100644 --- a/forms/admin/photos/photos.js +++ b/forms/admin/photos/photos.js @@ -6,8 +6,7 @@ var Status = { ,UPLOADED : 3 }; -Hedera.Photos = new Class -({ +Hedera.Photos = new Class({ Extends: Hedera.Form ,filesData: [] ,uploadCount: 0 @@ -54,21 +53,22 @@ Hedera.Photos = new Class statusNode.className = 'status'; li.appendChild(statusNode); - var button = new Htk.Button({ - tip: 'Remove', - icon: 'delete' - }); - button.on('click', this.onFileRemove, this); - li.appendChild(button.node); - var fileData = { li: li, file: file, name: name, statusNode: statusNode }; + + var button = new Htk.Button({ + tip: 'Remove', + icon: 'delete' + }); + button.node.addEventListener('click', + () => this.onFileRemove(fileData)); + li.appendChild(button.node); + this.filesData.push(fileData); - button.value = fileData; this.$('file-list').appendChild(li); this.setImageStatus(fileData, Status.NONE, 'add', _('Pending upload')); @@ -151,8 +151,7 @@ Hedera.Photos = new Class statusNode.title = title ? title : ''; } - ,onFileRemove: function(button) { - var fileData = button.value; + ,onFileRemove: function(fileData) { this.$('file-list').removeChild(fileData.li); for (var i = 0; i < this.filesData.length; i++) diff --git a/forms/admin/photos/style.css b/forms/admin/photos/style.css index 7a2234d6..3167f4ed 100644 --- a/forms/admin/photos/style.css +++ b/forms/admin/photos/style.css @@ -1,12 +1,4 @@ -.photos { - padding: 1em; -} -.photos .box { - max-width: 420px; - padding: 3em; -} - /* Dropzone */ .photos .dropzone { diff --git a/forms/admin/photos/ui.xml b/forms/admin/photos/ui.xml index 4b5910fd..4a4bb83c 100644 --- a/forms/admin/photos/ui.xml +++ b/forms/admin/photos/ui.xml @@ -3,7 +3,7 @@

Images

-
+
diff --git a/forms/admin/users/style.css b/forms/admin/users/style.css index 63dc1d54..586a0d0e 100644 --- a/forms/admin/users/style.css +++ b/forms/admin/users/style.css @@ -1,10 +1,4 @@ -.users { - padding: 1em; -} -.users .box { - max-width: 420px; - margin: 0 auto; -} + .users-box.item > .actions { display: flex; } @@ -12,14 +6,6 @@ color: white; background-color: #F66; border-radius: .2em; - padding: .2em; - margin: .3em; + padding: .3em; font-size: .8em; } - -/* Topbar */ - -.action-bar .htk-search-entry { - margin: .8em .6em; -} - diff --git a/forms/admin/users/ui.xml b/forms/admin/users/ui.xml index 195e4b5c..64e8ac00 100644 --- a/forms/admin/users/ui.xml +++ b/forms/admin/users/ui.xml @@ -11,49 +11,47 @@ param="user-name"/>
-
- - - - SELECT u.id, u.name, u.nickname, u.active - FROM account.user u - WHERE u.name LIKE CONCAT('%', #user, '%') - OR u.nickname LIKE CONCAT('%', #user, '%') - OR u.id = #user - ORDER BY u.name LIMIT 200 - - - - - - - + + - -
-

- {{iter.nickname}} -

-

- #{{iter.id}} - {{iter.name}} -

-
-
- - Disabled - - -
- + SELECT u.id, u.name, u.nickname, u.active + FROM account.user u + WHERE u.name LIKE CONCAT('%', #user, '%') + OR u.nickname LIKE CONCAT('%', #user, '%') + OR u.id = #user + ORDER BY u.name LIMIT 200 - -
+ + + + + + + + +
+

+ {{iter.nickname}} +

+

+ #{{iter.id}} - {{iter.name}} +

+
+
+ + Disabled + + +
+ + +
diff --git a/forms/admin/visits/style.css b/forms/admin/visits/style.css index 91407404..e8dae95f 100644 --- a/forms/admin/visits/style.css +++ b/forms/admin/visits/style.css @@ -1,17 +1,10 @@ -.visits { - padding: 1em; -} + .visits .box { - max-width: 420px; - margin-bottom: 1em; + margin-bottom: 16px; } .visits .box:last-child { margin-bottom: 0; } -.visits .summary { - padding: 3em; - box-sizing: border-box; -} .visits .summary p { font-size: 1.4em; margin: 0; diff --git a/forms/admin/visits/ui.xml b/forms/admin/visits/ui.xml index 7a4967c5..c0b32d53 100644 --- a/forms/admin/visits/ui.xml +++ b/forms/admin/visits/ui.xml @@ -13,8 +13,8 @@ on-click="this.onSessionsClick()"/>
-
-
+
+
@@ -28,27 +28,28 @@
-
-
-

- - - - visits, - - - - news -

-
-
- +
+

+ + + + visits, + + + + news +

+
+ SELECT browser, diff --git a/forms/agencies/packages/style.css b/forms/agencies/packages/style.css index abd928e6..e69de29b 100644 --- a/forms/agencies/packages/style.css +++ b/forms/agencies/packages/style.css @@ -1,9 +0,0 @@ -.packages -{ - padding: 1em; -} -.packages .box -{ - max-width: 600px; - margin: 0 auto; -} diff --git a/forms/agencies/packages/ui.xml b/forms/agencies/packages/ui.xml index 126c120a..866bab74 100644 --- a/forms/agencies/packages/ui.xml +++ b/forms/agencies/packages/ui.xml @@ -3,7 +3,7 @@

ListByAgency

-
+
diff --git a/forms/agencies/provinces/style.css b/forms/agencies/provinces/style.css index 292bb3e4..e69de29b 100644 --- a/forms/agencies/provinces/style.css +++ b/forms/agencies/provinces/style.css @@ -1,9 +0,0 @@ -.provinces -{ - padding: 1em; -} -.provinces .box -{ - max-width: 600px; - margin: 0 auto; -} diff --git a/forms/agencies/provinces/ui.xml b/forms/agencies/provinces/ui.xml index 5094002a..d9a3bcbf 100644 --- a/forms/agencies/provinces/ui.xml +++ b/forms/agencies/provinces/ui.xml @@ -6,12 +6,12 @@

ByProvince

-
+
- CALL vn2008.desglose_volume (#agency) + CALL vn2008.desglose_volume(#agency) diff --git a/forms/cms/about/style.css b/forms/cms/about/style.css index 6d7a41eb..7c948ca7 100644 --- a/forms/cms/about/style.css +++ b/forms/cms/about/style.css @@ -1,15 +1,5 @@ -.about -{ - padding: 1em; -} -.about .cols -{ - max-width: 85em; - margin: 0 auto; -} -@media screen and (min-width: 1000px) /* and (max-width: 1399px) */ -{ +@media screen and (min-width: 1000px) /* and (max-width: 1399px) */ { .about .cols { column-count: 2; @@ -17,8 +7,7 @@ -webkit-column-count: 2; } }/* -@media screen and (min-width: 1400px) -{ +@media screen and (min-width: 1400px) { .about .cols { column-count: 3; @@ -26,8 +15,7 @@ -webkit-column-count: 3; } } -@media screen and (min-width: 2000px) -{ +@media screen and (min-width: 2000px) { .about .cols { column-count: 4; @@ -35,39 +23,33 @@ -webkit-column-count: 4; } }*/ -.about .box -{ +.about .box { margin-bottom: 1em; padding: 2em; } -.about h1 -{ +.about h1 { padding: 0; margin: 0; font-weight: normal; font-size: 1.6em; } -.about h2 -{ +.about h2 { text-align: center; font-size: 1.2em; font-weight: normal; margin: 1em; } -.about h3 -{ +.about h3 { text-align: center; font-size: 1.2em; font-weight: normal; padding: 1em; color: #00796B; } -.about p -{ +.about p { margin: 1em 0; } -.about p.summary -{ +.about p.summary { max-width: 26em; text-align: center; background-color: #FF8; @@ -79,8 +61,7 @@ /* Images */ -.about img -{ +.about img { max-width: 90%; text-align: center; padding: 1em; @@ -90,16 +71,13 @@ .about img[alt="producers"], .about img[alt="4_control"], .about img[alt="dealer"], -.about img[alt="goods_transport"] -{ +.about img[alt="goods_transport"] { float: right; } -.about img[alt="2_control"] -{ +.about img[alt="2_control"] { float: left; } -.about img[alt="glass"] -{ +.about img[alt="glass"] { display: inline; padding: 0; padding-left: 0.9em; diff --git a/forms/cms/about/ui.xml b/forms/cms/about/ui.xml index 79628032..3dff0745 100644 --- a/forms/cms/about/ui.xml +++ b/forms/cms/about/ui.xml @@ -3,7 +3,7 @@

About

-
+

QualityAndVariety diff --git a/forms/cms/contact/style.css b/forms/cms/contact/style.css index 35b0a6b8..a330fa93 100644 --- a/forms/cms/contact/style.css +++ b/forms/cms/contact/style.css @@ -1,55 +1,38 @@ -.contact -{ - padding: 1em; -} -.contact .box -{ - max-width: 420px; - padding: 2em; -} -.contact .form -{ +.contact .form { position: relative; text-align: left; max-width: 25em; margin: 0 auto; } -.contact form -{ +.contact form { margin: 0 auto; } -.contact form p -{ +.contact form p { margin: 1em auto; display: block; margin-top: 2em; } -.contact textarea -{ +.contact textarea { height: 5em; } -.contact button -{ +.contact button { display: block; margin: 0 auto; margin-top: 1em; padding: 0.6em; } -.contact .mandatory-message -{ +.contact .mandatory-message { font-size: .9em; } /* Captcha */ -.captcha img -{ +.captcha img { vertical-align: middle; margin-left: 1em; } -.captcha input -{ +.captcha input { max-width: 8em; } diff --git a/forms/cms/contact/ui.xml b/forms/cms/contact/ui.xml index bcb3afe2..d00840ae 100644 --- a/forms/cms/contact/ui.xml +++ b/forms/cms/contact/ui.xml @@ -3,54 +3,47 @@

IWantCustomer

-
-
-

- FillFormData +

+

FillFormData

+

OrCallUs

+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +