From 315964bb43f923792dd6dfa8fb4237fd0ec16d7c Mon Sep 17 00:00:00 2001
From: vincent-peugnet <vincent-peugnet@riseup.net>
Date: Wed, 16 Oct 2024 20:29:26 +0200
Subject: [PATCH] move new user form outside of user list

+ fix confirm delete route bug
---
 app/view/templates/user.php              | 78 ++++++++++++------------
 app/view/templates/userconfirmdelete.php |  2 +-
 assets/css/user.css                      |  5 ++
 3 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/app/view/templates/user.php b/app/view/templates/user.php
index c76fb6cb..7f447cc0 100644
--- a/app/view/templates/user.php
+++ b/app/view/templates/user.php
@@ -11,11 +11,11 @@
 <main class="user">
     
     <section>
-        
+
         <div class="block">
 
-            <h1>Admin panel</h1>
             
+            <h2>Users</h2>
             <div class="scroll">
 
                 <table>
@@ -23,45 +23,7 @@
                 <th>id</th><th>password</th><th>hash</th><th>level</th><th>set expiration date</th><th>action</th><th>expire</th><th>connect</th>
                 </tr>
 
-                <tr>
-                    <form action="<?= $this->url('useradd') ?>" method="post">
-                    <td>
-                            <input type="text" name="id" maxlength="<?= Wcms\Model::MAX_ID_LENGTH ?>" required>
-                    </td>
-                    <td>
-                        <input type="password" name="password" id="password" minlength="<?= Wcms\Model::PASSWORD_MIN_LENGTH ?>" maxlength="<?= Wcms\Model::PASSWORD_MAX_LENGTH ?>" required>
-                    </td>
-
-                    <td>
-                    <input type="hidden" name="passwordhashed" value="0">
-                    <input type="checkbox" name="passwordhashed" value="1" checked>
-                    </td>
-
-                    <td>
-                        <select name="level" id="level">
-                            <option value="1">reader</option>
-                            <option value="2">invite</option>
-                            <option value="3">editor</option>
-                            <option value="4">super editor</option>
-                            <option value="10">admin</option>
-                        </select>
-                    </td>
-                    <td>
-                        <input type="date" name="expiredate" id="expiredate" min="<?= $now->format('Y-m-d'); ?>">
-                    </td>
-                    <td>
-                        <input type="submit" value="add">
-                    </td>
-                    <td>
-
-                    </td>
-                    <td>
-
-                    </td>
                     
-                    </form>
-                </tr>
-
 
                 <?php
                 foreach ($userlist as $user ) {
@@ -134,6 +96,42 @@
 
     </section>
 
+    <section class="new-user">
+                
+        <div class="block">
+
+            <h2>Add new user</h2>
+            
+            <div class="scroll">
+
+
+                <form action="<?= $this->url('useradd') ?>" method="post">
+
+                    <label for="id">username</label>
+                    <input type="text" name="id" id="id" maxlength="<?= Wcms\Model::MAX_ID_LENGTH ?>" required>
+                    <label for="password">password</label>
+                    <input type="password" name="password" id="password" minlength="<?= Wcms\Model::PASSWORD_MIN_LENGTH ?>" maxlength="<?= Wcms\Model::PASSWORD_MAX_LENGTH ?>" required>
+                    <div>
+                        <input type="hidden" name="passwordhashed" value="0">
+                        <input type="checkbox" name="passwordhashed" id="passwordhashed" value="1" checked>
+                        <label for="passwordhashed">hash password</label>
+                    </div>
+                    <label for="level">level</label>
+                    <select name="level" id="level">
+                        <option value="1">reader</option>
+                        <option value="2">invite</option>
+                        <option value="3">editor</option>
+                        <option value="4">super editor</option>
+                        <option value="10">admin</option>
+                    </select>
+                    <label for="expiredate">expiration date</label>
+                    <input type="date" name="expiredate" id="expiredate" min="<?= $now->format('Y-m-d'); ?>">
+                    <input type="submit" value="add">
+                </form>
+
+            </div>
+        </div>
+    </section>
 
 </main>
 
diff --git a/app/view/templates/userconfirmdelete.php b/app/view/templates/userconfirmdelete.php
index 4cf2f780..462f093a 100644
--- a/app/view/templates/userconfirmdelete.php
+++ b/app/view/templates/userconfirmdelete.php
@@ -11,7 +11,7 @@
 
 
 
-    <form action="<?= $this->url('userupdate') ?>" method="post">
+    <form action="<?= $this->url('useredit') ?>" method="post">
 
     <input type="hidden" name="id" value="<?= $userdelete->id() ?>">
 
diff --git a/assets/css/user.css b/assets/css/user.css
index 9984c50f..3bc4585b 100644
--- a/assets/css/user.css
+++ b/assets/css/user.css
@@ -11,3 +11,8 @@ main.user table form {
 main.user td {
     white-space: nowrap;
 }
+
+
+.new-user form > * {
+    display: block;
+}
\ No newline at end of file