Merge pull request 'refs #8480 Hide inactive items' (!101) from test into dev

Reviewed-on: #101

.dockerignore

@@ -0,0 +1,2 @@
+debian
+node_modules

.eslintrc.yml

@@ -8,4 +8,8 @@ rules:
     no-mixed-spaces-and-tabs: 0
     no-console: 0
     no-cond-assign: 0
-    no-unexpected-multiline: 0
+    no-unexpected-multiline: 0
+    brace-style: [error, 1tbs]
+    space-before-function-paren: [error, never]
+    padded-blocks: [error, never]
+    func-call-spacing: [error, never]

.gitignore

@@ -1,2 +1,6 @@
 node_modules
 build/
+dist/
+config.my.php
+.vscode/
+.quasar

Dockerfile

@@ -0,0 +1,52 @@
+# Not using buster because of bug: https://bugs.php.net/bug.php?id=78870
+FROM debian:bookworm-slim
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        curl \
+        ca-certificates \
+        gnupg2
+
+# Apache
+
+RUN apt-get install -y --no-install-recommends \
+        apache2 \
+        libapache2-mod-php \
+    && . /etc/apache2/envvars \
+    && ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log" \
+    && ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log" \
+    && ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log"
+
+RUN a2dissite 000-default
+
+# NodeJs
+
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+    && apt-get install -y --no-install-recommends nodejs
+
+# Hedera
+
+RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | tee /etc/apt/trusted.gpg.d/verdnatura.gpg \
+    && echo "deb http://apt.verdnatura.es/ bookworm main" \
+        > /etc/apt/sources.list.d/vn.list \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+        php-apcu \
+        php-image-text \
+        php-text-captcha \
+        php-zip \
+        hedera-web \
+        cron
+
+ARG BUILD_ID=unknown
+ARG VERSION
+ENV VERSION $VERSION
+RUN echo $VERSION
+
+RUN apt-get update \
+    && apt-get install -y php-vn-lib hedera-web=$VERSION \
+    && rm -rf /var/lib/apt/lists/*
+
+CMD ["apachectl", "-D", "FOREGROUND"]

Jenkinsfile

@@ -0,0 +1,102 @@
+#!/usr/bin/env groovy
+
+def BRANCH_ENV = [
+    test: 'test',
+    master: 'production'
+]
+def remote = [:]
+
+node {
+    stage('Setup') {
+        env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev'
+
+        echo "NODE_NAME: ${env.NODE_NAME}"
+        echo "WORKSPACE: ${env.WORKSPACE}"
+    }
+}
+pipeline {
+    agent any
+    environment {
+        PROJECT_NAME = 'hedera-web'
+    }
+    stages {
+        stage('Debuild') {
+            when {
+                anyOf {
+                    branch 'master'
+                    branch 'test'
+                }
+            }
+            agent {
+                docker {
+                    image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn7'
+                    registryUrl 'https://registry.verdnatura.es/'
+                    registryCredentialsId 'docker-registry'
+                }
+            }
+            steps {
+                sh 'debuild -us -uc -b'
+                sh 'mkdir -p debuild'
+                sh 'mv ../hedera-web_* debuild'
+
+                script {
+                    def files = findFiles(glob: 'debuild/*.changes')
+                    files.each { file -> env.CHANGES_FILE = file.name }
+                }
+
+                configFileProvider([
+                    configFile(fileId: "dput.cf", variable: 'DPUT_CONFIG')
+                ]) {
+                    sshagent(credentials: ['jenkins-agent']) {
+                        sh 'dput --config "$DPUT_CONFIG" verdnatura "debuild/$CHANGES_FILE"'
+                    }
+                }
+            }
+        }
+        stage('Deploy') {
+            when {
+                anyOf {
+                    branch 'master'
+                    branch 'test'
+                }
+            }
+            environment {
+                CREDS = credentials('docker-registry')
+                IMAGE = "$REGISTRY/verdnatura/hedera-web"
+            }
+            steps {
+                script {
+                    def packageJson = readJSON file: 'package.json'
+                    env.VERSION = "${packageJson.version}"
+                    env.TAG = "${packageJson.version}-build${env.BUILD_ID}"
+                }
+
+                sh 'docker-compose build --build-arg BUILD_ID=$BUILD_ID --parallel'
+                sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
+                sh 'docker push $IMAGE:$TAG'
+
+                script {
+                    if (env.BRANCH_NAME == 'master') {
+                        sh 'docker tag $IMAGE:$TAG $IMAGE:latest'
+                        sh 'docker push $IMAGE:latest'
+                    }
+                }
+
+                withKubeConfig([
+                    serverUrl: "$KUBERNETES_API",
+                    credentialsId: 'kubernetes',
+                    namespace: 'salix'
+                ]) {
+                    sh 'kubectl set image deployment/hedera-web-$BRANCH_NAME hedera-web-$BRANCH_NAME=$IMAGE:$TAG'
+                    sh 'kubectl set image deployment/hedera-web-cron-$BRANCH_NAME hedera-web-cron-$BRANCH_NAME=$IMAGE:$TAG'
+                }
+            }
+        }
+    }
+    post {
+        unsuccessful {
+            setEnv()
+            sendEmail()
+        }
+    }
+}

README.md

@@ -1,3 +1,58 @@
 # Hedera
 
-Hedera is the main page for Verdnatura.
+Hedera is the main web shop page for Verdnatura.
+
+## Prerequisites
+
+Required applications.
+ * PHP >= 8.4
+ * Node.js >= 20.0
+
+Take a look to *debian/control* file to see additional dependencies.
+
+Copy config.php to *config.my.php* and place your DB config there.
+
+### Installing dependencies and launching
+
+Pull from repository.
+
+Run this commands on project root directory to install Node dependencies.
+```
+$ npm install
+```
+
+Install project dependences (debian/control).
+
+Pull from repository [php-vn-lib](https://gitea.verdnatura.es/verdnatura/php-vn-lib) and install [dependences](https://gitea.verdnatura.es/verdnatura/php-vn-lib/src/branch/master/debian/control) of this project.
+
+Configure config.php file.
+
+Launch project fronted.
+```
+$ npm run front
+```
+
+Launch salix backend.
+```
+$ npm run db
+$ npm run back
+```
+Launch project backend.
+```
+$ php -S 127.0.0.1:3001 -t . index.php
+```
+
+### Command line
+
+Run server side method from command line.
+```
+$ php hedera-web.php -m method_path 
+```
+
+## Built with
+
+ * [nodejs](https://nodejs.org/)
+ * [php](https://www.php.net/)
+ * [Webpack](https://webpack.js.org/)
+ * [MooTools](https://mootools.net/)
+ * [TinyMCE](https://www.tinymce.com/)

apache.conf

@@ -1,14 +1,22 @@
-# Alias /hedera-web /usr/share/hedera-web/
-# Alias /image-db /var/lib/hedera-web/image-db/
-
 <IfModule mod_mime.c>
 	AddType text/x-yaml .yml
 </IfModule>
 
+<IfModule mpm_prefork_module>
+	ServerLimit 30
+	MaxRequestWorkers 30
+	MaxRequestsPerChild 1000
+</IfModule>
+
+<VirtualHost *:80>
+	DocumentRoot /usr/share/hedera-web/
+</VirtualHost>
+
 <Directory /usr/share/hedera-web/>
 	Options -Indexes -FollowSymLinks
 	AllowOverride None
 	Require all granted
+	SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 	
 	<FilesMatch "\.(css|js|json|yml|php|xml|html|svg)$">
 		SetOutputFilter DEFLATE
@@ -16,13 +24,7 @@
 	
 	<FilesMatch "\.(ttf|otf|eot|woff)$">
 		<IfModule mod_headers.c>
-		Header set Access-Control-Allow-Origin "*"
+			Header set Access-Control-Allow-Origin "*"
 		</IfModule>
 	</FilesMatch>
 </Directory>
-
-<Directory /var/lib/hedera-web/image-db/>
-	Options Indexes FollowSymLinks MultiViews
-	AllowOverride FileInfo Options
-	Require all granted
-</Directory>

app.js

@@ -1,71 +1,41 @@
+__webpack_public_path__ = _PUBLIC_PATH;
 
-var assetsPath;
+import 'promise-polyfill/src/polyfill';
+import 'hedera/hedera';
+const locales = require('./import').locales;
+const packageJson = require('./package.json');
 
-if (_DEV_MODE)
+window.onload = function() {
-{
+	loadLocale(main);
-	var host = window.location.host.split(':')[0];
-	assetsPath = 'http://'+ host +':'+ _DEV_SERVER_PORT +'/'+ _PUBLIC_PATH;
-}
-else
-	assetsPath = _PUBLIC_PATH;
-
-__webpack_public_path__ = assetsPath;
-
-require ('hedera/hedera');
-
-window.onload = function ()
-{
-	loadLocale (main);
 }
 
-function main (req)
+function main() {
-{
+	Vn.setVersion(packageJson.version);
-	if (req)
+	const hederaWeb = new Hedera.App();
-		onLocaleLoad (req);
+	window.hederaWeb = hederaWeb;
-
+	hederaWeb.run();
-	hederaWeb = new Hedera.App ();
-	hederaWeb.run ();
 }
 
-function loadLocale (cb)
+function loadLocale(callback) {
-{
+	Vn.Locale.init();
-	Vn.Locale.init ();
 	var lang = Vn.Locale.language;
 
-	var req = require.context ('js', true, /locale\/en.yml$/);
+	var req = require.context('js', true, /locale\/en.yml$/);
-	onLocaleLoad (req);
+	onLocaleLoad(Vn.Locale.fallbackLang, req);
 
-	switch (lang)
+	const loadFn = locales[lang];
-	{
+	if (loadFn)
-		case 'ca':
+		loadFn(function(req) {
-			require ([], function () {
+			onLocaleLoad(lang, req);
-				cb (require.context ('js', true, /locale\/ca.yml$/)); });
+			callback();
-			break;
+		});
-		case 'es':
+	else
-			require ([], function () {
+		callback();
-				cb (require.context ('js', true, /locale\/es.yml$/)); });
-			break;
-		case 'fr':
-			require ([], function () {	
-				cb (require.context ('js', true, /locale\/fr.yml$/)); });
-			break;
-		case 'mn':
-			require ([], function () {	
-				cb (require.context ('js', true, /locale\/mn.yml$/)); });
-			break;
-		case 'pt':
-			require ([], function () {	
-				cb (require.context ('js', true, /locale\/pt.yml$/)); });
-			break;
-		default:
-			cb ();
-	}
 }
 
-function onLocaleLoad (req)
+function onLocaleLoad(lang, req) {
-{
+	var keys = req.keys();
-	var keys = req.keys ();
 
 	for (var i = 0; i < keys.length; i++)
-		Vn.Locale.add (req (keys[i]));
+		Vn.Locale.add(req(keys[i]), lang);
 }

config.php

@@ -12,18 +12,19 @@
  *
  *  - http://www.mydomain.org -> config.www.php
  *  - http://test.mydomain.org -> config.test.php
+ * 
+ * Put the password in base64.
  */
 return [
-
+	/**
-/**
+	 * Database parameters.
- * Database parameters.
+	 */
- **/
+	'db' => [
-'db' => [
+		'host'   => 'localhost'
-	 'host'   => 'localhost'
+		,'port'   => 3306
-	,'port'   => 3306
+		,'schema' => 'hedera'
-	,'schema' => 'hedera-web'
+		,'user'   => 'hedera-web'
-	,'user'   => 'hedera-web'
+		,'pass'   => '' // base64 encoded
-	,'pass'   => ''
+		,'tz'     => 'Europe/madrid'
-]
+	]
-
 ];

debian/changelog

@@ -1,4 +1,4 @@
-hedera-web (1.405.78) stable; urgency=low
+hedera-web (25.4.4) stable; urgency=low
 
   * Initial Release.
 

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -5,12 +5,12 @@ Build-Depends: build-essential, debhelper, nodejs
 Standards-Version: 3.9.3
 Section: misc
 Homepage: https://verdnatura.es
-Vcs-Git: https://git.verdnatura.es/hedera-web
+Vcs-Git: https://gitea.verdnatura.es/verdnatura/hedera-web
 
 Package: hedera-web
 Architecture: all
-Depends: apache2 | httpd, nodejs, php5-cli, php5-mysql, php5-mcrypt, php5-ldap, php5-ssh2, php-vn-lib
+Depends: apache2 | httpd, nodejs, php-cli, php-vn-lib, php-apcu, php-imap, php-soap, libphp-phpmailer, php-gd, php-pear
-Suggests: php-text-captcha, php5-imap, tinymce
+Suggests: php-image-text, php-text-captcha, php-zip, cron
 Section: misc
 Priority: optional
 Description: Verdnatura's web page

debian/copyright

@@ -1,6 +1,6 @@
 Format: http://dep.debian.net/deps/dep5
 Name: hedera-web
-Source: git://www.verdnatura.es/var/git/hedera-web
+Source: https://gitea.verdnatura.es/verdnatura/hedera-web
 
 Files: *
 Copyright: 2011-2015 Juan Ferrer Toribio <juan@verdnatura.es>

debian/cron.d

@@ -1,7 +1,8 @@
 MAILTO=webmaster
-*/4 *  * * *   root  hedera-web.php -m tpv/confirm-mail
+*/1    *  * * *   root  hedera-web.php -m misc/mail
-*/2 *  * * *   root  hedera-web.php -m edi/load
+*/2    *  * * *   root  hedera-web.php -m edi/load
-0 23   * * *   root  hedera-web.php -m edi/clean
+0     23  * * *   root  hedera-web.php -m edi/clean
-0 5    * * *   root  hedera-web.php -m edi/update
+0      5  * * *   root  hedera-web.php -m edi/update
-*/1 *  * * *   root  hedera-web.php -m misc/mail
+0      0  * * *   root  hedera-web.php -m image/sync
-0 5    * * *   root  hedera-web.php -m misc/exchange-rate
+0      1  * * *   root  /usr/share/hedera-web/utils/image-clean.sh > /dev/null
+0    */1  * * *   root  /usr/share/hedera-web/utils/update-browscap.sh > /dev/null

debian/install

@@ -1,4 +1,6 @@
-conf/*                      etc/hedera-web
+apache.conf                 etc/hedera-web
+config.php                  etc/hedera-web
+php.ini                     etc/hedera-web
 web                         usr/share/php/vn
 doc/*                       usr/share/doc/hedera-web
 hedera-web.php              usr/share/hedera-web
@@ -8,8 +10,10 @@ js                          usr/share/hedera-web
 pages                       usr/share/hedera-web
 reports                     usr/share/hedera-web
 rest                        usr/share/hedera-web
+utils                       usr/share/hedera-web
 index.php                   usr/share/hedera-web
 package.json                usr/share/hedera-web
 build                       usr/share/hedera-web
 README.md                   usr/share/hedera-web
 webpack.config.json         usr/share/hedera-web
+build-deps/node_modules     usr/share/hedera-web

debian/links

@@ -1,2 +1,3 @@
+usr/share/hedera-web/hedera-web.php  usr/bin/hedera-web.php
 etc/hedera-web/apache.conf           etc/apache2/conf-available/hedera-web.conf
-usr/share/hedera-web/hedera-web.php  usr/bin/hedera-web.php
+etc/hedera-web/php.ini               etc/php/8.2/apache2/conf.d/99-hedera-web.ini

debian/postinst

@@ -2,14 +2,15 @@
 
 set -e
 
-(cd /usr/share/hedera-web && npm install --production)
+/usr/share/hedera-web/utils/update-browscap.sh > /dev/null
 
 if [ -e /usr/share/apache2/apache2-maintscript-helper ]
 then
     . /usr/share/apache2/apache2-maintscript-helper
+    apache2_invoke enmod rewrite
+    apache2_invoke enmod headers
     apache2_invoke enconf hedera-web.conf
 fi
 
-service php5-fpm restart
+#service php7.3-fpm restart
-service cron restart
+#service cron restart
-

debian/postrm

@@ -8,5 +8,5 @@ then
     apache2_invoke disconf hedera-web.conf
 fi
 
-rm -rf /usr/share/hedera-web/node_modules
+#rm -rf /usr/share/hedera-web/node_modules
-service cron restart
+#service cron restart

debian/rules

@@ -6,9 +6,13 @@
 	dh $@
 
 clean:
-	npm --production run clean
+	npm run clean
 	dh_clean $@
 	
 build:
-	npm --production run build
+	npm install --no-audit --prefer-offline
+	npm --omit=dev run build
 
+	mkdir -p build-deps
+	cp package.json package-lock.json build-deps
+	(cd build-deps && npm install --omit=dev --no-audit --prefer-offline)

debian/source.lintian-overrides

@@ -0,0 +1 @@
+hedera-web: package-contains-npm-ignore-file

docker-compose.yml

@@ -0,0 +1,9 @@
+version: '3.7'
+services:
+  main:
+    image: registry.verdnatura.es/verdnatura/hedera-web:${TAG:?}
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        - VERSION=${VERSION:?}

env.php

@@ -2,12 +2,11 @@
 
 require_once __DIR__.'/../php-vn-lib/env.php';
 
-set_include_path (__DIR__.PATH_SEPARATOR.get_include_path ());
+set_include_path(__DIR__.PATH_SEPARATOR.get_include_path());
 
 $vnAutoloadMap['vn/web'] = __DIR__.'/web';
 
 const _ENABLE_DEBUG = TRUE;
 const _DEV_MODE = TRUE;
-const _CONFIG_DIR = __DIR__.'/../../.config';
 const _LOG_DIR = '/tmp';
 const _DATA_DIR = '/tmp';

forms/account/address-list/address-list.js

@@ -1,42 +0,0 @@
-
-Hedera.AddressList = new Class
-({
-	Extends: Hedera.Form
-
-	,activate: function ()
-	{
-		this.$('user-model').setInfo ('c', 'myClient', 'hedera');
-		this.$('addresses').setInfo ('a', 'myAddress', 'hedera');
-	}
-	
-	,onAddAddressClick: function ()
-	{
-		this.hash.set ({
-			form: 'account/address',
-			address: 0
-		});
-	}
-	
-	,onReturnClick: function ()
-	{
-		window.history.back();
-	}
-	
-	,onRemoveAddressClick: function (button, form)
-	{
-		if (confirm (_('AreYouSureDeleteAddress')))
-		{
-			form.set ('isActive', false);
-			form.refresh ();
-		}
-	}
-	
-	,onEditAddressClick: function (button, form)
-	{
-		this.hash.set ({
-			form: 'account/address',
-			address: form.get ('id')
-		});
-	}
-});
-

forms/account/address-list/index.js

@@ -0,0 +1,43 @@
+import './style.scss';
+
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml')
+
+	,activate() {
+		this.$.userModel.setInfo('c', 'myClient', 'hedera');
+		this.$.addresses.setInfo('a', 'myAddress', 'hedera');
+	}
+	
+	,onAddAddressClick() {
+		this.hash.setAll({
+			form: 'account/address',
+			address: 0
+		});
+	}
+	
+	,onReturnClick() {
+		window.history.back();
+	}
+
+	,onSetDefaultClick(event, addressId) {
+		if (event.defaultPrevented) return;
+		this.$.defaultAddress.value = addressId;
+		Htk.Toast.showMessage(_('DefaultAddressModified'));
+	}
+	
+	,async onRemoveAddressClick(form) {
+		if (confirm(_('AreYouSureDeleteAddress'))) {
+			await form.set('isActive', false);
+			await form.refresh();
+		}
+	}
+	
+	,onEditAddressClick(address) {
+		this.hash.setAll({
+			form: 'account/address',
+			address
+		});
+	}
+});
+

forms/account/address-list/locale/ca.yml

@@ -1,7 +1,8 @@
-Addresses: Direccions
+Addresses: Adreces
 Return: Tornar
 AddAddress: Afegir adreça
 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

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

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

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

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

forms/account/address-list/style.css

@@ -1,48 +0,0 @@
-
-.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;
-}

forms/account/address-list/style.scss

@@ -0,0 +1,6 @@
+
+hedera-address-list {
+	.htk-list .side {
+		padding-right: 16px;
+	}
+}

forms/account/address-list/ui.xml

@@ -2,21 +2,16 @@
 <vn-group>
 	<db-form id="user-form">
 		<db-model property="model" id="user-model" updatable="true">
-			<custom>
+			SELECT id, defaultAddressFk
-				SELECT id, defaultAddressFk
+				FROM myClient c
-					FROM myClient c
-			</custom>
 		</db-model>
 	</db-form>
 	<db-model id="addresses" updatable="true">
-		<custom>
+		SELECT a.id, a.nickname, p.name province, a.postalCode,
-			SELECT a.id, a.nickname, p.name province, a.postalCode,
+		a.city, a.street, a.isActive
-			a.city, a.street, a.isActive, c.country
+			FROM myAddress a
-				FROM myAddress a
+			LEFT JOIN vn.province p ON p.id = a.provinceFk
-				LEFT JOIN vn.province p ON p.id = a.provinceFk
+				WHERE a.isActive
-				JOIN vn.country c ON c.id = p.countryFk
-					WHERE a.isActive
-		</custom>
 	</db-model>
 </vn-group>
 <div id="title">
@@ -26,46 +21,47 @@
 	<htk-bar-button
 		icon="add"
 		tip="_AddAddress"
-		on-click="onAddAddressClick"/>
+		on-click="this.onAddAddressClick()"/>
 </div>
-<div id="form" class="address-list">
+<div id="form" class="hedera-address-list">
-	<div class="box">
+	<div class="box vn-w-sm">
 		<htk-radio-group
 			id="default-address"
 			column="defaultAddressFk"
 			form="user-form"/>
-		<htk-repeater model="addresses" form-id="iter">
+		<htk-repeater model="addresses" form-id="address" class="htk-list">
 			<custom>
-			<div class="address">
+			<div class="item clickable" on-click="this.onSetDefaultClick($event, address.id)">
-				<div class="actions">
+				<div class="side">
 					<htk-radio
-						form="iter"
-						column="id"
 						radio-group="default-address"
-						tip="_SetAsDefault"/>
+						val="{{address.id}}"
-					<htk-button
+						tip="_SetAsDefault"
-						form="iter"
+						name="test"/>
-						column="id"
+				</div>
-						tip="_RemoveAddress"
+				<div class="content">
-						icon="delete"
+					<p class="important">
-						on-click="onRemoveAddressClick"/>
+						{{address.nickname}}
-					<htk-button
+					</p>
-						form="iter"
+					<p>
-						column="id"
+						{{address.street}}
-						tip="_EditAddress"
+					</p>
-						icon="edit"
+					<p>
-						on-click="onEditAddressClick"/>
+						{{address.postalCode}}, {{address.city}}
+					</p>
+				</div>
+				<div
+					class="actions"
+					on-click="$event.preventDefault()">
+					<htk-button
+						icon="delete"
+						tip="_RemoveAddress"
+						on-click="this.onRemoveAddressClick($iter)"/>
+					<htk-button
+						icon="edit"
+						tip="_EditAddress"
+						on-click="this.onEditAddressClick(address.id)"/>
 				</div>
-				<p class="important">
-					<htk-text form="iter" column="nickname"/>
-				</p>
-				<p>
-					<htk-text form="iter" column="street"/>
-				</p>
-				<p>
-					<htk-text form="iter" column="postalCode"/>, 
-					<htk-text form="iter" column="city"/>
-				</p>
 			</div>
 			</custom>
 		</htk-repeater>

forms/account/address/address.js

@@ -1,35 +0,0 @@
-
-Hedera.Address = new Class
-({
-	Extends: Hedera.Form
-
-	,activate: function ()
-	{
-		this.$('model').setInfo ('a', 'myAddress', 'hedera', ['id'], 'id');
-		this.$('model').setDefault ('clientFk', 'a',
-			new Sql.Function ({schema: 'account', name: 'userGetId'}));
-	}
-	
-	,onStatusChange: function (form)
-	{
-		if (form.ready && this.$('address').value == 0)
-			form.insertRow ();
-	}
-	
-	,onOperationsDone: function ()
-	{
-		Htk.Toast.showMessage (_('AddressChangedSuccessfully'));
-		this.onReturnClick ();
-	}
-
-	,onAcceptClick: function ()
-	{
-		this.$('iter').performOperations ();
-	}
-
-	,onReturnClick: function ()
-	{
-		window.history.back();
-	}
-});
-

forms/account/address/index.js

@@ -0,0 +1,20 @@
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml'),
+
+	activate() {
+		this.$.model.setInfo('a', 'myAddress', 'hedera', ['id'], 'id');
+		this.$.model.setDefault('clientFk', 'a',
+			new Sql.Function({schema: 'account', name: 'myUser_getId'}));
+	},
+	
+	onStatusChange() {
+		if (this.$.iter.ready && this.hash.$.address == 0)
+			this.$.iter.insertRow();
+	},
+	
+	onOperationsDone() {
+		Htk.Toast.showMessage(_('AddressChangedSuccessfully'));
+		window.history.back()
+	}
+});

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

forms/account/address/ui.xml

@@ -1,96 +1,86 @@
 <vn>
 <vn-group>
-	<vn-param id="address"/>
+	<vn-lot-query id="params">
-	<vn-hash-param key="address" param="address"/>
+		<vn-spec name="address" type="Number"/>
-	<db-form id="iter" on-status-changed="onStatusChange">
+	</vn-lot-query>
+	<db-form id="iter" on-status-changed="this.onStatusChange()">
 		<db-model
 		 	id="model"
 			property="model"
 			updatable="true"
 			mode="ON_DEMAND"
-			on-operations-done="onOperationsDone">
+			lot="params"
-			<custom>
+			on-operations-done="this.onOperationsDone()">
-				SELECT a.id, a.street, a.nickname, a.city,
+			SELECT a.id, a.street, a.nickname, a.city,
-						a.postalCode, a.provinceFk, c.id countryFk
+					a.postalCode, a.provinceFk, p.countryFk
-					FROM myAddress a
+				FROM myAddress a
-						LEFT JOIN vn.province p ON p.id = a.provinceFk
+					LEFT JOIN vn.province p ON p.id = a.provinceFk
-						JOIN vn.country c ON c.id = p.countryFk
+				WHERE a.id = #address
-					WHERE a.id = #address
-			</custom>
-			<sql-batch property="batch">
-				<custom>
-					<item name="address" param="address"/>
-				</custom>
-			</sql-batch>
 		</db-model>
 	</db-form>
 </vn-group>
 <div id="title">
-	<h1><t>AddEditAddress</t></h1>
+	<h1><t>Configuration</t></h1>
 </div>
 <div id="actions">
-	<htk-bar-button
-		icon="ok"
-		tip="_Accept"
-		on-click="onAcceptClick"/>
 	<htk-bar-button
 		icon="close"
 		tip="_Return"
-		on-click="onReturnClick"/>
+		on-click="window.history.back()"/>
+	<htk-bar-button
+		icon="check"
+		tip="_Accept"
+		on-click="iter.performOperations()"/>
 </div>
-<div id="form" class="address">
+<div id="form" class="hedera-address">
-	<div class="box">
+	<div class="form box vn-w-sm vn-pa-lg">
-		<div class="form">
+		<h5 class="vn-mb-md">
-			<div class="form-group">
+			<t>AddEditAddress</t>
-				<label><t>Name</t></label>
+		</h5>
-				<htk-entry column="nickname" form="iter"/>
+		<div class="form-group">
-			</div>
+			<htk-entry
-			<div class="form-group">
+				placeholder="_Name"
-				<label><t>Address</t></label>
+				form="iter" column="nickname"/>
-				<htk-entry column="street" form="iter"/>
+		</div>
-			</div>
+		<div class="form-group">
-			<div class="form-group">
+			<htk-entry
-				<label><t>City</t></label>
+				placeholder="_Address"
-				<htk-entry column="city" form="iter"/>
+				form="iter" column="street"/>
-			</div>
+		</div>
-			<div class="form-group">
+		<div class="form-group">
-				<label><t>ZipCode</t></label>
+			<htk-entry
-				<htk-entry column="postalCode" form="iter"/>
+				placeholder="_City"
-			</div>
+				form="iter" column="city"/>
-			<div class="form-group">
+		</div>
-				<label><t>Country</t></label>
+		<div class="form-group">
-				<htk-combo>
+			<htk-entry
-					<db-param
+				placeholder="_ZipCode"
-						id="country"
+				form="iter" column="postalCode"/>
-						property="param"
+		</div>
-						form="iter"
+		<div class="form-group">
-						column="countryFk"
+			<htk-combo
-						one-way="true"/>
+				placeholder="_Country"
-					<db-model property="model">
+				form="iter" column="countryFk"
-						<custom>
+				id="country"
-							SELECT id, country FROM vn.country
+				one-way="true"
-								ORDER BY country
+				one-time="true">
-						</custom>
+				<db-model property="model">
-					</db-model>
+					SELECT id, name FROM vn.country
-				</htk-combo>
+						ORDER BY name
-			</div>
+				</db-model>
-			<div class="form-group">
+			</htk-combo>
-				<label><t>Province</t></label>
+		</div>
-				<htk-combo column="provinceFk" form="iter">
+		<div class="form-group">
-					<db-model property="model">
+			<htk-combo
-						<custom>
+				placeholder="_Province"
-							SELECT id, name FROM vn.province
+				column="provinceFk"
-								WHERE countryFk = #country
+				form="iter">
-								ORDER BY name
+				<db-model property="model" lot="country">
-						</custom>
+					SELECT id, name FROM vn.province
-						<sql-batch property="batch">
+						WHERE countryFk = #id
-							<custom>
+						ORDER BY name
-								<item name="country" param="country"/>
+				</db-model>
-							</custom>
+			</htk-combo>
-						</sql-batch>
-					</db-model>
-				</htk-combo>
-			</div>
 		</div>
 	</div>
 </div>

forms/account/conf/conf.js

@@ -1,77 +0,0 @@
-
-Hedera.Conf = new Class
-({
-	Extends: Hedera.Form
-
-	,activate: function ()
-	{
-		this.$('user-model').setInfo ('c', 'myClient', 'hedera');
-	}
-	
-	,onPassChangeClick: function ()
-	{
-		this.$('old-password').value = '';
-		this.$('new-password').value = '';
-		this.$('repeat-password').value = '';
-
-		var recoverPass = this.$('user-form').get ('recoverPass');
-		this.$('old-password').style.display = recoverPass ? 'none' : 'block';
-		this.$('change-password').show ();
-
-		if (recoverPass)
-			this.$('new-password').focus ();
-		else
-			this.$('old-password').focus ();
-	}
-
-	,onPassModifyClick: function ()
-	{
-		try {
-			var oldPassword = this.$('old-password').value;
-			var newPassword = this.$('new-password').value;
-			var repeatedPassword = this.$('repeat-password').value;
-
-			if (newPassword == '' && repeatedPassword == '')
-				throw new Error (_('Passwords empty'));
-			if (newPassword !== repeatedPassword)
-				throw new Error (_('Passwords doesn\'t match'));
-		
-			var params = {	
-				oldPassword: oldPassword,
-				newPassword: newPassword
-			};
-			this.conn.send ('core/change-password', params,
-				this._onPassChange.bind (this));
-		}
-		catch (e)
-		{
-			Htk.Toast.showError (e.message);
-		}
-	}
-	
-	,_onPassChange: function (json, error)
-	{
-		if (json)
-		{
-			this.$('change-password').hide ();
-			Htk.Toast.showMessage (_('Password changed!'));
-			this.$('user-form').refresh ();
-		}
-		else
-		{
-			Htk.Toast.showError (error.message);
-			this.$('old-password').select ();
-		}
-	}
-	
-	,onPassInfoClick: function ()
-	{
-		this.$('password-info').show ();
-	}
-	
-	,onAddressesClick: function ()
-	{
-		this.hash.set ({form: 'account/address-list'});
-	}
-});
-

forms/account/conf/index.js

@@ -0,0 +1,13 @@
+import './style.scss';
+
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml'),
+	
+	activate() {
+		this.$.userModel.setInfo('c', 'myClient', 'hedera');
+		this.$.userModel.setInfo('u', 'myUser', 'account');
+		this.$.changePassword.conn = this.conn
+		this.$.changePassword.user = this.gui.user
+	}
+});

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

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

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

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

forms/account/conf/locale/pt.yml

@@ -1,25 +1,26 @@
 Configuration: Configuração
+Personal information: Dados pessoais
 Username: Nome de usuario
-Password: Palavra-Passe
+Password: Palavra-passe
 Email: E-Mail
 Display name: Nome para mostrar
 Language: Idioma
 Billing: Facturação
 Receive invoices by email: Receber facturas por e-mail
-Old password: Palavra-Passe antiga
+Old password: Palavra-passe antiga
-New password: Nova Palavra-Passe
+New password: Nova Palavra-passe
-Repeat password: Repetir Palavra-Passe
+Repeat password: Repetir Palavra-passe
-Info: Info
+Requirements: Requisitos
 Modify: Modificar
-Password requirements: Requisitos de Palavra-Passe
+Password requirements: Requisitos de Palavra-passe
 characters long: caracteres
 alphabetic characters: caracteres alfabéticos
 capital letters: letras maiúsculas
 digits: dígitos
 symbols: 'símbolos. Ej: $%&.'
-Password changed!: Palavra-Passe Modificada!
+Password changed!: Palavra-passe Modificada!
-Password doesn't meet the requirements: Palavra-Passe não atende aos requisitos
+Password doesn't meet the requirements: Palavra-passe não atende aos requisitos
 Passwords doesn't match: As Palavras-Passe não coincidem!
-Passwords empty: Palavra-Passe vazia
+Passwords empty: Palavra-passe vazia
 Addresses: Moradas
-Change password: Mudar Palavra-Passe
+Change password: Mudar Palavra-passe

forms/account/conf/style.css

@@ -1,33 +0,0 @@
-
-.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
-{
-	list-style-type: none;
-}

forms/account/conf/style.scss

@@ -0,0 +1,4 @@
+
+.pass-info ul {
+	list-style-type: none;
+}

forms/account/conf/ui.xml

@@ -1,22 +1,12 @@
 <vn>
 <vn-group>
-	<db-form id="password-form">
-		<db-model property="model">
-			<custom>
-				SELECT length, nAlpha, nUpper, nDigits, nPunct
-					FROM account.userPassword
-			</custom>
-		</db-model>
-	</db-form>
 	<db-form id="user-form">
 		<db-model property="model" id="user-model" updatable="true">
-			<custom>
+			SELECT u.id, u.name, u.email, u.nickname,
-				SELECT u.id, u.name, u.email, u.recoverPass,
+					u.lang, c.isToBeMailed, c.id clientFk
-						u.nickname, u.lang, c.isToBeMailed, c.id clientFk
+				FROM account.myUser u
-					FROM account.userView u
+					LEFT JOIN myClient c
-						LEFT JOIN myClient c
+						ON u.id = c.id
-							ON u.id = c.id
-			</custom>
 		</db-model>
 	</db-form>
 </vn-group>
@@ -27,102 +17,56 @@
 	<htk-bar-button
 		icon="place"
 		tip="_Addresses"
-		on-click="onAddressesClick"/>
+		on-click="hash.setAll({form: 'account/address-list'})"/>
 	<htk-bar-button
-		icon="preferences"
+		icon="lock_reset"
 		tip="_Change password"
-		on-click="onPassChangeClick"/>
+		on-click="this.$.changePassword.open()"/>
 </div>
 <div id="form" class="conf">
-	<div class="box">
+	<div class="form box vn-w-sm vn-pa-lg">
-		<div class="form">
+		<h5 class="vn-mb-md">
-			<div class="form-group">
+			<t>Personal information</t>
-				<label for="user-name"><t>Username</t></label>
+		</h5>
-				<htk-text form="user-form" column="name"/>
+		<div class="form-group">
-			</div>
+			<htk-entry
-			<div class="form-group">
+				placeholder="_Username"
-				<label for="email"><t>Email</t></label>
+				disabled="true"
-				<htk-entry form="user-form" column="email"></htk-entry>
+				form="user-form"
-			</div>
+				column="name"/>
-			<div class="form-group">
+		</div>
-				<label for="nickname"><t>Display name</t></label>
+		<div class="form-group">
-				<htk-entry form="user-form" column="nickname"/>
+			<htk-entry
-			</div>
+				placeholder="_Email"
-			<div class="form-group">
+				form="user-form"
-				<label for="lang"><t>Language</t></label>
+				column="email">
-				<htk-combo form="user-form" column="lang">
+			</htk-entry>
-					<db-model property="model">
+		</div>
-						<custom>
+		<div class="form-group">
-							SELECT code, name FROM language WHERE isActive
+			<htk-entry
-						</custom>
+				placeholder="_Display name"
-					</db-model>
+				form="user-form"
-				</htk-combo>
+				column="nickname"/>
-			</div>
+		</div>
-			<div class="form-group">
+		<div class="form-group">
-				<label for="mail"><t>Receive invoices by email</t></label>
+			<htk-combo
+				placeholder="_Language"
+				form="user-form"
+				column="lang">
+				<db-model property="model">
+					<custom>
+						SELECT code, name FROM language WHERE isActive
+					</custom>
+				</db-model>
+			</htk-combo>
+		</div>
+		<div class="form-group">
+			<label>
 				<htk-check form="user-form" column="isToBeMailed"/>
-			</div>
+				<t>Receive invoices by email</t>
+			</label>
 		</div>
 	</div>
 </div>
-<htk-popup
+<htk-change-password id="change-password"/>
-	id="change-password"
-	modal="true">
-	<div property="child-node" class="htk-dialog pass-change">
-		<div>
-			<input
-				id="old-password"
-				type="password"
-				placeholder="_Old password"/>
-			<input
-				id="new-password"
-				type="password"
-				placeholder="_New password"/>
-			<input
-				id="repeat-password"
-				type="password"
-				placeholder="_Repeat password"/>
-		</div>
-		<div class="button-bar">
-			<button class="thin" on-click="onPassModifyClick">
-				<t>Modify</t>
-			</button>
-			<button class="thin" on-click="onPassInfoClick">
-				<t>Info</t>
-			</button>
-			<div class="clear"/>
-		</div>
-	</div>
-</htk-popup>
-<htk-popup
-	id="password-info"
-	modal="true">
-	<div property="child-node" class="htk-dialog pass-info">
-		<h3>
-			<t>Password requirements</t>
-		</h3>
-		<ul>
-			<li>
-				<htk-text form="password-form" column="length"/> 
-				<t>characters long</t>
-			</li>
-			<li>
-				<htk-text form="password-form" column="nAlpha"/> 
-				<t>alphabetic characters</t>
-			</li>
-			<li>
-				<htk-text form="password-form" column="nUpper"/> 
-				<t>capital letters</t>
-			</li>
-			<li>
-				<htk-text form="password-form" column="nDigits"/> 
-				<t>digits</t>
-			</li>
-			<li>
-				<htk-text form="password-form" column="nPunct"/> 
-				<t>symbols</t>
-			</li>
-		</ul>
-	</div>
-</htk-popup>
 </vn>

forms/admin/access-log/access-log.js

@@ -1,6 +0,0 @@
-
-Hedera.AccessLog = new Class
-({
-	Extends: Hedera.Form
-});
-

forms/admin/access-log/index.js

@@ -0,0 +1,7 @@
+import './style.scss';
+
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml')
+});
+

forms/admin/access-log/locale/pt.yml

@@ -1,6 +1,6 @@
 AccessLog: Registro de acessos
-'UserNumber:': 'Nº usuario:'
+'UserNumber:': 'Nº utilizador:'
-'User:': 'Usuario:'
+'User:': 'Utilizador:'
 'Phone:': 'Telefone:'
 'Mobile:': 'Telemóvel:'
 Access: Acceso

forms/admin/access-log/style.css

@@ -1,36 +0,0 @@
-.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;
-}
-
-/* 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;
-}
-

forms/admin/access-log/style.scss

@@ -0,0 +1,12 @@
+
+.access-log .form > p {
+	font-size: 1.2rem;
+	margin: .1em 0;
+}
+
+/* List */
+
+.access-log .htk-list {
+	margin-top: 16px;
+}
+

forms/admin/access-log/ui.xml

@@ -1,18 +1,12 @@
 <vn>
 <vn-group>
-	<vn-param id="user"/>
+	<db-form v-model="user">
-	<vn-hash-param key="user" param="user"/>
+		<db-model property="model" lot="hash">
-	<db-form id="user-form">
+			SELECT u.id, u.name user, u.nickname, u.email, c.phone, r.name role
-		<db-model property="model">
+				FROM account.user u
-			<custom>
+					JOIN account.role r ON r.id = u.role
-				SELECT Id_Cliente, Cliente, Telefono, movil
+					LEFT JOIN vn.client c ON c.id = u.id 
-					FROM vn2008.Clientes WHERE Id_Cliente = #user
+				WHERE u.id = #user
-			</custom>
-			<sql-batch property="batch">
-				<custom>
-					<item name="user" param="user"/>
-				</custom>
-			</sql-batch>
 		</db-model>
 	</db-form>
 </vn-group>
@@ -20,55 +14,37 @@
 	<h1><t>AccessLog</t></h1>
 </div>
 <div id="form" class="access-log">
-	<div class="box">
+	<div class="box vn-w-xs vn-pa-lg">
 		<div class="form">
-			<p>
+			<h4>{{user.nickname}}</h4>
-				<htk-text form="user-form" column="Id_Cliente"/>
+			<p>#{{user.id}} - {{user.user}}</p>
-			</p>
+			<p>{{user.role}}</p>
-			<p>
+			<p>{{user.email}}</p>
-				<htk-text form="user-form" column="Cliente"/>
+			<p>{{user.phone}}</p>
-			</p>
-			<p>
-				<htk-text form="user-form" column="Telefono"/>
-			</p>
-			<p>
-				<htk-text form="user-form" column="movil"/>
-			</p>
-		</div>
-	</div>
-	<div class="list box">
-		<div>
-			<htk-repeater form-id="iter">
-				<db-model property="model">
-					<custom>
-						SELECT u.stamp, a.platform, a.browser, a.version, a.javascript, a.cookies
-							FROM visitUser u
-								JOIN visitAccess c ON c.id = u.access
-								JOIN visitAgent a ON a.id = c.agent
-							WHERE u.user = #user
-							ORDER BY u.stamp DESC
-							LIMIT 8
-					</custom>
-					<sql-batch property="batch">
-						<custom>
-							<item name="user" param="user"/>
-						</custom>
-					</sql-batch>
-				</db-model>
-				<custom>
-					<div class="item">
-						<p>
-							<htk-text form="iter" column="stamp" format="_%a, %e %b %Y at %T"/>
-						</p>
-						<p>
-							<htk-text form="iter" column="platform"/> - 
-							<htk-text form="iter" column="browser"/> 
-							<htk-text form="iter" column="version"/>
-						</p>
-					</div>
-				</custom>
-			</htk-repeater>
 		</div>
 	</div>
+	<htk-repeater form-id="iter" class="box vn-w-xs htk-list vn-mt-md">
+		<db-model property="model" lot="hash">
+			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
+		</db-model>
+		<custom>
+			<div class="item">
+				<div class="content">
+					<p>
+						{{Vn.Value.format(iter.stamp, _('%a, %e %b %Y at %T'))}}
+					</p>
+					<p>
+						{{iter.platform}} - {{iter.browser}} {{iter.version}}
+					</p>
+				</div>
+			</div>
+		</custom>
+	</htk-repeater>
 </div>
 </vn>

forms/admin/connections/connections.js

@@ -1,53 +0,0 @@
-
-Hedera.Connections = new Class
-({
-	Extends: Hedera.Form
-	
-	,_timeoutId: null
-
-	,onModelStatusChange: function (model, status)
-	{
-		if (!model.ready)
-			return;
-
-		if (this._timeoutId)
-			clearTimeout (this._timeoutId);
-			
-		this._timeoutId = setTimeout (this.onRefreshClick.bind (this), 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'),
-			this._onUserSupplant.bind (this));
-	}
-	
-	,_onUserSupplant: function (userName)
-	{
-		this.hash.set ({'form': 'ecomerce/orders'});
-	}
-	
-	,sessionsFunc: function ()
-	{
-		return 1;
-	}
-});
-

forms/admin/connections/index.js

@@ -0,0 +1,33 @@
+import './style.scss';
+
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml')
+	
+	,_timeoutId: null
+
+	,onModelStatusChange() {
+		if (!this.$.sessions.ready)
+			return;
+
+		if (this._timeoutId)
+			clearTimeout(this._timeoutId);
+			
+		this._timeoutId = setTimeout(
+			() => this.$.sessions.refresh(), 60000);
+	}
+	
+	,deactivate() {
+		clearTimeout(this._timeoutId);
+	}
+
+	,async onChangeUserClick(userName) {
+		await this.gui.supplantUser(userName);
+		this.hash.setAll({form: 'ecomerce/orders'});
+	}
+	
+	,sessionsFunc() {
+		return 1;
+	}
+});
+

forms/admin/connections/style.css

@@ -1,44 +0,0 @@
-.connections
-{
-	padding: 1em;
-}
-.connections .box
-{
-	max-width: 25em;
-	margin: 0 auto;
-}
-.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;
-}
-
-/* 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;
-}
-

forms/admin/connections/style.scss

@@ -0,0 +1,9 @@
+
+.action-bar .connections-sum {
+	padding: .4em;
+	background-color: #1e88e5;
+	border-radius: .1em;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}

forms/admin/connections/ui.xml

@@ -6,7 +6,7 @@
 	<htk-bar-button
 		icon="refresh"
 		tip="_Refresh"
-		on-click="onRefreshClick"/>
+		on-click="sessions.refresh()"/>
 	<div class="connections-sum">
 		<htk-text>
 			<db-calc-sum
@@ -18,50 +18,46 @@
 	</div>
 </div>
 <div id="form" class="connections">
-	<div class="box">
+	<htk-repeater form-id="iter" class="box htk-list vn-w-xs">
-		<htk-repeater form-id="iter">
+		<db-model
-			<db-model property="model" id="sessions" on-status-changed="onModelStatusChange">
+			property="model"
-				<custom>
+			id="sessions"
-					SELECT vu.user userId, vu.stamp, u.nickname, s.lastUpdate, 
+			on-status-changed="this.onModelStatusChange()">
-							a.platform, a.browser, a.version, u.name user
+			SELECT vu.userFk userId, vu.stamp, u.nickname, s.lastUpdate, 
-						FROM userSession s
+					a.platform, a.browser, a.version, u.name user
-							JOIN visitUser vu ON vu.id = s.userVisit
+				FROM userSession s
-							JOIN visitAccess ac ON ac.id = vu.access
+					JOIN visitUser vu ON vu.id = s.userVisitFk
-							JOIN visitAgent a ON a.id = ac.agent
+					JOIN visitAccess ac ON ac.id = vu.accessFk
-							JOIN visit v ON v.id = a.visit
+					JOIN visitAgent a ON a.id = ac.agentFk
-							JOIN account.user u ON u.id = vu.user
+					JOIN visit v ON v.id = a.visitFk
-						ORDER BY lastUpdate DESC
+					JOIN account.user u ON u.id = vu.userFk
-				</custom>
+				ORDER BY lastUpdate DESC
-			</db-model>
+		</db-model>
-			<custom>
+		<custom>
-				<div class="item">
+			<a class="item"
-					<htk-button
+				href="{{`#!form=admin/access-log&amp;user=${iter.userId}`}}"
-						form="iter"
+				title="_Access log">
-						column="id"
+				<div class="content">
-						tip="_Supplant user"
-						icon="incognito"
-						on-click="onChangeUserClick"/>
-					<htk-button
-						form="iter"
-						column="id"
-						tip="_Access log"
-						icon="gnome"
-						on-click="onAccessLogClick"/>
 					<p class="important">
-						<htk-text form="iter" column="nickname"/>
+						{{iter.nickname}}
 					</p>
 					<p>
-						<htk-text form="iter" column="stamp" format="%a, %T"/> - 
+						{{Vn.Value.format(iter.stamp, '%a, %T')}} - 
-						<htk-text form="iter" column="lastUpdate" format="%T"/>
+						{{Vn.Value.format(iter.lastUpdate, '%T')}}
 					</p>
 					<p>
-						<htk-text form="iter" column="platform"/> - 
+						{{iter.platform}} - {{iter.browser}} {{iter.version}}
-						<htk-text form="iter" column="browser"/> 
-						<htk-text form="iter" column="version"/>
 					</p>
 				</div>
-			</custom>
+				<div class="actions"
-		</htk-repeater>
+					on-click="$event.preventDefault()">
-	</div>
+					<htk-button
+						tip="_Supplant user"
+						icon="supervisor_account"
+						on-click="this.onChangeUserClick(iter.user)"/>
+				</div>
+			</a>
+		</custom>
+	</htk-repeater>
 </div>
 </vn>

forms/admin/items/index.js

@@ -0,0 +1,10 @@
+import './style.scss';
+
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml'),
+	
+	activate() {	
+		this.$.items.setInfo('i', 'item', 'vn', ['id']);
+	}
+});

forms/admin/items/items.js

@@ -1,6 +0,0 @@
-
-Hedera.Items = new Class
-({
-	Extends: Hedera.Form
-});
-

forms/admin/items/style.css

@@ -1,42 +0,0 @@
-.items
-{
-	padding: 1em;
-}
-.items .box
-{
-	max-width: 25em;
-	margin: 0 auto;
-}
-
-/* Row */
-
-.items .row
-{
-	padding: 1em;
-	border-bottom: 1px solid #DDD;
-}
-.items .row > .photo
-{
-	margin-right: 1em;
-	float: left;
-	border-radius: 50%;
-	height: 3.2em;
-	width: 3.2em;
-}
-.items .row > p
-{
-	margin: .1em 0;
-	margin-left: 5em;
-}
-.items .row > p.important
-{
-	font-size: 1.2em;
-}
-
-/* Topbar */
-
-.action-bar .htk-search-entry
-{
-	margin: .8em .6em;
-}
-

forms/admin/items/style.scss

@@ -0,0 +1,6 @@
+
+.items .item .photo {
+	border-radius: 10px;
+	height: 80px;
+	width: 80px;
+}

forms/admin/items/ui.xml

@@ -1,58 +1,57 @@
 <vn>
-<vn-group>
-	<vn-param id="filter"/>
-	<vn-hash-param key="filter" param="filter"/>
-</vn-group>
 <div id="title">
 	<h1><t>Items</t></h1>
 </div>
 <div id="actions">
-	<htk-search-entry
+	<htk-search-entry form="hash" column="search"/>
-		param="filter"/>
 </div>
 <div id="form" class="items">
-	<div class="rows box">
+	<htk-repeater 
-		<htk-repeater form-id="iter" empty-message="_Enter a search term">
+		class="htk-list rows box vn-w-xs"
-			<db-model property="model">
+		form-id="iter"
-				<custom>
+		empty-message="_Enter a search term">
-					SELECT Id_Article, Article, Medida, Categoria, Foto
+		<db-model property="model" id="items" lot="hash">
-						FROM vn2008.Articles
+			SELECT i.id, i.longName, i.size, i.category,
-						WHERE Article LIKE CONCAT('%', #filter, '%')
+					i.value5, i.value6, i.value7,
-							OR Id_Article = #filter
+					i.image, im.updated
-							ORDER BY Article LIMIT 50
+				FROM vn.item i
-				</custom>
+					LEFT JOIN image im
-				<sql-batch property="batch">
+						ON im.collectionFk = 'catalog'
-					<custom>
+						AND im.name = i.image
-						<item name="filter" param="filter"/>
+				WHERE i.isActive
-					</custom>
+					AND (i.longName LIKE CONCAT('%', #search, '%') OR i.id = #search)
-				</sql-batch>
+				ORDER BY i.longName LIMIT 50
-			</db-model>
+		</db-model>
-			<custom>
+		<custom>
-				<div class="row">
+			<div class="item">
+				<div class="side vn-mr-md">
 					<htk-image
-						form="iter"
+						form="$iter"
-						column="Foto"
+						column="image"
+						stamp-column="updated"
 						class="photo"
 						directory="catalog"
 						subdir="200x200"
-						full-dir="900x900"
+						full-dir="1600x900"
 						editable="true"
 						conn="conn"/>
-					<p class="concept">
-						<htk-text form="iter" column="Article"/> 
-						<htk-text form="iter" column="Medida"/> 
-						<htk-text form="iter" column="Categoria"/>
-					</p>
-					<p>
-						<htk-text form="iter" column="Id_Article"/>
-					</p>
-					<p>
-						<htk-text form="iter" column="Foto"/>
-					</p>
-					<div class="clear"/>
 				</div>
-			</custom>
+				<div class="content">
-		</htk-repeater>
+					<p class="important">
-	</div>
+						{{iter.longName}}
+					</p>
+					<p class="tags">
+						{{iter.value5}} {{iter.value6}} {{iter.value7}}
+					</p>
+					<p>
+						{{iter.id}}
+					</p>
+					<p>
+						{{iter.image}}
+					</p>
+				</div>
+			</div>
+		</custom>
+	</htk-repeater>
 </div>
 </vn>

forms/admin/links/index.js

@@ -0,0 +1,7 @@
+import './style.scss';
+
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml')
+});
+

forms/admin/links/links.js

@@ -1,11 +0,0 @@
-
-Hedera.Links = new Class
-({
-	Extends: Hedera.Form
-
-	,repeaterFunc: function (res, form)
-	{
-		res.$('link').href = form.get ('link');
-	}
-});
-

forms/admin/links/style.css

@@ -1,38 +0,0 @@
-
-.cpanel
-{
-	padding: 1em;
-}
-.cpanel .box
-{
-	max-width: 30em;
-}
-
-/* Items */
-
-.cpanel .item
-{
-	display: block;
-	padding: 1em;
-	border-bottom: 1px solid #DDD;
-}
-.cpanel .item:hover
-{
-	background-color: rgba(1, 1, 1, 0.05);
-}
-.cpanel .item > .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;
-}

forms/admin/links/style.scss

@@ -0,0 +1,50 @@
+
+.cpanel .items > div {
+	max-width: 900px;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: center;
+	gap: 16px;
+	margin: 0 auto;
+}
+.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;
+}
+.cpanel .item:hover {
+	background-color: rgba(1, 1, 1, 0.05);
+}
+.cpanel .item > .htk-image {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	margin: 0;
+	float: left;
+	height: 80px;
+}
+.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 > .text-secondary {
+	flex: none;
+	margin: 0;
+	font-size: .8rem;
+	height: 40px;
+	overflow: hidden;
+}

forms/admin/links/ui.xml

@@ -3,30 +3,29 @@
 	<h1><t>ControlPanel</t></h1>
 </div>
 <div id="form" class="cpanel">
-	<div class="box">
+	<htk-repeater form-id="iter" class="items">
-		<htk-repeater form-id="iter" renderer="repeaterFunc">
+		<db-model property="model">
-			<db-model property="model">
-				<custom>
-					SELECT image, name, description, link FROM link
-						ORDER BY name
-				</custom>
-			</db-model>
 			<custom>
-				<a id="link" class="item" target="_blank">
+				SELECT image, name, description, link FROM link
-					<htk-image
+					ORDER BY name
-						form="iter"
-						column="image"
-						directory="link"
-						subdir="full"/>
-					<p class="important">
-						<htk-text form="iter" column="name"/>
-					</p>
-					<p>
-						<htk-text form="iter" column="description"/>
-					</p>
-				</a>
 			</custom>
-		</htk-repeater>
+		</db-model>
-	</div>
+		<custom>
+			<a class="item box"
+				href="{{iter.link}}"
+				target="_blank">
+				<htk-image
+					value="{{iter.image}}"
+					directory="link"
+					subdir="full"/>
+				<h6>
+					{{iter.name}}
+				</h6>
+				<p class="text-secondary">
+					{{iter.description}}
+				</p>
+			</a>
+		</custom>
+	</htk-repeater>
 </div>
 </vn>

forms/admin/photos/index.js

@@ -0,0 +1,201 @@
+import './style.scss';
+
+var Status = {
+	 NONE      : 0
+	,WAITING   : 1
+	,UPLOADING : 2
+	,UPLOADED  : 3
+};
+
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml')
+
+	,filesData: []
+	,uploadCount: 0
+	,isUploading: false
+
+	,activate() {
+		this.$.schema.value = 'catalog';
+	}
+
+	,addFiles(files) {
+		if (!files)
+			return;
+
+		for (var i = 0; i < files.length; i++)
+			this.addFile(files[i]);
+	}
+
+	,addFile(file) {
+		var doc = document;
+		var li = doc.createElement('div');
+
+		var div = doc.createElement('div');
+		div.className = 'thumb';
+		li.appendChild(div);
+
+		var thumb = doc.createElement('img');
+		thumb.file = file;
+		div.appendChild(thumb);
+
+		var reader = new FileReader();
+		reader.onload = function(e) {
+			thumb.src = e.target.result; 
+		};
+		reader.readAsDataURL(file);
+
+		var name = doc.createElement('input');
+		name.type = 'text';
+		name.value = getFileName(file.name);
+		li.appendChild(name);
+
+		var statusNode = doc.createElement('div');
+		statusNode.className = 'status';
+		li.appendChild(statusNode);
+
+		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);
+
+		this.$.fileList.appendChild(li);
+		this.setImageStatus(fileData, Status.NONE, 'add', _('Pending upload'));
+	}
+
+	,async onUploadClick() {
+		if (this.isUploading) return;
+	
+		const uploadQueue = [];
+		let hasFiles = false;
+
+		for (const fileData of this.filesData) {
+			if (fileData.status !== Status.NONE) continue;
+			this.setImageStatus(
+				fileData, Status.WAITING, 'cloud_upload', _('Waiting for upload'));
+			fileData.name.disabled = true;
+			uploadQueue.push(fileData);
+			hasFiles = true;
+		}
+
+		if (!hasFiles) {
+			Htk.Toast.showWarning(_('There are no files to upload'));
+			return;
+		}
+
+		this.isUploading = true;
+		let hasErrors = false;
+		
+		for (const fileData of uploadQueue) {
+			this.setImageStatus(
+				fileData, Status.UPLOADING, 'upload', _('Uploading file'));
+
+			const formData = new FormData();
+			formData.append('updateMatching', this.$.updateMatching.value);
+			formData.append('image', fileData.file);
+			formData.append('name', fileData.name.value);
+			formData.append('schema', this.$.schema.value);
+			formData.append('srv', 'json:image/upload');
+
+			try {
+				await this.conn.sendFormData(formData);
+				this.setImageStatus(
+					fileData, Status.UPLOADED, 'cloud_done', _('Image uploaded'));
+			} catch(err) {
+				this.setImageStatus(
+					fileData, Status.NONE, 'error', err.message);
+				fileData.name.disabled = false;
+				hasErrors = true;
+			}
+		}
+
+		this.isUploading = false;
+
+		if (hasErrors)
+			Htk.Toast.showError(_('Some errors happened on upload'));
+		else
+			Htk.Toast.showMessage(_('Upload finished successfully'));
+	}
+
+	,setImageStatus(fileData, status, icon, title) {
+		fileData.status = status;
+
+		var statusNode = fileData.statusNode;
+		Vn.Node.removeChilds(statusNode);
+	
+		var iconNode = new Htk.Icon({name: icon});
+		statusNode.appendChild(iconNode.node);
+		statusNode.title = title ? title : '';
+	}
+
+	,onFileRemove(fileData) {
+		this.$.fileList.removeChild(fileData.li);
+
+		for (var i = 0; i < this.filesData.length; i++)
+		if (this.filesData[i] === fileData) {
+			this.filesData.splice(i, 1);
+			break;
+		}
+	}
+
+	,onClearClick() {
+		this.filesData = [];
+		Vn.Node.removeChilds(this.$.fileList);
+	}
+
+	,onDropzoneClick() {
+		this.$.file.click();
+	}
+
+	,onFileChange() {
+		this.addFiles(this.$.file.files);
+	}
+
+	,onDragEnter() {
+		this.$.dropzone.classList.add('dragover');
+	}
+
+	,onDragLeave() {
+		this.$.dropzone.classList.remove('dragover');
+	}
+
+	,onDragOver(event) {
+		event.preventDefault();
+	}
+
+	,onDragEnd(event) {
+		this.$.dropzone.classList.remove('dragover');
+		event.dataTransfer.clearData();
+	}
+
+	,onDrop(event) {
+		event.preventDefault();
+		this.addFiles(event.dataTransfer.files);
+	}
+});
+
+function getFileName(path) {
+	var barIndex = path.lastIndexOf('/');
+	if (barIndex === -1)
+		barIndex = path.lastIndexOf('\\');
+	if (barIndex === -1)
+		barIndex = 0;
+
+	var dotIndex = path.lastIndexOf('.');
+	if (dotIndex === -1)
+		dotIndex = 0;
+
+	return path.substr(barIndex, dotIndex);
+}

forms/admin/photos/locale/ca.yml

@@ -1,6 +1,8 @@
 Images: Imatges
 Collection: Col·lecció
 Click or drop files here: Prem o deixa anar els arxius aquí
+Pending upload: Pujada pendent
+Update items with matching id: Actualitzar els elements amb id coincident
 Clear all: Netejar tot
 Upload files: Pujar arxius
 Waiting for upload: Esperant per pujar

forms/admin/photos/locale/en.yml

@@ -1,6 +1,8 @@
 Images: Images
 Collection: Collection
 Click or drop files here: Click or drop files here
+Pending upload: Pending upload
+Update items with matching id: Update items with matching id
 Clear all: Clear all
 Upload files: Upload files
 Waiting for upload: Waiting for upload

forms/admin/photos/locale/es.yml

@@ -1,6 +1,8 @@
 Images: Imágenes
 Collection: Colección
 Click or drop files here: Pulsa o suelta los archivos aquí
+Pending upload: Subida pendiente
+Update items with matching id: Actualizar ítems con id coincidente
 Clear all: Limpiar todo
 Upload files: Subir archivos
 Waiting for upload: Esperando para subir

forms/admin/photos/locale/fr.yml

@@ -1,6 +1,8 @@
 Images: Images
 Collection: Collection
 Click or drop files here: Cliquez ici ou déposer des fichiers
+Pending upload: Hausse en attente
+Update items with matching id: Mettre à jour les éléments avec l'identifiant correspondant
 Clear all: Tout effacer
 Upload files: Upload Files
 Waiting for upload: En attente de télécharger

forms/admin/photos/locale/pt.yml

@@ -1,6 +1,8 @@
 Images: Imagens
 Collection: Coleção
 Click or drop files here: Clique ou solte arquivos aqui
+Pending upload: Ascensão pendente
+Update items with matching id: Atualizar itens com id correspondente
 Clear all: Limpar tudo
 Upload files: Fazer upload de arquivos
 Waiting for upload: Esperando para enviar

forms/admin/photos/photos.js

@@ -1,235 +0,0 @@
-(function() {
-
-var Status = {
-	 NONE      : 0
-	,WAITING   : 1
-	,UPLOADING : 2
-	,UPLOADED  : 3
-};
-
-Hedera.Photos = new Class
-({
-	Extends: Hedera.Form
-	,filesData: []
-	,uploadCount: 0
-	,errors: false
-	,uploadQueue: []
-	,isUploading: false
-
-	,activate: function ()
-	{
-		this.$('schema').value = 'catalog';
-	}
-
-	,addFiles: function (files)
-	{
-		if (!files)
-			return;
-
-		for (var i = 0; i < files.length; i++)
-			this.addFile (files[i]);
-	}
-
-	,addFile: function (file)
-	{
-		var doc = document;
-		var div = doc.createElement ('div');
-
-		var button = new Htk.Button ({
-			tip: 'Remove',
-			icon: 'delete'
-		});
-		button.on ('click', this.onFileRemove, this);
-		div.appendChild (button.node);
-
-		var thumb = doc.createElement ('img');
-		thumb.file = file;
-		thumb.className = 'thumb';
-		div.appendChild (thumb);
-
-		var reader = new FileReader ();
-		reader.onload = function (e) { thumb.src = e.target.result; };
-		reader.readAsDataURL(file);
-
-		var name = doc.createElement ('input');
-		name.type = 'text';
-		name.value = getFileName (file.name);
-		div.appendChild (name);
-
-		var statusNode = doc.createElement ('span');
-		statusNode.className = 'status';
-		div.appendChild (statusNode);
-
-		var fileData = {
-			div: div,
-			file: file,
-			name: name,
-			statusNode: statusNode,
-			status: Status.NONE
-		};
-		this.filesData.push (fileData);
-		button.value = fileData;
-
-		this.$('file-list').appendChild (div);
-	}
-
-	,onUploadClick: function ()
-	{
-		var filesData = this.filesData;
-		var count = 0;
-
-		for (var i = 0; i < filesData.length; i++)
-		{
-			var fileData = filesData[i];
-
-			if (fileData.status === Status.NONE)
-			{
-				this.setImageStatus (
-					fileData, Status.WAITING, 'cloud-upload', _('Waiting for upload'));
-				fileData.name.disabled = true;
-				this.uploadQueue.push (fileData);
-				count++;
-			}
-		}
-
-		if (count === 0)
-			Htk.Toast.showWarning (_('There are no files to upload'));
-		else
-			this.uploadNextFile ();
-	}
-
-	,uploadNextFile: function ()
-	{
-		if (this.isUploading)
-			return;
-
-		this.isUploading = true;
-
-		var fileData = this.uploadQueue.shift ();
-		this.setImageStatus (
-			fileData, Status.UPLOADING, 'upload', _('Uploading file'));
-
-		var formData = new FormData();
-		formData.append ('image', fileData.file);
-		formData.append ('name', fileData.name.value);
-		formData.append ('schema', this.$('schema').value);
-		formData.append ('srv', 'json:image/upload');
-		this.conn.sendFormData (formData,
-			this.onFileUpload.bind (this, fileData));
-	}
-
-	,onFileUpload: function (fileData, data, error)
-	{
-		this.isUploading = false;
-
-		if (data)
-		{
-			this.setImageStatus (
-				fileData, Status.UPLOADED, 'ok', _('Image uploaded'));
-		}
-		else
-		{
-			this.setImageStatus (
-				fileData, Status.NONE, 'error', error.message);
-			fileData.name.disabled = false;
-			this.errors = true;
-		}
-
-		if (this.uploadQueue.length === 0)
-		{
-			if (this.errors)
-				Htk.Toast.showError (_('Some errors happened on upload'));
-			else
-				Htk.Toast.showMessage (_('Upload finished successfully'));
-
-			this.errors = false;
-		}
-		else
-			this.uploadNextFile ();
-	}
-
-	,setImageStatus: function (fileData, status, icon, title)
-	{
-		fileData.status = status;
-
-		var statusNode = fileData.statusNode;
-		Vn.Node.removeChilds (statusNode);
-	
-		var iconNode = new Htk.Icon ({icon: icon});
-		statusNode.appendChild (iconNode.node);
-		statusNode.title = title ? title : '';
-	}
-
-	,onFileRemove: function (button)
-	{
-		var fileData = button.value;
-		this.$('file-list').removeChild (fileData.div);
-
-		for (var i = 0; i < this.filesData.length; i++)
-		if (this.filesData[i] === fileData)
-		{
-			this.filesData.splice (i, 1);
-			break;
-		}
-	}
-
-	,onClearClick: function ()
-	{
-		this.filesData = [];
-		Vn.Node.removeChilds (this.$('file-list'));
-	}
-
-	,onDropzoneClick: function ()
-	{
-		this.$('file').click ();
-	}
-
-	,onFileChange: function ()
-	{
-		this.addFiles (this.$('file').files);
-	}
-
-	,onDragEnter: function (event)
-	{
-		Vn.Node.addClass (this.$('dropzone'), 'dragover');
-	}
-
-	,onDragLeave: function (event)
-	{
-		Vn.Node.removeClass (this.$('dropzone'), 'dragover');
-	}
-
-	,onDragOver: function (event)
-	{
-		event.preventDefault ();
-	}
-
-	,onDragEnd: function (event)
-	{
-		Vn.Node.removeClass (this.$('dropzone'), 'dragover');
-		event.dataTransfer.clearData ();
-	}
-
-	,onDrop: function (event)
-	{
-		event.preventDefault ();
-		this.addFiles (event.dataTransfer.files);
-	}
-});
-
-function getFileName (path)
-{
-	var barIndex = path.lastIndexOf ('/');
-	if (barIndex === -1)
-		barIndex = path.lastIndexOf ('\\');
-	if (barIndex === -1)
-		barIndex = 0;
-
-	var dotIndex = path.lastIndexOf ('.');
-	if (dotIndex === -1)
-		dotIndex = 0;
-
-	return path.substr (barIndex, dotIndex);
-}
-
-})();

forms/admin/photos/style.css

@@ -1,73 +0,0 @@
-
-.photos
-{	
-	padding: 1em;
-}
-.photos .box
-{
-	max-width: 25em;
-	padding: 2em;
-}
-
-/* Dropzone */
-
-.photos .dropzone
-{
-	background-color:  white;
-	border-style: dashed;
-	border-radius: .4em;
-	border-color: #2196F3;
-	padding: 2em 1em;
-	text-align: center;
-	color: #666;
-	cursor: pointer;
-}
-.photos .dropzone.dragover
-{
-	color: #CCC;
-	border-style: solid;
-}
-.photos input[type=file]
-{
-	display: none;
-}
-
-/* File list */
-
-.photos .file-list
-{
-	margin-top: 1em;
-}
-.photos .file-list > div
-{
-	height: 2.5em;
-}
-.photos .file-list .thumb
-{
-	max-height: 2em;
-	max-width: 2em;
-	vertical-align: middle;
-	margin: 0 1em;
-}
-.photos .file-list input
-{
-	max-width: 10em;
-}
-.photos .file-list .status
-{
-	margin-left: .5em;
-	cursor: pointer;
-}
-
-/* Footer */
-
-.photos .footer
-{
-	margin-top: 1.5em;
-	text-align: center;
-}
-.photos .footer > button
-{
-	font-size: 1.2em;
-	margin-left: 1em;
-}

forms/admin/photos/style.scss

@@ -0,0 +1,81 @@
+
+/* Dropzone */
+
+.photos .dropzone {
+	background-color:  white;
+	border-style: dashed;
+	border-radius: .4em;
+	border-color: #2196F3;
+	padding: 2em 1em;
+	text-align: center;
+	color: #666;
+	cursor: pointer;
+}
+.photos .dropzone.dragover {
+	color: #CCC;
+	border-style: solid;
+}
+.photos input[type=file] {
+	display: none;
+}
+
+/* File list */
+
+.photos .file-list {
+	margin-top: 1em;
+}
+.photos .file-list > div {
+	height: 2.5em;
+	display: flex;
+	align-items: center;
+}
+.photos .file-list > div > * {
+	overflow: hidden;
+}
+.photos .file-list .thumb {
+	width: 2em;
+	padding-right: .5em;
+	text-align: center;
+}
+.photos .file-list .thumb > img {
+	max-height: 2em;
+	max-width: 2em;
+	vertical-align: middle;
+}
+.photos .file-list input {
+	flex: 1;
+	min-width: 0;
+}
+.photos .file-list .status {
+	cursor: pointer;
+	width: 1.2em;
+	padding-left: .5em;
+	padding-right: .5em;
+}
+.photos .file-list .status > .htk-icon {
+	display: block;
+}
+.photos .file-list .htk-button {
+	opacity: .2;
+}
+.photos .file-list .htk-button:hover {
+	background-color: transparent;
+	opacity: 1;
+}
+.photos .file-list .htk-button > img {
+	display: block;
+}
+
+/* Footer */
+
+.photos .update-matching {
+	margin-top: 1.5em;
+}
+.photos .footer {
+	margin-top: 1.5em;
+	text-align: center;
+}
+.photos .footer > button {
+	font-size: 1.2rem;
+	margin-left: 1em;
+}

forms/admin/photos/ui.xml

@@ -3,7 +3,7 @@
 	<h1><t>Images</t></h1>
 </div>
 <div id="form" class="photos">
-	<div class="box">
+	<div class="box form vn-w-sm vn-pa-lg">
 		<div class="form-group">
 			<label><t>Collection</t></label>
 			<htk-combo id="schema">
@@ -31,6 +31,12 @@
 			 name="image"
 			 on-change="onFileChange"/>
 		<div id="file-list" class="file-list"/>
+		<div class="update-matching">
+			<label>
+				<htk-check id="update-matching" value="true"/>
+				<t>Update items with matching id</t>
+			</label>
+		</div>
 		<div class="footer">
 			<button class="thin" on-click="onClearClick">
 				<t>Clear all</t>

forms/admin/queries/index.js

@@ -0,0 +1,93 @@
+import './style.scss';
+
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml')
+	
+	,activate() {
+		this.$.resultIndex.value = 0;
+	}
+	
+	,clean() {
+		if (this._grid) {
+			this.$.gridHolder.removeChild(this._grid.node);
+			this._grid.unref();
+			this._grid = null;
+		}
+	}
+	
+	,onExecuteClick() {
+		this.clean();
+		
+		var model = new Db.Model({
+			conn: this.conn,
+			query: this.$.sql.value,
+			resultIndex: this.$.resultIndex.value,
+			updatable: this.$.updatable.value
+		});
+		model.on('status-changed', this.onModelChange, this);
+	}
+	
+	,onCleanClick() {
+		this.clean();
+	}
+	
+	,onModelChange(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.$.gridHolder;
+		
+		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.node);
+		this._grid = grid;
+	}
+});
+

forms/admin/queries/queries.js

@@ -1,102 +0,0 @@
-
-Hedera.Queries = new Class
-({
-	Extends: Hedera.Form
-	
-	,activate: function  ()
-	{
-		this.$('result-index').value = 0;
-	}
-	
-	,clean: function ()
-	{
-		if (this._grid)
-		{
-			this.$('grid-holder').removeChild (this._grid.node);
-			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.node);
-		this._grid = grid;
-	
-	}
-});
-

forms/admin/queries/style.css

@@ -1,25 +0,0 @@
-.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;
-}

forms/admin/queries/style.scss

@@ -0,0 +1,10 @@
+
+.queries textarea {
+	display: block;
+	width: 100%;
+	height: 8em;
+}
+.queries .result {
+	margin-top: 1em;
+	overflow: auto;
+}

forms/admin/queries/ui.xml

@@ -6,14 +6,14 @@
 	<htk-bar-button
 		icon="ok"
 		tip="_Execute"
-		on-click="_onExecuteClick"/>
+		on-click="this.onExecuteClick()"/>
 	<htk-bar-button
 		icon="delete"
 		tip="_Clean"
-		on-click="_onCleanClick"/>
+		on-click="this.onCleanClick()"/>
 </div>
 <div id="form" class="queries">
-	<div class="box form">
+	<div class="box form vn-w-sm vn-pa-lg">
 		<div class="form-group">
 			<label><t>SQL query</t></label>
 			<textarea

forms/admin/users/index.js

@@ -0,0 +1,20 @@
+import './style.scss';
+
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml')
+
+	,rendererFunc(scope, form) {
+		var isEnabled = form.$.active
+		scope.$.disabled.style.display = isEnabled ?
+			'none' : 'block';
+		scope.$.impersonate.node.style.display = isEnabled ?
+			'block' : 'none';
+	}
+
+	,async onChangeUserClick(userName) {
+		await this.gui.supplantUser(userName);
+		this.hash.setAll({form: 'ecomerce/orders'});
+	}
+});
+

forms/admin/users/style.css

@@ -1,45 +0,0 @@
-.users
-{
-	padding: 1em;
-}
-.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;
-	color: white;
-	background-color: #F66;
-	border-radius: .2em;
-	padding: .2em;
-	margin: .3em;
-	font-size: .8em;
-}
-
-/* Topbar */
-
-.action-bar .htk-search-entry
-{
-	margin: .8em .6em;
-}
-

forms/admin/users/style.scss

@@ -0,0 +1,11 @@
+
+.users-box.item > .actions {
+	display: flex;
+}
+.users-box .disabled {
+	color: white;
+	background-color: #F66;
+	border-radius: .2em;
+	padding: .3em;
+	font-size: .8em;
+}

forms/admin/users/ui.xml

@@ -1,62 +1,48 @@
 <vn>
-<vn-group>
-	<vn-param id="user-name"/>
-	<vn-hash-param key="user" param="user-name"/>
-</vn-group>
 <div id="title">
 	<h1><t>User management</t></h1>
 </div>
 <div id="actions">
-	<htk-search-entry
+	<htk-search-entry form="hash" column="user"/>
-		param="user-name"/>
 </div>
 <div id="form" class="users">
-	<div class="box">
+	<htk-repeater
-		<htk-repeater form-id="iter" renderer="rendererFunc">
+		form-id="iter"
-			<db-model property="model">
+		renderer="rendererFunc"
-				<custom>
+		class="htk-list box vn-w-xs">
-					SELECT u.id, u.name, u.nickname, u.active
+		<db-model property="model" lot="hash">
-						FROM account.user u
+			SELECT u.id, u.name, u.nickname, u.active
-						WHERE u.name LIKE CONCAT('%', #user, '%')
+				FROM account.user u
-							OR u.nickname LIKE CONCAT('%', #user, '%')
+				WHERE u.name LIKE CONCAT('%', #user, '%')
-							OR u.id = #user
+					OR u.nickname LIKE CONCAT('%', #user, '%')
-						ORDER BY u.name LIMIT 200
+					OR u.id = #user
-				</custom>
+				ORDER BY u.name LIMIT 200
-				<sql-batch property="batch">
+		</db-model>
-					<custom>
+		<custom>
-						<item name="user" param="user-name"/>
+			<a class="users-box item"
-					</custom>
+				href="{{`#!form=admin/access-log&amp;user=${iter.id}`}}"
-				</sql-batch>
+				title="_Access log">
-			</db-model>
+				<div class="content">
-			<custom>
+					<p class="important">
-				<div class="users-box">
+						{{iter.nickname}}
-					<htk-button
+					</p>
-						form="iter"
+					<p>
-						column="id"
+						#{{iter.id}} - {{iter.name}}
-						tip="_Access log"
+					</p>
-						icon="gnome"
+				</div>
-						on-click="onAccessLogClick"/>
+				<div class="actions"
-					<htk-button
+					on-click="$event.preventDefault()">
-						id="impersonate"
-						form="iter"
-						column="id"
-						tip="_Impersonate user"
-						icon="incognito"
-						on-click="onChangeUserClick"/>
 					<span id="disabled" class="disabled">
 						<t>Disabled</t>
 					</span>
-					<p class="important">
+					<htk-button
-						<htk-text form="iter" column="nickname"/>
+						id="impersonate"
-					</p>
+						icon="supervisor_account"
-					<p>
+						tip="_Impersonate user"
-						@<htk-text form="iter" column="id"/> - 
+						on-click="this.onChangeUserClick(iter.name)"/>
-						<htk-text form="iter" column="name"/>
-					</p>
-					<div class="clear"/>
 				</div>
-			</custom>
+			</a>
-		</htk-repeater>
+		</custom>
-	</div>
+	</htk-repeater>
 </div>
 </vn>

forms/admin/users/users.js

@@ -1,34 +0,0 @@
-
-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 ?
-			'none' : 'block';
-		scope.$('impersonate').node.style.display = isEnabled ?
-			'block' : 'none';
-	}
-
-	,onChangeUserClick: function (button, form)
-	{
-		this.gui.supplantUser (form.get ('name'),
-			this.onUserSupplant.bind (this));
-	}
-	
-	,onUserSupplant: function ()
-	{
-		this.hash.set ({form: 'ecomerce/orders'});
-	}
-});
-

forms/admin/visits/index.js

@@ -0,0 +1,15 @@
+import './style.scss';
+
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml')
+
+	,activate() {
+		if (!this.hash.$.to)
+			this.hash.assign({
+				from: Date.vnNew(),
+				to: Date.vnNew()
+			});
+	}
+});
+

forms/admin/visits/style.css

@@ -1,46 +0,0 @@
-.visits
-{
-	padding: 1em;
-}
-.visits .box
-{
-	max-width: 25em;
-	margin: 0 auto;
-}
-.visits .form
-{
-	padding: 1.5em;
-	max-width: 20em;
-}
-.visits .summary
-{
-	margin-top: 1em;
-}
-.visits .summary p
-{
-	padding: 1.5em;
-	font-size: 1.4em;
-	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;
-}
-

forms/admin/visits/style.scss

@@ -0,0 +1,12 @@
+
+.visits .box {
+	margin-bottom: 16px;
+}
+.visits .box:last-child {
+	margin-bottom: 0;
+}
+.visits .summary p {
+	font-size: 1.4rem;
+	margin: 0;
+	text-align: right;
+}

forms/admin/visits/ui.xml

@@ -1,4 +1,8 @@
 <vn>
+<vn-lot-query id="params">
+	<vn-spec name="from" type="Date"/>
+	<vn-spec name="to" type="Date"/>
+</vn-lot-query>
 <div id="title">
 	<h1><t>Visits</t></h1>
 </div>
@@ -6,87 +10,78 @@
 	<htk-bar-button
 		icon="refresh"
 		tip="_Refresh"
-		on-click="onRefreshClick"/>
+		on-click="visits.refresh()"/>
 	<htk-bar-button
-		icon="user-info"
+		icon="visibility"
 		tip="_Connections"
-		on-click="onSessionsClick"/>
+		on-click="this.hash.setAll({form: 'admin/connections'})"/>
 </div>
 <div id="form" class="visits">
-	<div class="box">
+	<div class="vn-w-xs">
-		<div class="form">
+		<div class="form vn-pa-lg box">
 			<div class="form-group">
 				<label><t>From</t></label>
-				<htk-date-chooser>
+				<htk-date-chooser
-					<vn-param property="param" id="from"/>
+					form="params"
-				</htk-date-chooser>
+					column="from"/>
 			</div>
 			<div class="form-group">
 				<label><t>To</t></label>
-				<htk-date-chooser>
+				<htk-date-chooser
-					<vn-param property="param" id="to"/>
+					form="params"
-				</htk-date-chooser>
+					column="to"/>
 			</div>
 		</div>
-	</div>
+		<div class="summary vn-pa-lg box">
-	<div class="summary box">
+			<p>
-		<p>
+				<htk-text>
-			<htk-text>
+					<db-calc-sum
-				<db-calc-sum
+						property="param"
-					property="param"
+						model="visits"
-					model="visits"
+						column-name="visits"/>
-					column-name="visits"/>
+				</htk-text> 
-			</htk-text> 
+				<t>visits</t>,
-			<t>visits</t>,
+				<htk-text>
-			<htk-text>
+					<db-calc-sum
-				<db-calc-sum
+						property="param"
-					property="param"
+						model="visits"
-					model="visits"
+						column-name="newVisits"/>
-					column-name="newVisits"/>
+				</htk-text> 
-			</htk-text> 
+				<t>news</t>
-			<t>news</t>
+			</p>
-		</p>
+		</div>
-	</div>
+		<htk-repeater
-	<div class="list box">
+			class="box htk-list"
-		<htk-repeater form-id="iter" empty-message="_Select date interval">
+			form-id="iter"
-			<db-model property="model" id="visits">
+			empty-message="_Select date interval">
-				<custom>
+			<db-model property="model" id="visits" lot="params">
-					SELECT browser
+				SELECT browser,
-					,MIN(CAST(version AS DECIMAL(4,1))) minVersion
+						MIN(CAST(version AS DECIMAL(4,1))) minVersion,
-					,MAX(CAST(version AS DECIMAL(4,1))) maxVersion
+						MAX(CAST(version AS DECIMAL(4,1))) maxVersion,
-					,MAX(c.stamp) lastVisit
+						MAX(c.stamp) lastVisit,
-					,COUNT(DISTINCT c.id) visits
+						COUNT(DISTINCT c.id) visits,
-					,SUM(a.firstAccess = c.id AND v.firstAgent = a.id) newVisits
+						SUM(a.firstAccessFk = c.id AND v.firstAgentFk = a.id) newVisits
-						FROM visitUser e
+					FROM visitUser e
-						JOIN visitAccess c ON e.access = c.id
+						JOIN visitAccess c ON c.id = e.accessFk
-						JOIN visitAgent a ON c.agent = a.id
+						JOIN visitAgent a ON a.id = c.agentFk
-						JOIN visit v ON a.visit = v.id
+						JOIN visit v ON v.id = a.visitFk
-							WHERE c.stamp BETWEEN TIMESTAMP(#from,'00:00:00') AND TIMESTAMP(#to,'23:59:59')
+					WHERE c.stamp BETWEEN TIMESTAMP(#from,'00:00:00') AND TIMESTAMP(#to,'23:59:59')
-							GROUP BY browser ORDER BY visits DESC
+					GROUP BY browser ORDER BY visits DESC
-				</custom>
-				<sql-batch property="batch">
-					<custom>
-						<item name="from" param="from"/>
-						<item name="to" param="to"/>
-					</custom>
-				</sql-batch>
 			</db-model>
 			<custom>
 				<div class="item">
-					<p class="important">
+					<div class="content">
-						<htk-text form="iter" column="browser"/> 
+						<p class="important">
-						<htk-text form="iter" column="minVersion"/> - 
+							{{iter.browser}} {{iter.minVersion}} - {{iter.maxVersion}}
-						<htk-text form="iter" column="maxVersion"/>
+						</p>
-					</p>
+						<p>
-					<p>
+							{{iter.visits}} <t>visits</t>, 
-						<htk-text form="iter" column="visits"/> 
+							{{iter.newVisits}} <t>news</t>
-						<t>visits</t>, 
+						</p>
-						<htk-text form="iter" column="newVisits"/> 
+						<p>
-						<t>news</t>
+							{{Vn.Value.format(iter.lastVisit, _('%a, %e %b %Y at %T'))}}
-					</p>
+						</p>
-					<p>
+					</div>
-						<htk-text form="iter" column="lastVisit" format="_%a, %e %b %Y at %T"/>
-					</p>
 				</div>
 			</custom>
 		</htk-repeater>

forms/admin/visits/visits.js

@@ -1,22 +0,0 @@
-
-Hedera.Visits = new Class
-({
-	Extends: Hedera.Form
-
-	,activate: function ()
-	{
-		this.$('from').value = new Date ();
-		this.$('to').value = new Date ();
-	}
-	
-	,onRefreshClick: function ()
-	{
-		this.$('visits').refresh ();	
-	}
-	
-	,onSessionsClick: function ()
-	{
-		this.hash.set ({'form': 'admin/connections'});
-	}
-});
-

forms/agencies/packages/index.js

@@ -0,0 +1,7 @@
+import './style.scss';
+
+export default new Class({
+	Extends: Hedera.Form,
+	Template: require('./ui.xml'),
+});
+

forms/agencies/packages/locale/ca.yml

@@ -1,5 +1,4 @@
 ListByAgency: Paquets per agència
-ShowByProvince: Mostrar desglose per província
 Agency: Agència
 Exps: Exps.
 Bundles: Paquets

forms/agencies/packages/locale/en.yml

@@ -1,5 +1,4 @@
 ListByAgency: Bundles by agency
-ShowByProvince: Show breakdown by province
 Agency: Agency
 Exps: Exps.
 Bundles: Bundles

forms/agencies/packages/locale/es.yml

@@ -1,5 +1,4 @@
 ListByAgency: Bultos por agencia
-ShowByProvince: Mostrar desglose por provincia
 Agency: Agencia
 Exps: Exps.
 Bundles: Bultos

forms/agencies/packages/locale/fr.yml

@@ -1,5 +1,4 @@
 ListByAgency: Liste par agence
-ShowByProvince: Montrer par province
 Agency: Agence
 Exps: Expéditeur
 Bundles: Cartons

forms/agencies/packages/locale/pt.yml

@@ -1,5 +1,4 @@
 ListByAgency: Bultos por agencia
-ShowByProvince: Mostrar desglosse por Distrito
 Agency: Agencia
 Exps: Exps.
 Bundles: Bultos

forms/agencies/packages/packages.js

@@ -1,14 +0,0 @@
-
-Hedera.Packages = new Class
-({
-	Extends: Hedera.Form
-	
-	,onShowClick: function  (column, agencyId)
-	{
-		this.hash.set ({
-			'form': 'agencies/provinces',
-			'agency': agencyId
-		});
-	}
-});
-

forms/agencies/packages/style.css

@@ -1,9 +0,0 @@
-.packages
-{
-	padding: 1em;
-}
-.packages .box
-{
-	max-width: 40em;
-	margin: 0 auto;
-}