Merge with master

forms/admin/connections/ui.xml

@@ -21,7 +21,7 @@
 	<div class="card list">
 		<htk-repeater>
 			<db-model property="model" id="sessions" on-status-changed="onModelStatusChange">
-				SELECT vu.user userId, vu.stamp, c.Cliente, s.lastUpdate, 
+				SELECT vu.user 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.userVisit
@@ -29,7 +29,6 @@
 						JOIN visitAgent a ON a.id = ac.agent
 						JOIN visit v ON v.id = a.visit
 						JOIN account.user u ON u.id = vu.user
-						JOIN vn2008.Clientes c ON c.Id_cliente = vu.user
 					ORDER BY lastUpdate DESC
 			</db-model>
 			<custom>
@@ -45,7 +44,7 @@
 							on-click="onChangeUserClick"/>
 					</div>
 					<p class="important">
-						{{Cliente}}
+						{{nickname}}
 					</p>
 					<p>
 						<htk-text lot="iter" name="stamp" format="%a, %T"/> - 

forms/admin/users/locale/ca.json

@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "Gestió d'usuaris"
+	 "User management": "Gestió d'usuaris"
 
-	,"UserName:": "Nom d'usuari:"
+	,"Disabled": "Deshabilitat"
-
+	,"Impersonate user": "Suplantar usuari"
-	,"UserNumber": "N usuari"
+	,"Access log": "Registre d'accessos"
-	,"UserName": "Nom d'usuari"
-	,"Alias": "Alias"
-	
-	,"AccessAsUser": "Suplantar usuari"
-	,"AccessLog": "Registre d'accessos"
 }

forms/admin/users/locale/en.json

@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "User management"
+	"User management": "User management"
-
-	,"UserName:": "Username:"
-
-	,"UserNumber": "User number"
-	,"UserName": "Username"
-	,"Alias": "Alias"
 	
-	,"AccessAsUser": "Impersonate user"
+	,"Disabled": "Disabled"
-	,"AccessLog": "Access log"
+	,"Impersonate user": "Impersonate user"
+	,"Access log": "Access log"
 }

forms/admin/users/locale/es.json

@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "Gestión de usuarios"
+	"User management": "Gestión de usuarios"
-
-	,"UserName:": "Nombre de usuario:"
-
-	,"UserNumber": "Nº usuario"
-	,"UserName": "Nombre de usuario"
-	,"Alias": "Alias"
 	
-	,"AccessAsUser": "Suplantar usuario"
+	,"Disabled": "Desactivado"
-	,"AccessLog": "Registro de accesos"
+	,"Impersonate user": "Suplantar usuario"
+	,"Access log": "Registro de accesos"
 }

forms/admin/users/locale/fr.json

@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "Gestion des utilisateurs"
+	"User management": "Gestion des utilisateurs"
-
+	
-	,"UserName:": "Nom d'utilisateur:"
+	,"Disabled": "Désactivé"
-
+	,"Impersonate user": "Accès utilisateur"
-	,"UserNumber": "Numéro utilisateurs"
+	,"Access log": "Journal des accès"
-	,"UserName": "Nom d'utilisateur"
-	,"Alias": "Alias"
-
-	,"AccessAsUser": "Accès utilisateur"
-	,"AccessLog": "Journal des accès"
 }

forms/admin/users/locale/mn.json

@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "User management"
+	"User management": "User management"
-
-	,"UserName:": "Username:"
-
-	,"UserNumber": "User number"
-	,"UserName": "Username"
-	,"Alias": "Alias"
 	
-	,"AccessAsUser": "Impersonate user"
+	,"Disabled": "Disabled"
-	,"AccessLog": "Access log"
+	,"Impersonate user": "Impersonate user"
+	,"Access log": "Access log"
 }

forms/admin/users/locale/pt.json

@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "Gestão de usuarios"
+	"User management": "Gestão de usuarios"
-
-	,"UserName:": "Nome de usuario:"
-
-	,"UserNumber": "Nº usuario"
-	,"UserName": "Nome de usuario"
-	,"Alias": "Alias"
 	
-	,"AccessAsUser": "Suplantar usuario"
+	,"Disabled": "Desativado"
-	,"AccessLog": "Registro de acessos"
+	,"Impersonate user": "Suplantar usuario"
+	,"Access log": "Registro de acessos"
 }

forms/admin/users/style.css

@@ -1,4 +1,12 @@
 
+.users ._disabled
+{
+	color: white;
+	background-color: #F66;
+	border-radius: .2em;
+	padding: .3em;
+	font-size: .8em;
+}
 .action-bar .htk-search-entry
 {
 	margin: .8em;

forms/admin/users/ui.xml

@@ -1,19 +1,18 @@
 <vn>
 <h1 id="title">
-	_UserManagement
+	_User management
 </h1>
 <div id="actions">
 	<htk-search-entry lot="hash" name="user"/>
 </div>
 <div id="main" class="users">
 	<div class="card list">
-		<htk-repeater>
+		<htk-repeater renderer="rendererFunc">
 			<db-model property="model" lot="hash">
-				SELECT u.id, u.name, c.Cliente
+				SELECT u.id, u.name, u.nickname, u.active
 					FROM account.user u
-						INNER JOIN vn2008.Clientes c ON u.id = c.Id_Cliente
 					WHERE u.name LIKE CONCAT('%', #user, '%')
-						OR c.Cliente LIKE CONCAT('%', #user, '%')
+						OR u.nickname LIKE CONCAT('%', #user, '%')
 						OR u.id = #user
 					ORDER BY u.name LIMIT 200
 			</db-model>
@@ -23,14 +22,18 @@
 					href="#!form=admin/access-log&amp;user={{id}}"
 					title="_AccessLog">
 					<div class="actions">
+						<span id="disabled">
+							_Disabled
+						</span>
 						<htk-button
+							id="impersonate"
 							value="{{id}}"
 							tip="_AccessAsUser"
 							icon="incognito"
 							on-click="onChangeUserClick"/>
 					</div>
 					<p class="important">
-						{{Cliente}}
+						{{nickname}}
 					</p>
 					<p>
 						@{{id}} - {{name}}

forms/admin/users/users.js

@@ -3,6 +3,15 @@ Hedera.Users = new Class
 ({
 	Extends: Hedera.Form
 
+	,rendererFunc: function (scope, lot)
+	{
+		var isEnabled = lot.$.active;
+		scope.$.disabled.style.display = isEnabled ?
+			'none' : 'block';
+		scope.$.impersonate.node.style.display = isEnabled ?
+			'block' : 'none';
+	}
+
 	,onChangeUserClick: function (button)
 	{
 		this.gui.supplantUser (button.value,

forms/ecomerce/catalog/ui.xml

@@ -236,6 +236,9 @@
 				<h2>
 					{{card.name}}
 				</h2>
+				<p>
+					{{card.id}}
+				</p>
 				<p class="producer">
 					{{card.producer}}
 				</p>

forms/news/news/ui.xml

@@ -12,9 +12,9 @@
 	<div class="card">
 		<htk-repeater form-id="iter" renderer="repeaterFunc">
 			<db-model property="model" id="news-model" updatable="true">
-				SELECT n.id, c.Cliente, priority, image, title
+				SELECT n.id, u.nickname, priority, image, title
 					FROM news n
-						JOIN vn2008.Clientes c ON n.user_id = c.Id_Cliente
+						JOIN account.user u ON u.id = n.user_id
 					ORDER BY priority, n.date_time DESC
 			</db-model>
 			<custom>
@@ -39,7 +39,7 @@
 						{{title}}
 					</p>
 					<p>
-						{{Cliente}}
+						{{nickname}}
 					</p>
 					<p>
 						<span>_Priority</span> {{priority}}

js/hedera/gui.js

@@ -497,7 +497,7 @@ module.exports = new Class
 	
 		this.loadMenu ();
 	
-		var sql = 'SELECT name FROM customer_user';
+		var sql = 'SELECT nickname FROM account.userView';
 		this._conn.execQuery (sql, this._onSupplantName.bind (this));
 		
 		if (callback)