- [x] [container.scss][view/users+machines] Charte avancee

css/container.scss

@@ -210,11 +210,22 @@
 			padding: 1em;
 
 			border-radius: 3px;
+			border-color: $form-invalid-color;
 			box-shadow: 0 0 1px #b7b7b7;
 
 			background-color: #fff;
 
 
+
+		&.valid{
+			border-color: $form-valid-color;
+		}
+
+		&.neutral{
+			border-color: $form-neutral-color;
+		}
+
+
 		/* (1) Champs de texte */
 		input[type=text],
 		input[type=mail],
@@ -319,6 +330,53 @@
 				color: #fff;
 			}
 		}
+
+		// "OU" separant les boutons
+		hr.OR{
+			display: block;
+			position: relative;
+				width: 100%;
+				height: 0;
+
+			border: 0;
+			border-bottom: 1px dashed $form-invalid-color;
+
+			&:before{
+				content: 'OU';
+				display: inline-block;
+				position: relative;
+					top: 50%;
+					left: 50%;
+					padding: 0 1em;
+	
+				background-color: #fff;
+
+				color: $form-invalid-color;
+
+				transform: translateX(-50%) translatey(-50%);
+			}
+
+		}
+
+		// "OU" valide
+		.valid > hr.OR,
+		hr.OR.valid{
+			border-bottom: 1px dashed $form-valid-color;
+			&:before{
+				color: $form-valid-color;
+			}
+
+		}
+
+		// "OU" neutre
+		.neutral > hr.OR,
+		hr.OR.neutral{
+			border-bottom: 1px dashed $form-neutral-color;
+			&:before{
+				color: $form-neutral-color;
+			}
+
+		}
 	}
 
 }

todo.md

@@ -18,6 +18,7 @@
 ########
 # FAIT #
 ########
+- [x] [container.scss][view/users+machines] Charte avancee
 - [x] [container.scss] Refonte mineure formulaires, charte graphique en cours
 - [x] Creation de la base des managers et de l'API
 - [x] Conception des managers et de l'API

view/machines.php

@@ -151,8 +151,9 @@
 
 		echo "<form class='invalid'>";
 			echo "<input id='create_code' type='text' placeholder='Code'><br>";
+			echo "<hr class='OR' />";
 			echo "<input id='create_name' type='text' placeholder='Name'><br>";
-			echo "<button id='create_submit'>Créer</button>";
+			echo "<button id='create_submit'>Supprimer</button>";
 		echo "</form>";
 
 	echo '</section>';
@@ -173,9 +174,9 @@
 	echo "<section data-sublink='edit'>";
 
 		echo "<form class='neutral'>";
-			echo "<input id='create_code' type='text' placeholder='Code'><br>";
+			echo "<input id='edit_code' type='text' placeholder='Code'><br>";
-			echo "<input id='create_name' type='text' placeholder='Name'><br>";
+			echo "<input id='edit_name' type='text' placeholder='Name'><br>";
-			echo "<button id='create_submit'>Créer</button>";
+			echo "<button id='edit_submit'>Modifier</button>";
 		echo "</form>";
 
 	echo '</section>';

view/users.php

@@ -137,7 +137,7 @@
 	echo "<section data-sublink='create'>";
 
 		echo "<form class='valid'>";
-			echo "<input id='create_code'      type='text' placeholder='Code'><br>";
+			echo "<input id='create_code'      type='text' placeholder='CO-DE-RF-ID'><br>";
 			echo "<input id='create_username'  type='text' placeholder='Username'><br>";
 			echo "<input id='create_firstname' type='text' placeholder='Firstname'><br>";
 			echo "<input id='create_lastname'  type='text' placeholder='Lastname'><br>";
@@ -164,9 +164,33 @@
 	=========================================================*/
 	echo "<section data-sublink='remove'>";
 
-		echo "<form>";
+		echo "<form class='invalid'>";
 			echo "<input id='remove_code'      type='text' placeholder='Code'><br>";
+			echo "<hr class='OR' />";
+			echo "<input id='remove_username'      type='text' placeholder='Username'><br>";
 			echo "<button id='remove_submit'>Supprimer</button>";
 		echo "</form>";
 
 	echo '</section>';
+
+
+
+
+
+
+
+
+
+
+
+
+	/* [4] Modification d'utilisateur
+	=========================================================*/
+	echo "<section data-sublink='edit'>";
+
+		echo "<form class='neutral'>";
+			echo "<input id='edit_code'      type='text' placeholder='Code'><br>";
+			echo "<button id='edit_submit'>Modifier</button>";
+		echo "</form>";
+
+	echo '</section>';