- [x] [ResourceDispatcher] Gestion de la coloration de svg

- [x] [src/*.svg] Modification des svg (attribution des ID)

automate.php

@@ -304,4 +304,7 @@
 	}//editUser();
 
 
+
+	echo ResourceDispatcher::getResource('f/svg/search/st/sub-menu-side/#b1b1b1');
+
 ?>

manager/ResourceDispatcher.php

@@ -16,6 +16,7 @@
 		private $header;
 		private $path;
 		private $flags;
+		private $stylesheet;
 		public $error;
 
 
@@ -121,7 +122,7 @@
 			$correct = $correct && array_key_exists($serialFlags[0], self::$supported_extensions);
 
 			// Verification du filename
-			$correct = $correct && preg_match('#^[\w_-]+$#i', $serialFlags[1]);
+			$correct = $correct && preg_match('/^[\w_-]+$/i', $serialFlags[1]);
 
 			// Verification du parent
 			$correct = $correct && array_key_exists($serialFlags[2], self::$supported_parents);
@@ -130,7 +131,14 @@
 			$opt_subParent = count($serialFlags) >= 4;
 
 			if( $opt_subParent )
-				$correct = $correct && preg_match('#^[\w_-]+$#i', $serialFlags[3]);
+				$correct = $correct && preg_match('/^[\w_-]+$/i', $serialFlags[3]);
+
+			// Verification de la couleur (optionnel)
+			$opt_color = count($serialFlags) >= 5;
+
+			if( $opt_color )
+				$correct = $correct && preg_match('/^#[\da-f]{6}+$/i', $serialFlags[4]);
+
 
 
 			if( !$correct )
@@ -151,6 +159,10 @@
 			if( $opt_subParent )
 				$this->flags['subparent'] = $serialFlags[3];
 
+			// Ajout du color optionnel
+			if( $opt_color )
+				$this->flags['color'] = $serialFlags[4];
+
 			return true;
 
 
@@ -193,15 +205,31 @@
 			$opt_subParent = (isset($this->flags['subparent'])) ? $this->flags['subparent'].'/' : '';
 
 
-			/* [4] On definit le header
+			/* [4] Gestion du color optionnel
+			=========================================================*/
+			$this->stylesheet = "";
+
+			// si le color est defini
+			if( isset($this->flags['color']) ){
+				$this->stylesheet = "\n<style type='text/css'>\n";
+					$this->stylesheet .= "\t#stylisable{\n";
+						$this->stylesheet .= "\t\tfill: ".$this->flags['color']." !important;\n";
+						$this->stylesheet .= "\t\tfill-opacity: 1 !important;\n";
+					$this->stylesheet .= "\t}\n";
+				$this->stylesheet .= "</style>";
+			}
+			
+
+
+			/* [5] On definit le header
 			==========================================================*/
 			$this->header = $header;
 
-			/* [5] On construit le chemin 
+			/* [6] On construit le chemin 
 			==========================================================*/
 			$this->path = __ROOT__.$parent.'/'.$opt_subParent.$this->flags['filename'].'.'.$this->flags['extension'];
 
-			/* [6] On retourne si le fichier existe ou non
+			/* [7] On retourne si le fichier existe ou non
 			==========================================================*/
 			return @file_get_contents( $this->path ) != false;
 
@@ -223,6 +251,8 @@
 
 			// On inclut le contenu
 			echo file_get_contents($this->path);
+
+			echo $this->stylesheet;
 		}
 
 
@@ -237,7 +267,8 @@
 
 
 			// On inclut le contenu
-			return file_get_contents($this->path);
+			return file_get_contents($this->path).$this->stylesheet;
+
 		}
 
 

src/static/container/card.svg

@@ -46,20 +46,20 @@
      id="g3154"
      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"
+       id="stylisable"
        inkscape:connector-curvature="0" /><rect
        height="16"
        width="192"
        x="96"
        y="304"
-       id="rect3158" /><rect
+       id="stylisable" /><rect
        height="16"
        width="96"
        x="96"
        y="336"
-       id="rect3160" /><rect
+       id="stylisable" /><rect
        height="48"
        width="64"
        x="352"
        y="304"
-       id="rect3162" /></g></svg>
+       id="stylisable" /></g></svg>

src/static/container/group.svg

@@ -46,9 +46,9 @@
      id="g3"
      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"
+       id="stylisable"
        inkscape:connector-curvature="0" /><g
        id="g7"><path
          d="m 426.2,143.3 c -0.5,-12.4 -4.5,-15.3 -15.1,-15.3 0,0 -121.4,0 -143.2,0 -21.8,0 -24.4,0.3 -40.9,-17.4 C 213.3,95.8 218.7,96 190.4,96 c -22.6,0 -75.3,0 -75.3,0 -17.4,0 -23.6,-1.5 -25.2,16.6 -1.5,16.7 -5,57.2 -5.5,63.4 h 343.4 l -1.6,-32.7 z"
-         id="path9"
+         id="stylisable"
          inkscape:connector-curvature="0" /></g></g></svg>

src/static/container/mail.svg

@@ -63,7 +63,7 @@
        style="fill:#000000">
       <path
          d="m 345.73196,8.4845362 4.94979,4.2426818 C 350.50168,12.895464 350.2595,13 349.99315,13 l -11.98631,0 c -0.26765,0 -0.5106,-0.102945 -0.69077,-0.270915 L 342.26804,8.4845362 344,10 z M 344,9 337.31824,3.2727818 C 337.49832,3.1045365 337.7405,3 338.00684,3 l 11.98631,0 c 0.26766,0 0.51061,0.1029448 0.69078,0.2709155 z m 7,3.185608 L 346.16736,8.0788577 351,3.875422 l 0,8.310186 0,0 z m -14,0 0,-8.3074561 4.83264,4.2007055 L 337,12.185608 l 0,0 z m 0,0"
-         id="Shape"
+         id="stylisable"
          inkscape:connector-curvature="0" />
     </g>
   </g>

src/static/menu-side/analytics.svg

@@ -62,7 +62,7 @@
        style="fill:#000000;fill-opacity:1">
       <path
          d="m 16,26 c 2.418953,0 4.436703,-1.717753 4.899982,-4 l 2.029129,0 C 22.443885,25.392291 19.526474,28 16,28 13.555527,28 11.403706,26.747009 10.151757,24.848243 L 9,26 9,25 9,23 9,22 9.0708888,22 11.100018,22 13,22 11.608137,23.391863 C 12.456236,24.945806 14.105008,26 16,26 z M 20.899982,20 20,20 19,20 20.391875,18.608159 C 19.543801,17.054217 17.895013,16 16,16 c -2.418953,0 -4.436703,1.717753 -4.899982,4 L 9.0708888,20 C 9.5561148,16.607709 12.473526,14 16,14 c 2.444487,0 4.59632,1.253007 5.848271,3.151799 L 23,16.000098 23,20 22.929111,20 z M 0,19 C 0,16.782838 1.2075399,14.841641 3.0021135,13.802995 3.1069062,8.9234028 7.0952729,5 12,5 15.233498,5 18.068721,6.7052116 19.65547,9.2654333 20.240206,9.092705 20.859277,9 21.5,9 c 2.784553,0 5.16015,1.750949 6.085843,4.211897 C 30.129704,13.907454 32,16.235367 32,19 c 0,3.306966 -2.68637,6 -6.000176,6 l -1.935344,0 c 0.312341,-0.628505 0.553371,-1.298702 0.712504,-2 l 1.226177,0 C 28.210554,23 30,21.204644 30,19 30,16.790861 28.20588,15 26.003161,15 l -0.03062,0 C 25.723803,12.750016 23.816271,11 21.5,11 20.442753,11 19.470664,11.364599 18.702606,11.974922 17.834068,9.0963276 15.161846,7 12,7 8.1340066,7 5,10.134007 5,14 5,14.375791 5.029612,14.744666 5.086631,15.104418 3.3177882,15.517576 2,17.108083 2,19 c 0,2.209139 1.7941203,4 3.9968389,4 L 7,23 7,25 6.0001757,25 C 2.686978,25 0,22.313708 0,19 z m 0,0"
-         id="Rectangle 1 copy 4"
+         id="stylisable"
          style="fill:#000000;fill-opacity:1"
          inkscape:connector-curvature="0" />
     </g>
@@ -70,13 +70,13 @@
   <path
      style="fill:#000000;fill-opacity:1;stroke:none"
      d="M 0 19.375 L 0 31.59375 L 8 31.59375 L 8 19.375 L 0 19.375 z M 1.8125 21.28125 L 6.1875 21.28125 L 6.1875 29.6875 L 1.8125 29.6875 L 1.8125 21.28125 z "
-     id="path3801" />
+     id="stylisable" />
   <path
      style="fill:#000000;fill-opacity:1;stroke:none"
      d="M 12 10.59375 L 12 31.59375 L 20 31.59375 L 20 10.59375 L 12 10.59375 z M 13.8125 12.5625 L 18.1875 12.5625 L 18.1875 29.625 L 13.8125 29.625 L 13.8125 12.5625 z "
-     id="path3799" />
+     id="stylisable" />
   <path
      style="fill:#000000;fill-opacity:1;stroke:none"
      d="M 24 0.40625 L 24 31.59375 L 32 31.59375 L 32 0.40625 L 24 0.40625 z M 25.75 2.5625 L 30.25 2.5625 L 30.25 29.4375 L 25.75 29.4375 L 25.75 2.5625 z "
-     id="path3785" />
+     id="stylisable" />
 </svg>

src/static/menu-side/dashboard.svg

@@ -50,7 +50,7 @@
      id="g3934"
      style="fill:#000000;fill-opacity:1"
      transform="matrix(1.1423365,0,0,1.1423365,-2.2700952,-2.277384)"><path
-       id="path3936"
+       id="stylisable"
        style="fill:#000000;fill-opacity:1"
        d="m 16,20 c -1.068,0 -2.073,-0.416 -2.829,-1.172 -1.56,-1.56 -1.56,-4.097 0,-5.656 1.257,-1.257 7.272,-3.639 8.465,-4.104 0.371,-0.144 0.79,-0.056 1.07,0.225 0.28,0.281 0.369,0.7 0.225,1.07 -0.465,1.193 -2.847,7.209 -4.104,8.465 C 18.073,19.584 17.068,20 16,20 z m 4.188,-8.187 c -2.453,1.028 -5.064,2.235 -5.602,2.773 -0.78,0.78 -0.78,2.048 0,2.828 0.756,0.756 2.073,0.756 2.829,0 0.537,-0.539 1.745,-3.148 2.773,-5.601 z M 16,30 C 12.26,30 8.745,28.544 6.101,25.899 1.779,21.578 0.752,15.025 3.547,9.595 3.8,9.104 4.402,8.911 4.894,9.163 5.386,9.415 5.579,10.018 5.326,10.51 2.93,15.164 3.81,20.78 7.515,24.485 9.781,26.752 12.794,28 16,28 19.205,28 22.219,26.752 24.485,24.485 26.751,22.218 28,19.205 28,16 28,12.794 26.752,9.781 24.485,7.515 22.218,5.249 19.206,4 16,4 12.794,4 9.781,5.249 7.515,7.515 7.124,7.906 6.492,7.906 6.101,7.515 5.71,7.124 5.71,6.492 6.101,6.101 8.745,3.457 12.26,2 16,2 19.74,2 23.256,3.457 25.899,6.101 28.544,8.745 30,12.26 30,16 30,19.739 28.544,23.255 25.899,25.899 23.256,28.544 19.74,30 16,30 z"
        inkscape:connector-curvature="0" /></g></svg>

src/static/menu-side/machines.svg

@@ -50,7 +50,7 @@
      id="g3"
      transform="matrix(0.05944961,0,0,0.05944961,-5.12155e-7,2.921265e-5)"><path
        d="M 101.58,279.827 C 45.569,279.827 0,325.399 0,381.41 c 0,56.011 45.569,101.582 101.58,101.582 56.016,0 101.582,-45.571 101.582,-101.582 0,-56.011 -45.566,-101.583 -101.582,-101.583 z m 0,168.133 c -36.697,0 -66.549,-29.855 -66.549,-66.55 0,-36.695 29.852,-66.544 66.549,-66.544 36.703,0 66.555,29.85 66.555,66.544 0,36.694 -29.846,66.55 -66.555,66.55 z M 395.986,325.991 c -42.747,0 -77.525,34.778 -77.525,77.52 0,42.752 34.778,77.525 77.525,77.525 42.747,0 77.525,-34.762 77.525,-77.525 0,-42.741 -34.766,-77.52 -77.525,-77.52 z m 0,124.338 c -25.818,0 -46.813,-21.012 -46.813,-46.818 0,-25.812 21.007,-46.808 46.813,-46.808 25.818,0 46.825,20.995 46.825,46.808 0,25.806 -21.007,46.818 -46.825,46.818 z M 214.389,373.466 h 96.742 c -4.428,10.675 -6.904,22.354 -6.916,34.619 l -92.246,0.06 c 1.838,-8.032 2.899,-16.355 2.899,-24.955 0.006,-3.281 -0.201,-6.497 -0.479,-9.724 z m 320.328,-82.945 c 0,-7.867 -6.401,-14.257 -14.263,-14.257 L 341.033,237.058 282.333,66.009 C 280.72,59.702 275.027,55.278 268.517,55.278 H 78.04 c -7.879,0 -14.254,6.392 -14.254,14.253 0,7.882 6.38,14.254 14.254,14.254 h 24.146 v 129.75 c -4.823,-0.902 -9.777,-1.427 -14.86,-1.427 -44.286,0 -80.197,35.907 -80.197,80.197 v 27.621 c 19.337,-33.089 55.153,-55.373 96.236,-55.373 55.848,0 101.963,41.097 110.097,94.661 h 101.057 c 15.078,-28.82 45.211,-48.503 79.996,-48.503 49.822,0 90.21,40.347 90.287,90.156 l 26.941,-0.023 c 0.525,0.059 -16.775,0.172 -16.243,0.172 h 28.514 c 7.867,0 14.257,-6.402 14.257,-14.251 l -3.554,-96.244 z m -300.263,-58.21 c -16.875,-50.75 -89.317,-55.762 -96.26,-55.762 h -7.489 V 83.791 H 257.44 l 53.324,148.52 h -76.31 z"
-       id="path5"
+       id="stylisable"
        inkscape:connector-curvature="0" /></g><g
      id="g7"
      transform="matrix(0.05944961,0,0,0.05944961,-9.654541e-7,3.2863134)" /><g

src/static/menu-side/users.svg

@@ -47,9 +47,9 @@
      sodipodi:type="inkscape:offset"
      inkscape:radius="0.12774596"
      inkscape:original="M 7.25 20.65625 L 3.59375 21.65625 C 0.619852 22.5225 0 24.17381 0 25.40625 L 0 28.1875 C 5.9211895e-16 30.26991 1.698531 31.96875 3.78125 31.96875 L 28.21875 31.96875 C 30.301469 31.96875 32.000526 30.26959 32 28.1875 L 32 25.40625 C 32 24.16742 31.38622 22.51324 28.40625 21.65625 L 24.90625 20.6875 C 24.565628 20.591 24.22022 20.78534 24.125 21.125 C 24.029779 21.46531 24.222517 21.81135 24.5625 21.90625 L 28.0625 22.875 C 29.837828 23.3853 30.71875 24.24219 30.71875 25.40625 L 30.71875 28.1875 C 30.71875 29.56533 29.596578 30.6875 28.21875 30.6875 L 3.78125 30.6875 C 2.403741 30.6875 1.28125 29.56565 1.28125 28.1875 L 1.28125 25.40625 C 1.28125 24.97488 1.268436 23.65275 3.9375 22.875 L 7.59375 21.875 C 7.934054 21.78074 8.12519 21.43406 8.03125 21.09375 C 7.937307 20.75345 7.590942 20.56325 7.25 20.65625 z "
-     id="path3893"
+     id="stylisable"
      d="m 7.53125,20.5 c -0.098153,-0.01247 -0.2113013,0.0036 -0.3125,0.03125 l -3.65625,1 C 2.0569135,21.969804 1.1401025,22.612145 0.59375,23.3125 0.04739752,24.012855 -0.125,24.768614 -0.125,25.40625 l 0,2.78125 c 0,2.151875 1.7540641,3.90625 3.90625,3.90625 l 24.4375,0 c 2.152199,0 3.906794,-1.754646 3.90625,-3.90625 l 0,-2.78125 c 0,-0.640512 -0.173055,-1.392856 -0.71875,-2.09375 -0.545695,-0.700894 -1.460023,-1.347365 -2.96875,-1.78125 l -3.5,-0.96875 C 24.531811,20.447566 24.113476,20.688971 24,21.09375 c -0.113329,0.405027 0.125854,0.824341 0.53125,0.9375 l 3.5,0.96875 c 0.87481,0.251455 1.516701,0.596931 1.9375,1 0.420799,0.403069 0.625,0.856445 0.625,1.40625 l 0,2.78125 c 0,1.308468 -1.066534,2.375 -2.375,2.375 l -24.4375,0 c -1.308151,0 -2.375,-1.066215 -2.375,-2.375 l 0,-2.78125 c 0,-0.21695 0.00274,-0.61096 0.3125,-1.0625 C 2.0285084,23.89221 2.6529367,23.38342 3.96875,23 L 7.625,22 C 8.031099,21.887516 8.267938,21.467104 8.15625,21.0625 8.0721547,20.757873 7.8257091,20.537425 7.53125,20.5 z"
      transform="matrix(0.99224806,0,0,0.9754073,0.12403095,0.45485061)" /><path
      d="m 16.0625,0.27094721 c -4.96555,0 -9,3.94762949 -9,8.80770809 l 0,4.3426897 c 0,4.85977 4.03445,8.807708 9,8.807708 4.96619,0 9,-3.947938 9,-8.807708 l 0,-4.3426897 c 0,-4.8600786 -4.03381,-8.80770809 -9,-8.80770809 z m 0,1.68202759 c 4.074379,0 7.40625,3.2301063 7.40625,7.2174275 l 0,4.1591957 c 0,3.986728 -3.331871,7.24801 -7.40625,7.24801 -4.074072,0 -7.375,-3.261282 -7.375,-7.24801 l 0,-4.1591957 c 0,-3.9873212 3.300928,-7.2174275 7.375,-7.2174275 z"
-     id="path3881"
+     id="stylisable"
      inkscape:connector-curvature="0" /></svg>

src/static/sub-menu-side/analytics.svg

@@ -47,8 +47,8 @@
      id="g3"
      transform="matrix(0.63920738,0,0,0.63920738,-4.4546362,-4.4546361)"><path
        d="M 29.568,11.75 C 17.086,11.749 6.968,21.867 6.969,34.349 6.968,46.831 17.086,56.949 29.568,56.948 42.05,56.949 52.168,46.831 52.167,34.349 L 29.568,34.348 V 11.75 z"
-       id="path5"
+       id="stylisable"
        inkscape:connector-curvature="0" /><path
        d="m 34.432,7.052 v 22.6 H 57.031 C 57.032,17.169 46.915,7.05 34.432,7.052 z"
-       id="path7"
+       id="stylisable"
        inkscape:connector-curvature="0" /></g></svg>

src/static/sub-menu-side/create.svg

@@ -65,7 +65,7 @@
       <path
          style="fill:#000000;fill-opacity:1"
          d="m 16.46875,-0.46875 c -8.8297825,0 -16,7.1702185 -16,16 0,8.829782 7.1702175,16 16,16 8.829781,0 16,-7.170218 16,-16 0,-8.8297815 -7.170219,-16 -16,-16 z m 6.889336,9.3360161 2.124749,2.1247489 -11.20322,11.203219 -6.8249495,-6.82495 2.1247485,-2.156941 4.700201,4.732394 9.078471,-9.0784709 z"
-         id="path4447"
+         id="stylisable"
          inkscape:connector-curvature="0" />
     </g>
   </g>

src/static/sub-menu-side/edit.svg

@@ -53,6 +53,6 @@
      inkscape:current-layer="svg2985" />
   <path
      d="M 0,25.332407 V 32 H 6.667593 L 26.341436,12.326157 19.673843,5.6585637 0,25.332407 z M 31.479928,7.1876647 c 0.693429,-0.6934299 0.693429,-1.822475 0,-2.5159039 L 27.328239,0.52007175 c -0.693429,-0.693429 -1.822474,-0.693429 -2.515904,0 L 21.55855,3.7738568 28.226143,10.44145 31.479928,7.1876647 z"
-     id="path2987"
+     id="stylisable"
      inkscape:connector-curvature="0" />
 </svg>

src/static/sub-menu-side/filter.svg

@@ -46,7 +46,7 @@
      id="g2998"
      transform="matrix(0.32000075,0,0,0.32000075,0.63991432,5.5033384e-5)"><path
        d="M 94.456,2.028 C 93.912,0.451 92.208,-0.38 90.652,0.169 89.095,0.718 88.273,2.441 88.815,4.018 93.414,17.369 84.285,27.335 77.33,32.675 l -2.817,-4.072 c -0.942,-1.361 -3.058,-2.495 -4.699,-2.52 l -15.777,0.072 c -1.64,-0.026 -4.085,0.735 -5.43,1.689 L 2.123,60.786 C -0.128,62.382 -0.676,65.522 0.9,67.802 L 22.027,98.34 c 1.577,2.28 4.111,2.007 6.362,0.412 L 74.872,65.811 c 1.345,-0.955 2.885,-3.02 3.426,-4.59 l 4.94,-15.731 c 0.538,-1.571 0.21,-3.969 -0.733,-5.331 L 80.788,37.678 C 90.139,30.451 99.841,17.665 94.456,2.028 z m -21.627,46.78 c -3.603,2.552 -8.569,1.665 -11.091,-1.98 -2.523,-3.648 -1.648,-8.672 1.957,-11.227 2.859,-2.027 6.573,-1.879 9.246,0.088 -1.346,0.82 -2.269,1.292 -2.445,1.376 -1.49,0.712 -2.127,2.512 -1.426,4.02 0.51,1.095 1.584,1.736 2.705,1.736 0.426,0 0.859,-0.094 1.271,-0.29 0.958,-0.457 1.989,-1.009 3.064,-1.652 0.485,2.966 -0.684,6.089 -3.281,7.929 z"
-       id="path3000"
+       id="stylisable"
        inkscape:connector-curvature="0" /></g><g
      id="g3002"
      transform="matrix(0.32000075,0,0,0.32000075,-5.8043383e-5,5.4933711e-5)" /><g

src/static/sub-menu-side/password.svg

@@ -45,6 +45,6 @@
      inkscape:window-maximized="1"
      inkscape:current-layer="Layer_1" /><path
      d="M 21.920296,15.883621 C 23.266261,12.043768 22.689733,6.9789776 19.40367,3.6929146 14.963084,-0.74693744 7.7843571,-0.76674144 3.3452383,3.6731146 -1.0953476,8.1129666 -1.1246875,15.341571 3.3151653,19.781424 c 3.3850849,3.385085 8.1916847,4.360634 12.4885057,2.43374 l 2.128606,2.128606 0.07995,0.07995 2.995598,-0.523716 -0.0132,3.132762 3.112957,0.0059 -0.39022,3.090219 1.548411,1.548411 c 0.0044,0.0044 0.0044,0.0044 0.0073,0.0073 l 0.115159,-0.114426 c 0.54352,0.493643 0.369682,0.26846 0.4511,0.26846 l 5.334018,0.161369 c 0.440098,0 0.825917,-0.324939 0.82665,-0.76577 l -0.207579,-5.378727 c 0,-0.08215 0.239853,0.10709 -0.25379,-0.437164 l -0.04254,0.04328 c -0.0022,-0.0029 -0.0022,-0.0022 -0.0044,-0.0051 L 21.920296,15.883621 z M 9.6173641,10.403671 c -1.1464545,1.146455 -3.0036669,1.146455 -4.1493879,0 -1.145721,-1.1464544 -1.1464545,-3.0029324 0,-4.1493874 1.1464545,-1.146454 3.0036669,-1.146454 4.1493879,0 1.1457209,1.146455 1.1464549,3.003667 0,4.1493874 z"
-     id="path3"
+     id="stylisable"
      inkscape:connector-curvature="0"
      style="fill:#231f20" /></svg>

src/static/sub-menu-side/remove.svg

@@ -54,8 +54,8 @@
      inkscape:current-layer="svg3038" />
   <path
      d="M 5.3333332,28.444444 C 5.3333332,30.408889 6.9244442,32 8.8888882,32 H 23.111112 c 1.964444,0 3.555555,-1.591111 3.555555,-3.555556 V 7.111111 H 5.3333332 v 21.333333 z"
-     id="path3038" />
+     id="stylisable" />
   <path
      d="M 28.444445,1.777778 H 22.222223 L 20.444445,0 H 11.555556 L 9.7777778,1.777778 H 3.5555552 V 5.333333 H 28.444445 V 1.777778 z"
-     id="path3040" />
+     id="stylisable" />
 </svg>

src/static/sub-menu-side/search.svg

@@ -45,6 +45,6 @@
      inkscape:current-layer="Layer_1" /><path
      clip-rule="evenodd"
      d="m 20.374351,8.53274 c 1.536166,0.35555 2.758337,1.66381 3.11389,3.09323 0.121388,0.66837 0.70422,1.1731 1.401239,1.1731 0.781936,0 1.421901,-0.63981 1.421901,-1.42206 0,-1.02393 -0.8602,-2.58115 -2.033691,-3.74736 -1.151967,-1.13772 -2.52417,-1.9411 -3.654537,-1.9411 -0.781936,0 -1.422214,0.66133 -1.422214,1.44365 -7.8e-5,0.69647 0.504803,1.2797 1.173412,1.40054 z M 0.827055,27.17695 c -1.10274,1.10195 -1.10274,2.89412 0,3.99608 1.101957,1.10289 2.894281,1.10289 3.988725,0 l 8.170136,-8.16317 c 1.905494,1.18812 4.152845,1.87763 6.570498,1.87763 C 26.432455,24.88749 32,19.31963 32,12.44359 32,5.56778 26.432455,0 19.556414,0 12.680452,0 7.112829,5.56778 7.112829,12.44359 c 0,2.41069 0.69021,4.665 1.87771,6.5705 l -8.163484,8.16286 z m 9.841073,-14.73336 c 0,-4.90614 3.981681,-8.88829 8.888286,-8.88829 4.906606,0 8.888365,3.98215 8.888365,8.88829 0,4.90668 -3.981759,8.88837 -8.888365,8.88837 -4.906605,0 -8.888286,-3.98169 -8.888286,-8.88837 z"
-     id="path3051"
+     id="stylisable"
      inkscape:connector-curvature="0"
      style="fill:#b1b1b1;fill-rule:evenodd;fill-opacity:1" /></svg>

src/static/sub-menu-side/sync.svg

@@ -46,10 +46,10 @@
      id="g2991"
      transform="matrix(1.0784002,0,0,1.0784002,-1.2543254,-0.92699409)"><path
        d="m 25.444,4.291 c 0,0 -1.325,1.293 -2.243,2.201 C 18.514,3.068 11.909,3.456 7.676,7.689 c -2.47,2.47 -3.623,5.747 -3.484,8.983 h 4 C 8.051,14.46 8.81,12.205 10.5,10.514 c 2.663,-2.663 6.735,-3.043 9.812,-1.162 -1.042,1.032 -2.245,2.238 -2.245,2.238 -0.841,1.009 0.104,1.592 0.584,1.577 l 5.624,-10e-4 c 0.297,0 0.539,10e-4 0.539,10e-4 0,0 0.245,0 0.543,0 h 1.092 c 0.298,0 0.54,-0.243 0.54,-0.541 V 4.895 C 27.023,4.188 26.247,3.502 25.444,4.291 z"
-       id="path2993"
+       id="stylisable"
        inkscape:connector-curvature="0"
        style="fill:#515151" /><path
        d="m 6.555,27.709 c 0,0 1.326,-1.293 2.243,-2.201 4.688,3.424 11.292,3.036 15.526,-1.197 2.47,-2.471 3.622,-5.747 3.484,-8.983 h -4.001 c 0.142,2.211 -0.617,4.467 -2.308,6.159 -2.663,2.662 -6.735,3.043 -9.812,1.161 1.042,-1.032 2.245,-2.238 2.245,-2.238 0.841,-1.01 -0.104,-1.592 -0.584,-1.577 l -5.624,0.002 c -0.297,0 -0.54,-0.002 -0.54,-0.002 0,0 -0.245,0 -0.543,0 h -1.09 c -0.298,0 -0.54,0.242 -0.541,0.541 v 7.732 c -0.033,0.706 0.743,1.392 1.545,0.603 z"
-       id="path2995"
+       id="stylisable"
        inkscape:connector-curvature="0"
        style="fill:#515151" /></g></svg>

src/static/sub-menu-side/view.svg

@@ -44,5 +44,5 @@
      inkscape:window-maximized="1"
      inkscape:current-layer="Layer_1" /><path
      d="m 16,12 c 0,2.208 -1.792,4 -4,4 0,2.208 1.792,4 4,4 2.208,0 4,-1.792 4,-4 0,-2.208 -1.792,-4 -4,-4 z M 16,4 C 7.7959999,4 -3.031995e-8,13.296 -3.031995e-8,16 -3.031995e-8,18.704 7.7959999,28 16,28 24.204,28 32,18.704 32,16 32,13.296 24.204,4 16,4 z m 0,20 C 11.582,24 7.9999999,20.418 7.9999999,16 7.9999999,11.582 11.582,8 16,8 c 4.418,0 8,3.582 8,8 0,4.418 -3.582,8 -8,8 z"
-     id="path3"
+     id="stylisable"
      inkscape:connector-curvature="0" /></svg>

todo.md

@@ -7,7 +7,6 @@
 ############
 # EN COURS #
 ############
-- [ ] [ResourceDispatcher] Gestion de la coloration de svg
 
 - [ ] [view/users][view/js/users.js] Suppression avec recherche comme pour la modification
 - [ ] [view/machines][view/js/machines.js] Suppression avec recherche comme pour la modification
@@ -16,6 +15,8 @@
 ########
 # FAIT #
 ########
+- [x] [ResourceDispatcher] Gestion de la coloration de svg
+	- [x] [src/*.svg] Modification des svg (attribution des ID)
 - [x] [container.scss] Gestion des boutons "enabled"/"disabled" lorsqu'on doit faire une recherche
 - [x] [view/users+machines] Suppression du sous-menu "Recherche"
 - [x] [view/js/machines] Recherche instantanee

view.php

@@ -22,7 +22,7 @@
 
 
 		<!-- Dépendences Javascript -->
-		<script type='text/javascript' src='/js/lib/input-checker.js'      ></script>  <!-- Gestion dynamique des saisies            -->
+		<script type='text/javascript' src='/f/js/input-checker/js/lib'    ></script>  <!-- Gestion dynamique des saisies            -->
 		<script type='text/javascript' src='/f/js/reset/js/lib'            ></script>  <!-- Corrections Javascript natif (ajouts)    -->
 		<script type='text/javascript' src='/f/js/api/js/lib'              ></script>  <!-- Gestion des transactions avec le serveur -->
 		<script type='text/javascript' src='/f/js/page-manager/js/lib'     ></script>  <!-- Gestion réseau/chargement/liens/URL      -->

view/js/machines.js

@@ -385,7 +385,4 @@ if( section.edit.element != null ){
 	
 
 
-
-	
-
 }