diff --git a/debian/changelog b/debian/changelog index 7f5ab720..54e7bb79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.407.69) stable; urgency=low +hedera-web (1.407.70) stable; urgency=low * Initial Release. diff --git a/forms/account/address-list/address-list.js b/forms/account/address-list/address-list.js index 527cc6da..af8cf66d 100644 --- a/forms/account/address-list/address-list.js +++ b/forms/account/address-list/address-list.js @@ -3,39 +3,39 @@ Hedera.AddressList = new Class ({ Extends: Hedera.Form - ,activate: function () - { - this.$('user-model').setInfo ('c', 'myClient', 'hedera'); - this.$('addresses').setInfo ('a', 'myAddress', 'hedera'); + ,activate: function() { + this.$('user-model').setInfo('c', 'myClient', 'hedera'); + this.$('addresses').setInfo('a', 'myAddress', 'hedera'); } - ,onAddAddressClick: function () - { - this.hash.set ({ + ,onAddAddressClick: function() { + this.hash.set({ form: 'account/address', address: 0 }); } - ,onReturnClick: function () - { + ,onReturnClick: function() { window.history.back(); } + + ,onSetDefaultClick: function(event, addressId) { + if (event.defaultPrevented) return; + this.$('defaultAddress').value = addressId; + Htk.Toast.showMessage(_('DefaultAddressModified')); + } - ,onRemoveAddressClick: function (button, form) - { - if (confirm (_('AreYouSureDeleteAddress'))) - { - form.set ('isActive', false); - form.refresh (); + ,onRemoveAddressClick: function(form) { + if (confirm(_('AreYouSureDeleteAddress'))) { + form.set('isActive', false); + form.refresh(); } } - ,onEditAddressClick: function (button, form) - { - this.hash.set ({ + ,onEditAddressClick: function(id) { + this.hash.set({ form: 'account/address', - address: form.get ('id') + address: id }); } }); diff --git a/forms/account/address-list/locale/ca.yml b/forms/account/address-list/locale/ca.yml index cf541723..cf957550 100644 --- a/forms/account/address-list/locale/ca.yml +++ b/forms/account/address-list/locale/ca.yml @@ -5,3 +5,4 @@ SetAsDefault: Establir com per defecte RemoveAddress: Esborrar direcció EditAddress: Modificar direcció AreYouSureDeleteAddress: Estàs segur de que vols eliminar la direcció? +DefaultAddressModified: Adreça per defecte modificada diff --git a/forms/account/address-list/locale/en.yml b/forms/account/address-list/locale/en.yml index df5b564f..75bdb2ac 100644 --- a/forms/account/address-list/locale/en.yml +++ b/forms/account/address-list/locale/en.yml @@ -5,3 +5,4 @@ SetAsDefault: Set as default RemoveAddress: Remove address EditAddress: Edit address AreYouSureDeleteAddress: Are you sure you want to delete the address? +DefaultAddressModified: Default address modified diff --git a/forms/account/address-list/locale/es.yml b/forms/account/address-list/locale/es.yml index 66c4576d..50a29c77 100644 --- a/forms/account/address-list/locale/es.yml +++ b/forms/account/address-list/locale/es.yml @@ -5,3 +5,4 @@ SetAsDefault: Establecer como predeterminada RemoveAddress: Borrar dirección EditAddress: Modificar dirección AreYouSureDeleteAddress: ¿Estás seguro de que quieres borrar la dirección? +DefaultAddressModified: Dirección por defecto modificada diff --git a/forms/account/address-list/locale/fr.yml b/forms/account/address-list/locale/fr.yml index 9126d4fb..8530ec22 100644 --- a/forms/account/address-list/locale/fr.yml +++ b/forms/account/address-list/locale/fr.yml @@ -5,3 +5,4 @@ SetAsDefault: Définir par défaut RemoveAddress: Supprimer l'adresse EditAddress: Changement d'adresse AreYouSureDeleteAddress: Souhaitez-vous vraiment supprier l'adresse? +DefaultAddressModified: Adresse par défaut modifiée diff --git a/forms/account/address-list/locale/pt.yml b/forms/account/address-list/locale/pt.yml index 4f5fd79a..7657ab26 100644 --- a/forms/account/address-list/locale/pt.yml +++ b/forms/account/address-list/locale/pt.yml @@ -5,3 +5,4 @@ SetAsDefault: Selecionar como pre-determinado RemoveAddress: Eliminar Morada EditAddress: Modificar Morada AreYouSureDeleteAddress: Tens certeza que queres eliminar esta morada? +DefaultAddressModified: Endereço padrão modificado diff --git a/forms/account/address-list/style.css b/forms/account/address-list/style.css index 8bd9a259..92b791ba 100644 --- a/forms/account/address-list/style.css +++ b/forms/account/address-list/style.css @@ -1,48 +1,4 @@ -.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; +.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 f43d945a..9232a038 100644 --- a/forms/account/address-list/ui.xml +++ b/forms/account/address-list/ui.xml @@ -25,46 +25,47 @@ + on-click="this.onAddAddressClick()"/>
-
+
- + -
-
+
+
- - + val="{{address.id}}" + tip="_SetAsDefault" + name="test"/> +
+
+

+ {{address.nickname}} +

+

+ {{address.street}} +

+

+ {{address.postalCode}}, {{address.city}} +

+
+
+ +
-

- -

-

- -

-

- , - -

diff --git a/forms/account/address/address.js b/forms/account/address/address.js index db430998..163c57aa 100644 --- a/forms/account/address/address.js +++ b/forms/account/address/address.js @@ -8,9 +8,9 @@ Hedera.Address = new Class({ new Sql.Function({schema: 'account', name: 'myUser_getId'})); }, - onStatusChange: function(form) { - if (form.ready && this.$('address').value == 0) - form.insertRow(); + onStatusChange: function() { + if (this.$('iter').ready && this.$('address').value == 0) + this.$('iter').insertRow(); }, onOperationsDone: function() { diff --git a/forms/account/address/style.css b/forms/account/address/style.css index 1fa559d2..e69de29b 100644 --- a/forms/account/address/style.css +++ b/forms/account/address/style.css @@ -1,16 +0,0 @@ - -.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 a309a580..6a1b5aff 100644 --- a/forms/account/address/ui.xml +++ b/forms/account/address/ui.xml @@ -2,13 +2,13 @@ - + + on-operations-done="this.onOperationsDone()"> SELECT a.id, a.street, a.nickname, a.city, a.postalCode, a.provinceFk, p.countryFk FROM myAddress a @@ -23,67 +23,74 @@
-

AddEditAddress

+

Configuration

- + on-click="this.onReturnClick()"/> +
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - - - 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/locale/ca.yml b/forms/account/conf/locale/ca.yml index 82241540..7fb9a5fa 100644 --- a/forms/account/conf/locale/ca.yml +++ b/forms/account/conf/locale/ca.yml @@ -1,4 +1,5 @@ Configuration: Configuració +Personal information: Dades personals Username: Nom d'usuari Password: Contrasenya Email: Correu electrònic @@ -9,7 +10,7 @@ Receive invoices by email: Rebre factures per correu electrònic Old password: Contrasenya antiga New password: Nova contrasenya Repeat password: Repetir contrasenya -Info: Info +Requirements: Requisits Modify: Modificar Password requirements: Requisits de contrasenya characters long: caràcters de longitud diff --git a/forms/account/conf/locale/en.yml b/forms/account/conf/locale/en.yml index 20de204a..c88631be 100644 --- a/forms/account/conf/locale/en.yml +++ b/forms/account/conf/locale/en.yml @@ -1,4 +1,5 @@ Configuration: Configuration +Personal information: Personal information Username: Username Password: Password Email: Email @@ -9,7 +10,7 @@ Receive invoices by email: Receive invoices by email Old password: Old password New password: New password Repeat password: Repeat password -Info: Info +Requirements: Requirements Modify: Modify Password requirements: Password requirements characters long: characters long diff --git a/forms/account/conf/locale/es.yml b/forms/account/conf/locale/es.yml index 66992c54..3012d755 100644 --- a/forms/account/conf/locale/es.yml +++ b/forms/account/conf/locale/es.yml @@ -1,4 +1,5 @@ Configuration: Configuración +Personal information: Datos personales Username: Nombre de usuario Password: Contraseña Email: Correo electrónico @@ -9,7 +10,7 @@ Receive invoices by email: Recibir facturas por correo electrónico Old password: Contaseña antigua New password: Nueva contraseña Repeat password: Repetir contraseña -Info: Info +Requirements: Requisitos Modify: Modificar Password requirements: Requisitos de constraseña characters long: carácteres de longitud diff --git a/forms/account/conf/locale/fr.yml b/forms/account/conf/locale/fr.yml index ba47177f..6ae14ca8 100644 --- a/forms/account/conf/locale/fr.yml +++ b/forms/account/conf/locale/fr.yml @@ -1,4 +1,5 @@ Configuration: Configuration +Personal information: Informations personnelles Username: Utilisateur Password: Mot de passe Email: Courriel @@ -9,7 +10,7 @@ Receive invoices by email: Recevoir des factures par e-mail Old password: Ancien mot de passe New password: Nouveau mot de passe Repeat password: Répéter le mot de passe -Info: Info +Requirements: Exigences Modify: Modifier Password requirements: Mot de passe exigences characters long: Longs caractères diff --git a/forms/account/conf/locale/pt.yml b/forms/account/conf/locale/pt.yml index a7430e50..51506ae1 100644 --- a/forms/account/conf/locale/pt.yml +++ b/forms/account/conf/locale/pt.yml @@ -1,4 +1,5 @@ Configuration: Configuração +Personal information: Dados pessoais Username: Nome de usuario Password: Palavra-Passe Email: E-Mail @@ -9,7 +10,7 @@ Receive invoices by email: Receber facturas por e-mail Old password: Palavra-Passe antiga New password: Nova Palavra-Passe Repeat password: Repetir Palavra-Passe -Info: Info +Requirements: Requisitos Modify: Modificar Password requirements: Requisitos de Palavra-Passe characters long: caracteres diff --git a/forms/account/conf/style.css b/forms/account/conf/style.css index 5cb03475..13dbdcf8 100644 --- a/forms/account/conf/style.css +++ b/forms/account/conf/style.css @@ -1,33 +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; -} - -.pass-change -{ - max-width: 15em; -} - -.pass-info -{ - width: 15em; -} -.pass-info ul -{ +.pass-info ul { list-style-type: none; } diff --git a/forms/account/conf/ui.xml b/forms/account/conf/ui.xml index 28c315fb..d8f3119a 100644 --- a/forms/account/conf/ui.xml +++ b/forms/account/conf/ui.xml @@ -27,49 +27,65 @@ + on-click="this.onAddressesClick()"/> + on-click="this.onPassChangeClick()"/>
-
-
-
- - -
-
- - -
-
- - -
-
- - - - - SELECT code, name FROM language WHERE isActive - - - -
-
- +
+
+ Personal information +
+
+ +
+
+ + +
+
+ +
+
+ + + + SELECT code, name FROM language WHERE isActive + + + +
+
+
+ Receive invoices by email +
-
-
+
+
+
+ Change password +
- -
@@ -97,10 +113,10 @@ -
-

+
+
Password requirements -
+

  • diff --git a/forms/admin/access-log/access-log.js b/forms/admin/access-log/access-log.js index 8efbd52a..aa58beda 100644 --- a/forms/admin/access-log/access-log.js +++ b/forms/admin/access-log/access-log.js @@ -1,6 +1,5 @@ -Hedera.AccessLog = new Class -({ +Hedera.AccessLog = new Class({ Extends: Hedera.Form }); diff --git a/forms/admin/access-log/style.css b/forms/admin/access-log/style.css index 9a6b0cfe..b9edd1c4 100644 --- a/forms/admin/access-log/style.css +++ b/forms/admin/access-log/style.css @@ -1,36 +1,12 @@ -.access-log -{ - padding: 1em; -} -.access-log .box -{ - max-width: 25em; - margin: 0 auto; -} -.access-log .form -{ - padding: 2em; -} -.access-log .form > p -{ + +.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; +.access-log .htk-list { + margin-top: 16px; } diff --git a/forms/admin/access-log/ui.xml b/forms/admin/access-log/ui.xml index 33cd2340..732def39 100644 --- a/forms/admin/access-log/ui.xml +++ b/forms/admin/access-log/ui.xml @@ -2,11 +2,14 @@ - + - SELECT Id_Cliente, Cliente, Telefono, movil - FROM vn2008.Clientes WHERE Id_Cliente = #user + SELECT u.id, u.name user, u.nickname, u.email, c.phone, r.name role + FROM account.user u + JOIN account.role r ON r.id = u.role + LEFT JOIN vn.client c ON c.id = u.id + WHERE u.id = #user @@ -20,55 +23,44 @@

    AccessLog

-
+
-

- -

-

- -

-

- -

-

- -

+

+

# -

+

+

+

-
-
- - - - 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}} +

+
+
+ +
diff --git a/forms/admin/connections/connections.js b/forms/admin/connections/connections.js index ff058c12..29b44b14 100644 --- a/forms/admin/connections/connections.js +++ b/forms/admin/connections/connections.js @@ -4,33 +4,23 @@ Hedera.Connections = new Class({ ,_timeoutId: null - ,onModelStatusChange: function(model) { - if (!model.ready) + ,onModelStatusChange: function() { + if (!this.$('sessions').ready) return; if (this._timeoutId) clearTimeout(this._timeoutId); - this._timeoutId = setTimeout(this.onRefreshClick.bind(this), 60000); + this._timeoutId = setTimeout( + () => this.$('sessions').refresh(), 60000); } ,deactivate: function() { clearTimeout(this._timeoutId); } - - ,onRefreshClick: function() { - this.$('sessions').refresh(); - } - ,onAccessLogClick: function(button, form) { - this.hash.set({ - form: 'admin/access-log' - ,user: form.get('userId') - }); - } - - ,onChangeUserClick: function(button, form) { - this.gui.supplantUser(form.get('user'), + ,onChangeUserClick: function(userName) { + this.gui.supplantUser(userName, this._onUserSupplant.bind(this)); } diff --git a/forms/admin/connections/style.css b/forms/admin/connections/style.css index b27e9449..b7ac80ac 100644 --- a/forms/admin/connections/style.css +++ b/forms/admin/connections/style.css @@ -1,44 +1,6 @@ -.connections -{ - padding: 1em; -} -.connections .box -{ - max-width: 25em; - margin: 0 auto; -} -.action-bar .connections-sum -{ + +.action-bar .connections-sum { padding: .4em; - margin-top: .9em; - margin-right: .5em; background-color: #1e88e5; - border-radius: 0.1em; - box-shadow: 0 0 0.4em #666; + border-radius: .1em; } - -/* 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 29a9ceb3..6482b5c4 100644 --- a/forms/admin/connections/ui.xml +++ b/forms/admin/connections/ui.xml @@ -6,7 +6,7 @@ + on-click="$.sessions.refresh()"/>
-
- - - - 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 - - + + -
- - + 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 0c32d69c..f79beab4 100644 --- a/forms/admin/items/style.css +++ b/forms/admin/items/style.css @@ -1,41 +1,6 @@ -.items -{ - padding: 1em; -} -.items .box -{ - max-width: 25em; - margin: 0 auto; -} -/* Row */ - -.items .row -{ - padding: 1em; - border-bottom: 1px solid #DDD; +.items .item .photo { + border-radius: 50%; + height: 80px; + width: 80px; } -.items .row > .photo -{ - margin-right: 1em; - float: left; - border-radius: 3%; - height: 5.5em; - width: 5.5em; -} -.items .row > p -{ - margin: .1em 0; - margin-left: 5em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -/* Topbar */ - -.action-bar .htk-search-entry -{ - margin: .8em .6em; -} - diff --git a/forms/admin/items/ui.xml b/forms/admin/items/ui.xml index 41fbf780..974c60f0 100644 --- a/forms/admin/items/ui.xml +++ b/forms/admin/items/ui.xml @@ -10,27 +10,30 @@
-
- - - 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 - - - - - - - -
+ + + 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/links.js b/forms/admin/links/links.js index f19f14a1..4f761884 100644 --- a/forms/admin/links/links.js +++ b/forms/admin/links/links.js @@ -1,11 +1,5 @@ -Hedera.Links = new Class -({ +Hedera.Links = new Class({ Extends: Hedera.Form - - ,repeaterFunc: function (res, form) - { - res.$('link').href = form.get ('link'); - } }); diff --git a/forms/admin/links/style.css b/forms/admin/links/style.css index b74a6af2..4ec8fa2c 100644 --- a/forms/admin/links/style.css +++ b/forms/admin/links/style.css @@ -1,38 +1,50 @@ -.cpanel -{ - padding: 1em; +.cpanel .items > div { + max-width: 900px; + display: flex; + flex-wrap: wrap; + justify-content: center; + gap: 16px; + margin: 0 auto; } -.cpanel .box -{ - max-width: 30em; +.cpanel .item { + display: flex; + flex-direction: column; + align-items: center; + margin: 0; + width: 140px; + padding: 15px; + text-align: center; + transition: background-color 250ms ease-out; } - -/* Items */ - -.cpanel .item -{ - display: block; - padding: 1em; - border-bottom: 1px solid #DDD; -} -.cpanel .item:hover -{ +.cpanel .item:hover { background-color: rgba(1, 1, 1, 0.05); } -.cpanel .item > .htk-image -{ +.cpanel .item > .htk-image { + display: flex; + justify-content: center; + align-items: center; margin: 0; - margin-right: 1em; float: left; - max-height: 2.8em; - max-width: 2.8em; + height: 80px; } -.cpanel .item > p -{ +.cpanel .item > .htk-image > img { + max-height: 60px; + max-width: 60px; + padding: 0; +} +.cpanel .item > h6 { + flex: none; margin: .1em 0; + font-size: .9rem; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } -.cpanel .item > p.important -{ - font-size: 1.2em; +.cpanel .item > .text-secondary { + flex: none; + margin: 0; + font-size: .8rem; + height: 40px; + overflow: hidden; } diff --git a/forms/admin/links/ui.xml b/forms/admin/links/ui.xml index 79540fd9..c5e166c9 100644 --- a/forms/admin/links/ui.xml +++ b/forms/admin/links/ui.xml @@ -3,30 +3,29 @@

ControlPanel

-
- - - - SELECT image, name, description, link FROM link - ORDER BY name - - + + - - -

- -

-

- -

- + SELECT image, name, description, link FROM link + ORDER BY name - -
+ + + + +
+ {{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 47d90ce5..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: 25em; - padding: 2em; -} - /* 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/queries/queries.js b/forms/admin/queries/queries.js index cc2bb678..5beee6b1 100644 --- a/forms/admin/queries/queries.js +++ b/forms/admin/queries/queries.js @@ -1,102 +1,91 @@ -Hedera.Queries = new Class -({ +Hedera.Queries = new Class({ Extends: Hedera.Form - ,activate: function () - { + ,activate: function() { this.$('result-index').value = 0; } - ,clean: function () - { - if (this._grid) - { - this.$('grid-holder').removeChild (this._grid.node); - this._grid.unref (); + ,clean: function() { + if (this._grid) { + this.$('grid-holder').removeChild(this._grid.node); + this._grid.unref(); this._grid = null; } } - ,_onExecuteClick: function () - { - this.clean (); + ,onExecuteClick: function() { + this.clean(); - var model = new Db.Model ({ + 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); + model.on('status-changed', this.onModelChange, this); } - ,_onCleanClick: function () - { - this.clean (); + ,onCleanClick: function() { + this.clean(); } - ,_onModelChange: function (model, status) - { - if (status !== Db.Model.Status.LOADING) - { - model.disconnect ('status-changed', this._onModelChange, this); - model.unref (); + ,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!')); + Htk.Toast.showMessage(_('Query executed!')); var gridHolder = this.$('grid-holder'); if (gridHolder.firstChild) - gridHolder.removeChilds (gridHolder.firstChild); + gridHolder.removeChilds(gridHolder.firstChild); - var grid = new Htk.Grid (); + var grid = new Htk.Grid(); var columns = model.columns; - for (var i = 0; i < columns.length; i++) - { + for (var i = 0; i < columns.length; i++) { var c = columns[i]; - switch (c.type) - { + switch (c.type) { case Db.Conn.Type.BOOLEAN: - var column = new Htk.ColumnCheck (); + var column = new Htk.ColumnCheck(); break; case Db.Conn.Type.INTEGER: - var column = new Htk.ColumnSpin (); + var column = new Htk.ColumnSpin(); break; case Db.Conn.Type.DOUBLE: - var column = new Htk.ColumnSpin ({digits: 2}); + var column = new Htk.ColumnSpin({digits: 2}); break; case Db.Conn.Type.DATE: - var column = new Htk.ColumnDate ({format: '%a, %e %b %Y'}); + 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'}); + var column = new Htk.ColumnDate({format: '%a, %e %b %Y, %T'}); break; case Db.Conn.Type.STRING: default: - var column = new Htk.ColumnText (); + var column = new Htk.ColumnText(); } - column.setProperties ({ + column.setProperties({ title: c.name, editable: this.$('updatable').value, columnIndex: i }); - grid.appendColumn (column); + grid.appendColumn(column); } grid.model = model; - gridHolder.appendChild (grid.node); + gridHolder.appendChild(grid.node); this._grid = grid; - } }); diff --git a/forms/admin/queries/style.css b/forms/admin/queries/style.css index e3c925ca..c2d5117b 100644 --- a/forms/admin/queries/style.css +++ b/forms/admin/queries/style.css @@ -1,25 +1,20 @@ -.queries -{ +.queries { padding: 1em; } -.queries .box -{ - max-width: 40em; +.queries .box { + max-width: 600px; margin: 0 auto; } -.queries .form -{ +.queries .form { box-sizing: border-box; padding: 2em; } -.queries textarea -{ +.queries textarea { display: block; width: 100%; height: 8em; } -.queries .result -{ +.queries .result { margin-top: 1em; overflow: auto; } diff --git a/forms/admin/queries/ui.xml b/forms/admin/queries/ui.xml index 6d1b6745..863eccad 100644 --- a/forms/admin/queries/ui.xml +++ b/forms/admin/queries/ui.xml @@ -6,11 +6,11 @@ + on-click="this.onExecuteClick()"/> + on-click="this.onCleanClick()"/>
diff --git a/forms/admin/users/style.css b/forms/admin/users/style.css index 30caf897..586a0d0e 100644 --- a/forms/admin/users/style.css +++ b/forms/admin/users/style.css @@ -1,45 +1,11 @@ -.users -{ - padding: 1em; + +.users-box.item > .actions { + display: flex; } -.users .box -{ - max-width: 30em; - margin: 0 auto; -} -.users-box -{ - padding: 1em; - border-bottom: 1px solid #DDD; -} -.users-box > button -{ - float: right; - margin: 0; -} -.users-box > p -{ - margin: .2em 0; -} -.users-box > p.important -{ - font-size: 1.2em; -} -.users-box > .disabled -{ - float: right; +.users-box .disabled { 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 0b41e395..64e8ac00 100644 --- a/forms/admin/users/ui.xml +++ b/forms/admin/users/ui.xml @@ -11,52 +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 - - - - - - - + + -
- - + 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/users/users.js b/forms/admin/users/users.js index ccca530c..05f45af2 100644 --- a/forms/admin/users/users.js +++ b/forms/admin/users/users.js @@ -2,13 +2,6 @@ Hedera.Users = new Class({ Extends: Hedera.Form - ,onAccessLogClick: function(button, form) { - this.hash.set({ - 'form': 'admin/access-log' - ,'user': form.get('id') - }); - } - ,rendererFunc: function(scope, form) { var isEnabled = form.get('active') scope.$('disabled').style.display = isEnabled ? @@ -17,8 +10,8 @@ Hedera.Users = new Class({ 'block' : 'none'; } - ,onChangeUserClick: function(button, form) { - this.gui.supplantUser(form.get('name'), + ,onChangeUserClick: function(userName) { + this.gui.supplantUser(userName, this.onUserSupplant.bind(this)); } diff --git a/forms/admin/visits/style.css b/forms/admin/visits/style.css index 4ccdc136..e8dae95f 100644 --- a/forms/admin/visits/style.css +++ b/forms/admin/visits/style.css @@ -1,46 +1,12 @@ -.visits -{ - padding: 1em; + +.visits .box { + margin-bottom: 16px; } -.visits .box -{ - max-width: 25em; - margin: 0 auto; +.visits .box:last-child { + margin-bottom: 0; } -.visits .form -{ - padding: 1.5em; - max-width: 20em; -} -.visits .summary -{ - margin-top: 1em; -} -.visits .summary p -{ - padding: 1.5em; +.visits .summary p { font-size: 1.4em; + margin: 0; text-align: right; } - -/* List */ - -.visits .list -{ - margin-top: 1em; -} -.visits .item -{ - display: block; - padding: 1em; - border-bottom: 1px solid #DDD; -} -.visits .item > p -{ - margin: .1em 0; -} -.visits .item > p.important -{ - font-size: 1.2em; -} - diff --git a/forms/admin/visits/ui.xml b/forms/admin/visits/ui.xml index ae790c7f..c0b32d53 100644 --- a/forms/admin/visits/ui.xml +++ b/forms/admin/visits/ui.xml @@ -6,15 +6,15 @@ + on-click="this.onRefreshClick()"/> + on-click="this.onSessionsClick()"/>
-
-
+
+
@@ -28,27 +28,28 @@
-
-
-

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

-
-
- +
+

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

+
+ SELECT browser, @@ -73,20 +74,18 @@
-

- - - - -

-

- - visits, - - news -

-

- -

+
+

+ {{iter.browser}} {{iter.minVersion}} - {{iter.maxVersion}} +

+

+ {{iter.visits}} visits, + {{iter.newVisits}} news +

+

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

+
diff --git a/forms/admin/visits/visits.js b/forms/admin/visits/visits.js index fd4c40b0..7c1a7674 100644 --- a/forms/admin/visits/visits.js +++ b/forms/admin/visits/visits.js @@ -1,22 +1,18 @@ -Hedera.Visits = new Class -({ +Hedera.Visits = new Class({ Extends: Hedera.Form - ,activate: function () - { - this.$('from').value = new Date (); - this.$('to').value = new Date (); + ,activate: function() { + this.$('from').value = new Date(); + this.$('to').value = new Date(); } - ,onRefreshClick: function () - { - this.$('visits').refresh (); + ,onRefreshClick: function() { + this.$('visits').refresh(); } - ,onSessionsClick: function () - { - this.hash.set ({'form': 'admin/connections'}); + ,onSessionsClick: function() { + this.hash.set({form: 'admin/connections'}); } }); diff --git a/forms/agencies/packages/packages.js b/forms/agencies/packages/packages.js index b71a13b6..14c16e14 100644 --- a/forms/agencies/packages/packages.js +++ b/forms/agencies/packages/packages.js @@ -1,13 +1,11 @@ -Hedera.Packages = new Class -({ +Hedera.Packages = new Class({ Extends: Hedera.Form - ,onShowClick: function (column, agencyId) - { - this.hash.set ({ - 'form': 'agencies/provinces', - 'agency': agencyId + ,onShowClick: function(column, agencyId) { + this.hash.set({ + form: 'agencies/provinces', + agency: agencyId }); } }); diff --git a/forms/agencies/packages/style.css b/forms/agencies/packages/style.css index 42b69f97..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: 40em; - margin: 0 auto; -} diff --git a/forms/agencies/packages/ui.xml b/forms/agencies/packages/ui.xml index e41ede06..866bab74 100644 --- a/forms/agencies/packages/ui.xml +++ b/forms/agencies/packages/ui.xml @@ -3,7 +3,7 @@

ListByAgency

-
+
@@ -12,7 +12,7 @@ diff --git a/forms/agencies/provinces/style.css b/forms/agencies/provinces/style.css index cbf4d53f..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: 40em; - 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 98fa547d..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: 30em; - 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

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