Giancarlo Voci 7 years ago
parent
commit
0a24df0e6e
4 changed files with 8 additions and 10 deletions
  1. 3 6
      src/OpenMind/Admin/Pages.php
  2. 1 0
      ui/admin/users.js
  3. 3 3
      ui/admin/users.tpl
  4. 1 1
      ui/frontend/login.tpl

+ 3 - 6
src/OpenMind/Admin/Pages.php

@@ -12,6 +12,7 @@ use Exception;
 use OpenMind\FindBox\FindBoxCoreSystem;
 use OpenMind\FindBox\FindBoxCoreSystem;
 use OpenMind\FindBox\SmartESL;
 use OpenMind\FindBox\SmartESL;
 use OpenMind\System\Notifications;
 use OpenMind\System\Notifications;
+use OpenMind\System\User;
 use OpenMind\Web\Controller;
 use OpenMind\Web\Controller;
 use Template;
 use Template;
 
 
@@ -235,12 +236,8 @@ class Pages extends Controller
 
 
 	public function Users(Base $f3)
 	public function Users(Base $f3)
 	{
 	{
-		$f3->set('USERLIST',
-			[
-				['username' => 'giancarlo'],
-				['username' => 'luigi']
-			]
-		);
+		$listaUtenti = new User('');
+		$f3->set('USERLIST', $listaUtenti->find());
 		$f3->set('PAGENAME', 'User Management');
 		$f3->set('PAGENAME', 'User Management');
 		$f3->set('CONTENT', 'users.tpl');
 		$f3->set('CONTENT', 'users.tpl');
 		echo Template::instance()->render('masterpage.tpl');
 		echo Template::instance()->render('masterpage.tpl');

+ 1 - 0
ui/admin/users.js

@@ -0,0 +1 @@
+alert('ciao mauro');

+ 3 - 3
ui/admin/users.tpl

@@ -13,17 +13,17 @@
 				<div class="card-body">
 				<div class="card-body">
 					<form class="form">
 					<form class="form">
 						<div class="form-group">
 						<div class="form-group">
-							<input type="text" class="mb-1 form-control" placeholder="username"/>
+							<input type="text" class="mb-1 form-control" placeholder="username" value="{{@USER.username}}"/>
 
 
 							<div class="input-group mb-1">
 							<div class="input-group mb-1">
-								<input type="text" class="form-control" placeholder="password" aria-label="password">
+								<input type="text" class="form-control" placeholder="password" aria-label="password" value="">
 								<div class="input-group-append">
 								<div class="input-group-append">
 									<button class="btn btn-primary" type="button"><i class="fa fa-eye"></i></button>
 									<button class="btn btn-primary" type="button"><i class="fa fa-eye"></i></button>
 								</div>
 								</div>
 							</div>
 							</div>
 
 
 
 
-							<input type="text" class="form-control" placeholder="roles" data-role="tagsinput"/>
+							<input type="text" class="form-control" placeholder="roles" data-role="tagsinput" value="{{join(',',@USER->getRoles())}}"/>
 						</div>
 						</div>
 
 
 						<div class="form-group">
 						<div class="form-group">

+ 1 - 1
ui/frontend/login.tpl

@@ -8,7 +8,7 @@
 			</div>
 			</div>
 		</check>
 		</check>
 		<label class="sr-only" for="username">username</label>
 		<label class="sr-only" for="username">username</label>
-		<input autocomplete="off" class="form-control mb-1" id="username" name="username" placeholder="Username" required type="text">
+		<input autofocus autocomplete="off" class="form-control mb-1" id="username" name="username" placeholder="Username" required type="text">
 		<label class="sr-only" for="password">Password</label>
 		<label class="sr-only" for="password">Password</label>
 		<input autocomplete="off" class="form-control mb-1" id="password" name="password" placeholder="Password" required type="password">
 		<input autocomplete="off" class="form-control mb-1" id="password" name="password" placeholder="Password" required type="password">
 		<button class="btn btn-block" type="submit">Invia</button>
 		<button class="btn btn-block" type="submit">Invia</button>