- [x] [repo+css+view] Split les listes en 2 colonnes

css/constants.scss

@@ -3,6 +3,7 @@ $theme-color: #e63321;
 $sub-menu-color: #5b5e63;
 
 /* FORMULAIRES */
-$form-valid-color: #19C566;
+$form-valid-color: #27a560;
 $form-neutral-color: #2193e6;
-$form-invalid-color: #d44f18;
+// $form-invalid-color: #d44f18;
+$form-invalid-color: darken($theme-color, 5);

css/container.scss

@@ -17,12 +17,12 @@
 	// @active + .list
 	& > section.active.list{
 		display: flex;
-		flex-direction: column;
+		flex-direction: row;
-		// justify-content: space-between;
+		justify-content: space-around;
-		// flex-wrap: wrap;
+		flex-wrap: wrap;
 
 		.inline-box{
-			flex: 1 1 1;
+			flex: 0 1 1;
 		}
 	}
 
@@ -33,8 +33,8 @@
 	& > section > .inline-box{
 		display: inline-block;
 		position: relative;
-			// width: calc( 100% - 2*1em - 2*1em );
+			width: calc( 50% - 2*1em - 2*1em );
-			margin: .3em 0;
+			margin: 1em;
 			padding: 1em;
 
 			border-radius: 3px;
@@ -54,6 +54,8 @@
 				font-size: 1.15em;
 				font-weight: bold;
 
+				color: darken($theme-color, 10);
+
 				& > span{
 					font-size: .8em;
 					color: #333;
@@ -61,35 +63,11 @@
 			}
 
 			/* (2) Code RFID */
+			/* (3) Adresse mail */
 			.code,
 			.mail{
-				display: inline-block;
+				display: block;
-				color: #333;
+				margin: 1em;
-				
-				// svg (icone)
-				svg{
-					display: inline-block;
-					position: relative;
-						margin-left: .8em;
-						margin-right: .5em;
-						margin-bottom: -.6em;
-						width: 1.5em;
-						height: 2em;
-
-					pointer-events: none;
-
-					path{
-						fill: #333 !important;
-						
-						pointer-events: none;
-					}
-				}
-
-			}
-
-			/* (3) Adresse mail */
-			.mail{
-				display: inline-block;
 				color: #333;
 				
 				// svg (icone)
@@ -106,7 +84,7 @@
 
 					path{
 						fill: #333 !important;
-
+						
 						pointer-events: none;
 					}
 				}
@@ -114,6 +92,7 @@
 			}
 
 
+
 			/* (4) Groupes */
 			.groups{
 				display: block;
@@ -130,7 +109,7 @@
 						width: 1.5em;
 						height: 2em;
 
-						pointer-events: none;
+					pointer-events: none;
 
 					path{
 						fill: #333 !important;
@@ -161,12 +140,10 @@
 			.link_edit,
 			.link_remove{
 				display: inline-block;
-				position: absolute;
+				position: relative;
-					top: 0;
-					left: calc( 100% - 1.2em - 2*1em );
 					width: 1.2em;
 					height: 1.2em;
-				margin: 1em;
+				margin-left: 1em;
 
 				cursor: pointer;
 
@@ -189,7 +166,6 @@
 
 			/* (6) Lien vers la suppression */
 			.link_remove{
-				top: calc( 100% - 1.2em - 2*1em );
 
 				&:hover{
 					& > svg{

manager/repo/machine.php

@@ -61,7 +61,7 @@
 		*/
 		public static function getAll(){
 			// On ecrit la requete
-			$request = Database::getPDO()->query("SELECT * FROM machine ORDER BY id_machine");
+			$request = Database::getPDO()->query("SELECT * FROM machine ORDER BY name");
 
 			// On recupere le resultat
 			$answer  = $request->fetchAll();

manager/repo/user.php

@@ -70,7 +70,7 @@
 		*/
 		public static function getAll(){
 			// On ecrit la requete
-			$request = Database::getPDO()->query("SELECT * FROM user ORDER BY id_user");
+			$request = Database::getPDO()->query("SELECT * FROM user ORDER BY username");
 
 			// On recupere le resutat
 			$answer  = $request->fetchAll();

src/static/container/card.svg

@@ -7,17 +7,17 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22.857141"
+   height="32"
    id="Layer_1"
    version="1.1"
-   viewBox="0 0 32 22.857141"
+   viewBox="0 0 32 31.999999"
    width="32"
    xml:space="preserve"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="1455547177_icon-card.svg"><metadata
+   sodipodi:docname="card.svg"><metadata
      id="metadata3168"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs3166" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -35,15 +35,16 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:zoom="10.429825"
+     inkscape:zoom="14.75"
-     inkscape:cx="65.516919"
+     inkscape:cx="31.803873"
-     inkscape:cy="-20.635069"
+     inkscape:cy="2.4807302"
      inkscape:window-x="0"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><g
+     inkscape:current-layer="Layer_1"
+     inkscape:snap-page="true" /><g
      id="g3154"
-     transform="matrix(0.07142857,0,0,0.07142857,-2.2857142,-6.8571427)"><path
+     transform="matrix(0.07142857,0,0,0.07142857,-2.2857139,-2.2857144)"><path
        d="M 452,96 H 60 c -15.5,0 -27.9,12.5 -28,28 l 0,0 v 0.3 263.4 0.3 l 0,0 c 0.2,15.5 12.5,28 28,28 h 392 c 15.6,0 28,-12.7 28,-28.3 v 0 -263.4 0 C 480,108.7 467.6,96 452,96 z M 77.1,128 h 357.7 c 6.9,0 12.1,5.1 13.1,12 v 20 H 64 V 139.7 C 65,132.9 70.3,128 77.1,128 z M 434.9,384 H 77.1 C 70.2,384 65,379.1 64,372.3 V 256 h 384 v 116 c -1,6.9 -6.3,12 -13.1,12 z"
        id="path3156"
        inkscape:connector-curvature="0" /><rect

src/static/container/group.svg

@@ -7,14 +7,14 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="26.668774"
+   height="32"
    id="Layer_1"
    version="1.1"
-   viewBox="0 0 31.999998 26.668774"
+   viewBox="0 0 31.999998 32"
    width="31.999998"
    xml:space="preserve"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="group2.svg"><metadata
+   sodipodi:docname="group.svg"><metadata
      id="metadata15"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
@@ -35,15 +35,16 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:zoom="0.4609375"
+     inkscape:zoom="20.85965"
-     inkscape:cx="191.97307"
+     inkscape:cx="14.59793"
-     inkscape:cy="160"
+     inkscape:cy="17.35532"
      inkscape:window-x="0"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><g
+     inkscape:current-layer="Layer_1"
+     inkscape:snap-page="true" /><g
      id="g3"
-     transform="matrix(0.08333202,0,0,0.08333202,-5.3354935,-7.9973471)"><path
+     transform="matrix(0.08333202,0,0,0.08333202,-5.3354939,-5.3317337)"><path
        d="M 430.1,192 H 81.9 c -17.7,0 -18.6,9.2 -17.6,20.5 l 13,183 c 0.9,11.2 3.5,20.5 21.1,20.5 h 316.2 c 18,0 20.1,-9.2 21.1,-20.5 l 12.1,-185.3 c 0.9,-11.2 0,-18.2 -17.7,-18.2 z"
        id="path5"
        inkscape:connector-curvature="0" /><g

src/static/container/mail.svg

@@ -7,13 +7,13 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22.857143"
+   height="32"
    version="1.1"
-   viewBox="0 0 32 22.857143"
+   viewBox="0 0 32 31.999999"
    width="32"
    id="svg2"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="mail2.svg">
+   sodipodi:docname="mail.svg">
   <metadata
      id="metadata13">
     <rdf:RDF>
@@ -22,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -44,17 +44,18 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:zoom="14.75"
-     inkscape:cx="7"
+     inkscape:cx="-3.8813559"
      inkscape:cy="4.9999999"
      inkscape:window-x="0"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="svg2"
+     inkscape:snap-page="true" />
   <defs
      id="defs6" />
   <g
      id="Icons with numbers"
-     transform="matrix(2.2857143,0,0,2.2857143,-2.2857143,-6.8571429)"
+     transform="matrix(2.2857143,0,0,2.2857143,-2.2857144,-2.2857149)"
      style="fill:none;stroke:none">
     <g
        id="Group"

todo.md

@@ -18,6 +18,7 @@
 ########
 # FAIT #
 ########
+- [x] [repo+css+view] Split les listes en 2 colonnes
 - [x] [container.scss] Ajout de padding-top/bottom pour les input/button
 - [x] [container.scss] Inversion des etats pour boutons
 - [x] [container.scss] Modification du temps de transition (.2s -> .4s)

view/machines.php

@@ -71,9 +71,25 @@
 				$clusters = $clusters->answer();
 				
 				echo "<article class='inline-box'>";
-					// Prenom Nom 
+					// Nom de la machine
 					echo "<span class='title'>#".$machine['name']."</span>";
 
+
+
+					// Icone vers la modification
+					echo "<span class='link_edit' data-machine='".$machine['id_machine']."'>";
+						echo ResourceDispatcher::getResource('f/svg/edit/st/sub-menu-side');
+					echo "</span>";
+
+					// Icone vers la suppression 
+					echo "<span class='link_remove' data-machine='".$machine['id_machine']."'>";
+						echo ResourceDispatcher::getResource('f/svg/remove/st/sub-menu-side');
+					echo "</span>";
+
+
+
+					
+
 					// Code RFID
 					echo "<span class='code'>";
 						echo ResourceDispatcher::getResource('f/svg/card/st/container');
@@ -91,16 +107,6 @@
 								foreach($clusters as $cluster)
 									echo "<span>".$cluster['name']."</span>";
 						echo"</span>";
-						
-					// Icone vers la modification
-					echo "<span class='link_edit' data-machine='".$machine['id_machine']."'>";
-						echo ResourceDispatcher::getResource('f/svg/edit/st/sub-menu-side');
-					echo "</span>";
-
-					// Icone vers la suppression 
-					echo "<span class='link_remove' data-machine='".$machine['id_machine']."'>";
-						echo ResourceDispatcher::getResource('f/svg/remove/st/sub-menu-side');
-					echo "</span>";
 
 
 				echo "</article>";

view/users.php

@@ -73,9 +73,24 @@
 				$clusters = $clusters->answer();
 
 				echo "<article class='inline-box'>";
+
 					// Prenom Nom 
 					echo "<span class='title'>".$user['firstname']." ".$user['lastname']." <span>#".$user['username']."</span></span>";
 
+
+
+					// Icone vers la modification
+					echo "<span class='link_edit' data-user='".$user['id_user']."'>";
+						echo ResourceDispatcher::getResource('f/svg/edit/st/sub-menu-side');
+					echo "</span>";
+
+					// Icone vers la suppression 
+					echo "<span class='link_remove' data-user='".$user['id_user']."'>";
+						echo ResourceDispatcher::getResource('f/svg/remove/st/sub-menu-side');
+					echo "</span>";
+
+
+
 					// Code RFID
 					echo "<span class='code'>";
 						echo ResourceDispatcher::getResource('f/svg/card/st/container');
@@ -102,16 +117,7 @@
 							foreach($clusters as $cluster)
 								echo "<span>".$cluster['name']."</span>";
 					echo"</span>";
-						
-					// Icone vers la modification
-					echo "<span class='link_edit' data-user='".$user['id_user']."'>";
-						echo ResourceDispatcher::getResource('f/svg/edit/st/sub-menu-side');
-					echo "</span>";
 
-					// Icone vers la suppression 
-					echo "<span class='link_remove' data-user='".$user['id_user']."'>";
-						echo ResourceDispatcher::getResource('f/svg/remove/st/sub-menu-side');
-					echo "</span>";
 
 				echo "</article>";
 			}