From e51d56e7a54a6d6591a5c921273b0d0a53281185 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 7 Nov 2017 11:37:18 +0100
Subject: [PATCH] Added forms to View() views: group, machine, user + comment
 and indent correctly

---
 build/generic/view/group/form/create/main.php | 12 ++++
 .../generic/view/group/form/create/main.twig  | 17 ++++++
 build/generic/view/group/form/edit/main.php   | 12 ++++
 build/generic/view/group/form/edit/main.twig  | 20 +++++++
 build/generic/view/group/form/remove/main.php | 12 ++++
 .../generic/view/group/form/remove/main.twig  | 18 ++++++
 .../view/machine/form/create/main.twig        |  4 ++
 .../generic/view/machine/form/edit/main.twig  |  4 ++
 .../view/machine/form/remove/main.twig        |  3 +
 build/generic/view/user/form/create/main.php  | 12 ++++
 build/generic/view/user/form/create/main.twig | 21 +++++++
 build/generic/view/user/form/edit/main.php    | 12 ++++
 build/generic/view/user/form/edit/main.twig   | 26 +++++++++
 build/generic/view/user/form/remove/main.php  | 12 ++++
 build/generic/view/user/form/remove/main.twig | 20 +++++++
 public_html/view/groups.php                   | 51 ++--------------
 public_html/view/users.php                    | 58 ++-----------------
 17 files changed, 217 insertions(+), 97 deletions(-)
 create mode 100644 build/generic/view/group/form/create/main.php
 create mode 100644 build/generic/view/group/form/create/main.twig
 create mode 100644 build/generic/view/group/form/edit/main.php
 create mode 100644 build/generic/view/group/form/edit/main.twig
 create mode 100644 build/generic/view/group/form/remove/main.php
 create mode 100644 build/generic/view/group/form/remove/main.twig
 create mode 100644 build/generic/view/user/form/create/main.php
 create mode 100644 build/generic/view/user/form/create/main.twig
 create mode 100644 build/generic/view/user/form/edit/main.php
 create mode 100644 build/generic/view/user/form/edit/main.twig
 create mode 100644 build/generic/view/user/form/remove/main.php
 create mode 100644 build/generic/view/user/form/remove/main.twig

diff --git a/build/generic/view/group/form/create/main.php b/build/generic/view/group/form/create/main.php
new file mode 100644
index 0000000..c4d17ad
--- /dev/null
+++ b/build/generic/view/group/form/create/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\group\form\create;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/group/form/create/main.twig b/build/generic/view/group/form/create/main.twig
new file mode 100644
index 0000000..b3ba466
--- /dev/null
+++ b/build/generic/view/group/form/create/main.twig
@@ -0,0 +1,17 @@
+<form class='valid'>
+
+	<input id='create_name'  type='text' placeholder='Nom'><br>
+	<span class='error-msg create_name'></span><br>
+
+	<select id='create_class'>
+		<option value='-' selected disabled>Type de groupe</option>
+		<option value='0'>utilisateurs</option>
+		<option value='1'>machines</option>
+	</select>
+
+	<span class='error-msg create_class'></span><br>
+
+
+	<button id='create_submit'>Créer</button>
+
+</form>
\ No newline at end of file
diff --git a/build/generic/view/group/form/edit/main.php b/build/generic/view/group/form/edit/main.php
new file mode 100644
index 0000000..7830f49
--- /dev/null
+++ b/build/generic/view/group/form/edit/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\group\form\edit;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/group/form/edit/main.twig b/build/generic/view/group/form/edit/main.twig
new file mode 100644
index 0000000..624a468
--- /dev/null
+++ b/build/generic/view/group/form/edit/main.twig
@@ -0,0 +1,20 @@
+<form class='neutral'>
+
+	<!-- Recherche de groupe -->
+	<input  id='edit_search_keyword' type='text' class='search' placeholder='Recherche...'><br>
+	<input  id='edit_search_id'      type='hidden' value=''>
+
+	<!-- Indice du resultat -->
+	<span class='edit_search_view'>groupe <span class='edit_search_num'>0</span> sur <span class='edit_search_sum'>0</span></span><br><br>
+	<button id='edit_search_submit' class='search'>Trouver/Suivant</button><br>
+
+	<br><br><hr class='OR' data-label='PUIS' /><br><br>
+
+	<!-- Modification de groupe -->
+	<input id='edit_name'  type='text' placeholder='Nom'><br>
+	<span class='error-msg edit_name'></span><br>
+
+	<input id='edit_class' type='text' placeholder='Type de groupe' disabled><br>
+	<button id='edit_submit' disabled>Modifier</button>
+
+</form>
\ No newline at end of file
diff --git a/build/generic/view/group/form/remove/main.php b/build/generic/view/group/form/remove/main.php
new file mode 100644
index 0000000..2aff10e
--- /dev/null
+++ b/build/generic/view/group/form/remove/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\group\form\remove;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/group/form/remove/main.twig b/build/generic/view/group/form/remove/main.twig
new file mode 100644
index 0000000..7bf087c
--- /dev/null
+++ b/build/generic/view/group/form/remove/main.twig
@@ -0,0 +1,18 @@
+<form class='invalid'>
+
+	<!-- Recherche de groupe -->
+	<input  id='remove_search_keyword' type='text' class='search' placeholder='Recherche...'><br>
+	<input  id='remove_search_id'      type='hidden' value=''>
+
+	<!-- Indice du resultat -->
+	<span class='remove_search_view'>groupe <span class='remove_search_num'>0</span> sur <span class='remove_search_sum'>0</span></span><br><br>
+	<button id='remove_search_submit' class='search'>Trouver/Suivant</button><br>
+
+	<br><br><hr class='OR' data-label='PUIS' /><br><br>
+
+	<!-- Suppression de groupe -->
+	<input id='remove_name' type='text' placeholder='Nom' disabled><br>
+	<input id='remove_class' type='text' placeholder='Type de groupe' disabled><br>
+	<button id='remove_submit' disabled>Supprimer</button>
+
+</form>
\ No newline at end of file
diff --git a/build/generic/view/machine/form/create/main.twig b/build/generic/view/machine/form/create/main.twig
index 6b36a00..a7e8579 100644
--- a/build/generic/view/machine/form/create/main.twig
+++ b/build/generic/view/machine/form/create/main.twig
@@ -1,5 +1,9 @@
 <form class='valid'>
+
 	<input id='create_name' type='text' placeholder='Name'><br>
 	<span class='error-msg create_name'></span><br>
+
+
 	<button id='create_submit'>Créer</button>
+
 </form>
\ No newline at end of file
diff --git a/build/generic/view/machine/form/edit/main.twig b/build/generic/view/machine/form/edit/main.twig
index 2553044..b0eaabc 100644
--- a/build/generic/view/machine/form/edit/main.twig
+++ b/build/generic/view/machine/form/edit/main.twig
@@ -1,4 +1,6 @@
 <form class='neutral'>
+
+	<!-- Recherche de machine -->
 	<input  id='edit_search_keyword' type='text' class='search' placeholder='Recherche...'><br>
 	<input  id='edit_search_id'      type='hidden' value=''>
 
@@ -8,7 +10,9 @@
 
 	<br><br><hr class='OR' data-label='PUIS' /><br><br>
 
+	<!-- Modification de machine -->
 	<input id='edit_name' type='text' placeholder='Name'><br>
 	<span class='error-msg edit_name'></span><br>
 	<button id='edit_submit' disabled>Modifier</button>
+
 </form>
\ No newline at end of file
diff --git a/build/generic/view/machine/form/remove/main.twig b/build/generic/view/machine/form/remove/main.twig
index 22fb9f2..f73404f 100644
--- a/build/generic/view/machine/form/remove/main.twig
+++ b/build/generic/view/machine/form/remove/main.twig
@@ -1,4 +1,6 @@
 <form class='invalid'>
+
+	<!-- Recherche de machine -->
 	<input  id='remove_search_keyword' type='text' class='search' placeholder='Recherche...'><br>
 	<input  id='remove_search_id'      type='hidden' value=''>
 
@@ -8,6 +10,7 @@
 
 	<br><br><hr class='OR' data-label='PUIS' /><br><br>
 
+	<!-- Suppression de machine -->
 	<input id='remove_name' type='text' placeholder='Name'><br>
 	<button id='remove_submit' disabled>Supprimer</button>
 </form>
\ No newline at end of file
diff --git a/build/generic/view/user/form/create/main.php b/build/generic/view/user/form/create/main.php
new file mode 100644
index 0000000..232f6fe
--- /dev/null
+++ b/build/generic/view/user/form/create/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\user\form\create;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/user/form/create/main.twig b/build/generic/view/user/form/create/main.twig
new file mode 100644
index 0000000..a6928ee
--- /dev/null
+++ b/build/generic/view/user/form/create/main.twig
@@ -0,0 +1,21 @@
+<form class='valid'>
+
+	<input id='create_code'      type='text' placeholder='CO-DE-RF-ID'><br>
+	<span class='error-msg create_code'></span><br>
+
+	<input id='create_username'  type='text' placeholder='Username'><br>
+	<span class='error-msg create_username'></span><br>
+
+	<input id='create_firstname' type='text' placeholder='Firstname'><br>
+	<span class='error-msg create_firstname'></span><br>
+
+	<input id='create_lastname'  type='text' placeholder='Lastname'><br>
+	<span class='error-msg create_lastname'></span><br>
+
+	<input id='create_mail'      type='text' placeholder='Mail'><br>
+	<span class='error-msg create_mail'></span><br>
+
+
+	<button id='create_submit'>Créer</button>
+
+</form>
\ No newline at end of file
diff --git a/build/generic/view/user/form/edit/main.php b/build/generic/view/user/form/edit/main.php
new file mode 100644
index 0000000..880a9ae
--- /dev/null
+++ b/build/generic/view/user/form/edit/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\user\form\edit;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/user/form/edit/main.twig b/build/generic/view/user/form/edit/main.twig
new file mode 100644
index 0000000..eadb66e
--- /dev/null
+++ b/build/generic/view/user/form/edit/main.twig
@@ -0,0 +1,26 @@
+<form class='neutral'>
+
+	<!-- Recherche d'utilisateur -->
+	<input  id='edit_search_keyword' type='text' class='search' placeholder='Recherche...'><br>
+	<input  id='edit_search_id'      type='hidden' value=''>
+
+	<!-- Indice du resultat -->
+	<span class='edit_search_view'>utilisateur <span class='edit_search_num'>0</span> sur <span class='edit_search_sum'>0</span></span><br><br>
+	<button id='edit_search_submit' class='search'>Trouver/Suivant</button><br>
+
+	<br><br><hr class='OR' data-label='PUIS' /><br><br>
+
+	<!-- Modification d'utilisateur -->
+	<input id='edit_code'      type='text' placeholder='CO-DE-RF-ID'><br>
+	<span class='error-msg edit_code'></span><br>
+	<input id='edit_username'  type='text' placeholder='Username'><br>
+	<span class='error-msg edit_username'></span><br>
+	<input id='edit_firstname' type='text' placeholder='Firstname'><br>
+	<span class='error-msg edit_firstname'></span><br>
+	<input id='edit_lastname'  type='text' placeholder='Lastname'><br>
+	<span class='error-msg edit_lastname'></span><br>
+	<input id='edit_mail'      type='text' placeholder='Mail'><br>
+	<span class='error-msg edit_mail'></span><br>
+	<button id='edit_submit' disabled>Modifier</button>
+
+</form>
\ No newline at end of file
diff --git a/build/generic/view/user/form/remove/main.php b/build/generic/view/user/form/remove/main.php
new file mode 100644
index 0000000..2a0df70
--- /dev/null
+++ b/build/generic/view/user/form/remove/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\user\form\remove;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/user/form/remove/main.twig b/build/generic/view/user/form/remove/main.twig
new file mode 100644
index 0000000..49610b7
--- /dev/null
+++ b/build/generic/view/user/form/remove/main.twig
@@ -0,0 +1,20 @@
+<form class='invalid'>
+
+	<!-- Recherche d'utilisateur -->
+	<input  id='remove_search_keyword' type='text' class='search' placeholder='Recherche...'><br>
+	<input  id='remove_search_id'      type='hidden' value=''>
+
+	<!-- Indice du resultat -->
+	<span class='remove_search_view'>utilisateur <span class='remove_search_num'>0</span> sur <span class='remove_search_sum'>0</span></span><br><br>
+	<button id='remove_search_submit' class='search'>Trouver/Suivant</button><br>
+
+	<br><br><hr class='OR' data-label='PUIS' /><br><br>
+
+	<!-- Suppression d'utilisateur -->
+	<input id='remove_code'      type='text' placeholder='Code'><br>
+	<span class='error-msg remove_code'></span><br>
+	<input id='remove_username'      type='text' placeholder='Username'><br>
+	<span class='error-msg remove_username'></span><br>
+	<button id='remove_submit' disabled>Supprimer</button>
+
+</form>
\ No newline at end of file
diff --git a/public_html/view/groups.php b/public_html/view/groups.php
index 353e1ad..0ccbe60 100755
--- a/public_html/view/groups.php
+++ b/public_html/view/groups.php
@@ -80,20 +80,8 @@
 	=========================================================*/
 	echo "<section data-sublink='create'>";
 
-		echo "<form class='valid'>";
-			echo "<input id='create_name'  type='text' placeholder='Nom'><br>";
-			echo "<span class='error-msg create_name'></span><br>";
-
-			echo "<select id='create_class'>
-					<option value='-' selected disabled>Type de groupe</option>
-					<option value='0'>utilisateurs</option>
-					<option value='1'>machines</option>
-				</select>";
-
-			echo "<span class='error-msg create_class'></span><br>";
-
-			echo "<button id='create_submit'>Créer</button>";
-		echo "</form>";
+		$view = View::load('group.form.create');
+		echo $view->render();
 
 	echo '</section>';
 
@@ -112,22 +100,8 @@
 	=========================================================*/
 	echo "<section data-sublink='remove'>";
 
-		echo "<form class='invalid'>";
-			// Recherche de groupe
-			echo "<input  id='remove_search_keyword' type='text' class='search' placeholder='Recherche...'><br>";
-			echo "<input  id='remove_search_id'      type='hidden' value=''>";
-			// Indice du resultat
-			echo "<span class='remove_search_view'>groupe <span class='remove_search_num'>0</span> sur <span class='remove_search_sum'>0</span></span><br><br>";
-			echo "<button id='remove_search_submit' class='search'>Trouver/Suivant</button><br>";
-
-
-			echo "<br><br><hr class='OR' data-label='PUIS' /><br><br>";
-
-			// Suppression de groupe
-			echo "<input id='remove_name' type='text' placeholder='Nom' disabled><br>";
-			echo "<input id='remove_class' type='text' placeholder='Type de groupe' disabled><br>";
-			echo "<button id='remove_submit' disabled>Supprimer</button>";
-		echo "</form>";
+		$view = View::load('group.form.remove');
+		echo $view->render();
 
 	echo '</section>';
 
@@ -146,21 +120,8 @@
 	=========================================================*/
 	echo "<section data-sublink='edit'>";
 
-		echo "<form class='neutral'>";
-			echo "<input  id='edit_search_keyword' type='text' class='search' placeholder='Recherche...'><br>";
-			echo "<input  id='edit_search_id'      type='hidden' value=''>";
-			// Indice du resultat
-			echo "<span class='edit_search_view'>groupe <span class='edit_search_num'>0</span> sur <span class='edit_search_sum'>0</span></span><br><br>";
-			echo "<button id='edit_search_submit' class='search'>Trouver/Suivant</button><br>";
-
-			echo "<br><br><hr class='OR' data-label='PUIS' /><br><br>";
-
-			echo "<input id='edit_name'  type='text' placeholder='Nom'><br>";
-			echo "<span class='error-msg edit_name'></span><br>";
-
-			echo "<input id='edit_class' type='text' placeholder='Type de groupe' disabled><br>";
-			echo "<button id='edit_submit' disabled>Modifier</button>";
-		echo "</form>";
+		$view = View::load('group.form.edit');
+		echo $view->render();
 
 	echo '</section>';
 
diff --git a/public_html/view/users.php b/public_html/view/users.php
index 989b774..62aa211 100755
--- a/public_html/view/users.php
+++ b/public_html/view/users.php
@@ -71,19 +71,8 @@
 	=========================================================*/
 	echo "<section data-sublink='create'>";
 
-		echo "<form class='valid'>";
-			echo "<input id='create_code'      type='text' placeholder='CO-DE-RF-ID'><br>";
-			echo "<span class='error-msg create_code'></span><br>";
-			echo "<input id='create_username'  type='text' placeholder='Username'><br>";
-			echo "<span class='error-msg create_username'></span><br>";
-			echo "<input id='create_firstname' type='text' placeholder='Firstname'><br>";
-			echo "<span class='error-msg create_firstname'></span><br>";
-			echo "<input id='create_lastname'  type='text' placeholder='Lastname'><br>";
-			echo "<span class='error-msg create_lastname'></span><br>";
-			echo "<input id='create_mail'      type='text' placeholder='Mail'><br>";
-			echo "<span class='error-msg create_mail'></span><br>";
-			echo "<button id='create_submit'>Créer</button>";
-		echo "</form>";
+		$view = View::load('user.form.create');
+		echo $view->render();
 
 	echo '</section>';
 
@@ -102,24 +91,8 @@
 	=========================================================*/
 	echo "<section data-sublink='remove'>";
 
-		echo "<form class='invalid'>";
-			// Recherche d'utilisateur
-			echo "<input  id='remove_search_keyword' type='text' class='search' placeholder='Recherche...'><br>";
-			echo "<input  id='remove_search_id'      type='hidden' value=''>";
-			// Indice du resultat
-			echo "<span class='remove_search_view'>utilisateur <span class='remove_search_num'>0</span> sur <span class='remove_search_sum'>0</span></span><br><br>";
-			echo "<button id='remove_search_submit' class='search'>Trouver/Suivant</button><br>";
-
-
-			echo "<br><br><hr class='OR' data-label='PUIS' /><br><br>";
-
-			// Suppression d'utilisateur
-			echo "<input id='remove_code'      type='text' placeholder='Code'><br>";
-			echo "<span class='error-msg remove_code'></span><br>";
-			echo "<input id='remove_username'      type='text' placeholder='Username'><br>";
-			echo "<span class='error-msg remove_username'></span><br>";
-			echo "<button id='remove_submit' disabled>Supprimer</button>";
-		echo "</form>";
+		$view = View::load('user.form.remove');
+		echo $view->render();
 
 	echo '</section>';
 
@@ -138,27 +111,8 @@
 	=========================================================*/
 	echo "<section data-sublink='edit'>";
 
-		echo "<form class='neutral'>";
-			echo "<input  id='edit_search_keyword' type='text' class='search' placeholder='Recherche...'><br>";
-			echo "<input  id='edit_search_id'      type='hidden' value=''>";
-			// Indice du resultat
-			echo "<span class='edit_search_view'>utilisateur <span class='edit_search_num'>0</span> sur <span class='edit_search_sum'>0</span></span><br><br>";
-			echo "<button id='edit_search_submit' class='search'>Trouver/Suivant</button><br>";
-
-			echo "<br><br><hr class='OR' data-label='PUIS' /><br><br>";
-
-			echo "<input id='edit_code'      type='text' placeholder='CO-DE-RF-ID'><br>";
-			echo "<span class='error-msg edit_code'></span><br>";
-			echo "<input id='edit_username'  type='text' placeholder='Username'><br>";
-			echo "<span class='error-msg edit_username'></span><br>";
-			echo "<input id='edit_firstname' type='text' placeholder='Firstname'><br>";
-			echo "<span class='error-msg edit_firstname'></span><br>";
-			echo "<input id='edit_lastname'  type='text' placeholder='Lastname'><br>";
-			echo "<span class='error-msg edit_lastname'></span><br>";
-			echo "<input id='edit_mail'      type='text' placeholder='Mail'><br>";
-			echo "<span class='error-msg edit_mail'></span><br>";
-			echo "<button id='edit_submit' disabled>Modifier</button>";
-		echo "</form>";
+		$view = View::load('user.form.edit');
+		echo $view->render();
 
 	echo '</section>';