From 581be0b7018e5a137508336d213fcffa1b6f2355 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Mon, 15 Feb 2016 09:48:35 +0100
Subject: [PATCH] - [x] [src/static/container] Choix de meilleures icones

---
 src/static/container/card.svg  | 61 ++++++++++++++++++--------------
 src/static/container/group.svg | 47 +++++++++++++++----------
 src/static/container/mail.svg  | 64 +++++++++++++++++++++++-----------
 todo.md                        |  7 ++++
 4 files changed, 114 insertions(+), 65 deletions(-)
 mode change 100755 => 100644 src/static/container/card.svg
 mode change 100755 => 100644 src/static/container/group.svg

diff --git a/src/static/container/card.svg b/src/static/container/card.svg
old mode 100755
new mode 100644
index 68098da..e88865b
--- a/src/static/container/card.svg
+++ b/src/static/container/card.svg
@@ -7,19 +7,18 @@
    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"
-   enable-background="new 0 0 50 50"
-   height="32"
+   height="22.857141"
    id="Layer_1"
    version="1.1"
-   viewBox="0 0 31.999996 32.000001"
-   width="31.999996"
+   viewBox="0 0 32 22.857141"
+   width="32"
    xml:space="preserve"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="card.svg"><metadata
-     id="metadata15"><rdf:RDF><cc:Work
+   sodipodi:docname="1455547177_icon-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 /></cc:Work></rdf:RDF></metadata><defs
-     id="defs13" /><sodipodi:namedview
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3166" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
@@ -30,26 +29,36 @@
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
      inkscape:window-height="1056"
-     id="namedview11"
+     id="namedview3164"
      showgrid="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:zoom="13.350176"
-     inkscape:cx="14.073105"
-     inkscape:cy="9.9886061"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:snap-page="true" /><path
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-     d="M 2.875 4.90625 C 2.529796 4.9157 2.2418738 4.937821 1.96875 4.96875 C 1.4225022 5.030662 0.93673632 5.186207 0.59375 5.53125 C 0.25076368 5.876293 0.12254463 6.330297 0.0625 6.875 C 0.0024553738 7.419702 0 8.093575 0 8.96875 L 0 23.3125 C 0 24.124468 0.0048066236 24.741981 0.0625 25.25 C 0.12019448 25.758018 0.26592965 26.173672 0.59375 26.5 C 0.92157035 26.826327 1.3368542 26.974885 1.84375 27.03125 C 2.3506459 27.08761 2.9733941 27.09375 3.78125 27.09375 L 28.21875 27.09375 C 29.032019 27.09375 29.648535 27.08683 30.15625 27.03125 C 30.663965 26.97565 31.11017 26.827256 31.4375 26.5 C 31.764831 26.172743 31.881843 25.757769 31.9375 25.25 C 31.99317 24.74223 32 24.125968 32 23.3125 L 32 8.875 C 32 8.023309 31.99837 7.375569 31.9375 6.84375 C 31.87666 6.31193 31.720813 5.835374 31.375 5.5 C 31.029187 5.164626 30.575378 5.0273948 30.03125 4.96875 C 29.487123 4.910101 28.816871 4.90625 27.9375 4.90625 L 4.0625 4.90625 C 3.6220196 4.90625 3.2202041 4.8968 2.875 4.90625 z M 4.53125 6.9375 L 27.46875 6.9375 C 28.312813 6.9375 28.947988 6.956708 29.375 7 C 29.802012 7.043293 29.97277 7.1056474 30.0625 7.1875 C 30.15223 7.269346 30.265665 7.4274219 30.3125 7.8125 C 30.35934 8.1975772 30.34375 8.7934597 30.34375 9.5625 L 30.34375 10.3125 L 1.65625 10.3125 L 1.65625 9.65625 C 1.65625 8.8657828 1.640649 8.2747714 1.6875 7.875 C 1.734355 7.4752294 1.8456541 7.3056588 1.9375 7.21875 C 2.029346 7.131839 2.1995759 7.0453522 2.625 7 C 3.050424 6.954649 3.6863262 6.9375 4.53125 6.9375 z M 1.65625 14.34375 L 30.34375 14.34375 L 30.34375 22.78125 C 30.34375 23.459136 30.35525 23.974385 30.3125 24.3125 C 30.26979 24.650615 30.168026 24.779316 30.09375 24.84375 C 30.01947 24.90818 29.858415 24.962978 29.46875 25 C 29.079087 25.03702 28.499856 25.0625 27.71875 25.0625 L 4.28125 25.0625 C 3.5057785 25.0625 2.9196702 25.03747 2.53125 25 C 2.1428268 24.96253 1.9827628 24.909844 1.90625 24.84375 C 1.829737 24.77766 1.7316414 24.649748 1.6875 24.3125 C 1.643359 23.975251 1.65625 23.45687 1.65625 22.78125 L 1.65625 14.34375 z "
-     id="path3047" /></svg>
\ No newline at end of file
+     inkscape:zoom="10.429825"
+     inkscape:cx="65.516919"
+     inkscape:cy="-20.635069"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><g
+     id="g3154"
+     transform="matrix(0.07142857,0,0,0.07142857,-2.2857142,-6.8571427)"><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
+       height="16"
+       width="192"
+       x="96"
+       y="304"
+       id="rect3158" /><rect
+       height="16"
+       width="96"
+       x="96"
+       y="336"
+       id="rect3160" /><rect
+       height="48"
+       width="64"
+       x="352"
+       y="304"
+       id="rect3162" /></g></svg>
\ No newline at end of file
diff --git a/src/static/container/group.svg b/src/static/container/group.svg
old mode 100755
new mode 100644
index 965d589..bb9b763
--- a/src/static/container/group.svg
+++ b/src/static/container/group.svg
@@ -7,19 +7,18 @@
    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"
-   enable-background="new 0 0 512 512"
-   height="512px"
+   height="26.668774"
    id="Layer_1"
    version="1.1"
-   viewBox="0 0 512 512"
-   width="512px"
+   viewBox="0 0 31.999998 26.668774"
+   width="31.999998"
    xml:space="preserve"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="1455201790_folder.svg"><metadata
-     id="metadata9"><rdf:RDF><cc:Work
+   sodipodi:docname="group2.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" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs7" /><sodipodi:namedview
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs13" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
@@ -28,17 +27,27 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview5"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview11"
      showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
      inkscape:zoom="0.4609375"
-     inkscape:cx="256"
-     inkscape:cy="256"
+     inkscape:cx="191.97307"
+     inkscape:cy="160"
      inkscape:window-x="0"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="M463.518,94.909H193.885v-10.37c0-22.908-18.574-41.482-41.482-41.482H48.699  c-22.908,0-41.482,18.574-41.482,41.482v51.852v72.593v217.78c0,22.907,18.574,41.482,41.482,41.482h414.819  c22.908,0,41.482-18.575,41.482-41.482V136.391C505,113.483,486.426,94.909,463.518,94.909z M27.958,84.539  c0-11.435,9.308-20.741,20.741-20.741h103.705c11.433,0,20.741,9.306,20.741,20.741v10.37v20.741h20.741h269.633  c11.433,0,20.741,9.306,20.741,20.741v20.741H27.958v-20.741V84.539z M463.518,447.506H48.699c-11.433,0-20.741-9.307-20.741-20.741  v-217.78v-31.111h456.301v248.892C484.259,438.198,474.952,447.506,463.518,447.506z"
-     fill="#37404D"
-     id="path3" /></svg>
\ No newline at end of file
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><g
+     id="g3"
+     transform="matrix(0.08333202,0,0,0.08333202,-5.3354935,-7.9973471)"><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
+       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"
+         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/src/static/container/mail.svg b/src/static/container/mail.svg
index 9b67217..a8f0b31 100755
--- a/src/static/container/mail.svg
+++ b/src/static/container/mail.svg
@@ -7,19 +7,26 @@
    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"
-   enable-background="new 0 0 32 32"
-   height="32px"
-   id="Layer_1"
+   height="22.857143"
    version="1.1"
-   viewBox="0 0 32 32"
-   width="32px"
-   xml:space="preserve"
+   viewBox="0 0 32 22.857143"
+   width="32"
+   id="svg2"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="1454688634_mail.svg"><metadata
-     id="metadata8"><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
-     id="defs6" /><sodipodi:namedview
+   sodipodi:docname="mail2.svg">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
@@ -30,16 +37,33 @@
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
      inkscape:window-height="1056"
-     id="namedview4"
+     id="namedview11"
      showgrid="false"
-     inkscape:zoom="7.375"
-     inkscape:cx="16"
-     inkscape:cy="18.033898"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="14.75"
+     inkscape:cx="7"
+     inkscape:cy="4.9999999"
      inkscape:window-x="0"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><path
-     d="M28,5H4C1.791,5,0,6.792,0,9v13c0,2.209,1.791,4,4,4h24c2.209,0,4-1.791,4-4V9  C32,6.792,30.209,5,28,5z M2,10.25l6.999,5.25L2,20.75V10.25z M30,22c0,1.104-0.898,2-2,2H4c-1.103,0-2-0.896-2-2l7.832-5.875  l4.368,3.277c0.533,0.398,1.166,0.6,1.8,0.6c0.633,0,1.266-0.201,1.799-0.6l4.369-3.277L30,22L30,22z M30,20.75l-7-5.25l7-5.25  V20.75z M17.199,18.602c-0.349,0.262-0.763,0.4-1.199,0.4c-0.436,0-0.851-0.139-1.2-0.4L10.665,15.5l-0.833-0.625L2,9.001V9  c0-1.103,0.897-2,2-2h24c1.102,0,2,0.897,2,2L17.199,18.602z"
-     fill="#333333"
-     id="mail"
-     style="fill:#000000" /></svg>
\ No newline at end of file
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs6" />
+  <g
+     id="Icons with numbers"
+     transform="matrix(2.2857143,0,0,2.2857143,-2.2857143,-6.8571429)"
+     style="fill:none;stroke:none">
+    <g
+       id="Group"
+       transform="translate(-336,0)"
+       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"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/todo.md b/todo.md
index 0d90ad7..37d74ef 100755
--- a/todo.md
+++ b/todo.md
@@ -15,6 +15,12 @@
 ############
 # EN COURS #
 ############
+- [ ] [view/user] Prise en compte de pageManager.vars[2] pour la modification
+- [ ] [view/user] Prise en compte de pageManager.vars[2] pour la suppression
+
+- [ ] [view/machine] Prise en compte de pageManager.vars[2] pour la modification
+- [ ] [view/machine] Prise en compte de pageManager.vars[2] pour la suppression
+
 - [ ] Prendre en compte au lieu de SERVER['HTTP_HOST'] l'hote et son dossier source
 - [ ] Gestion de l'erreur de chargement ou erreur de nav (page-manager)
 
@@ -22,6 +28,7 @@
 ########
 # FAIT #
 ########
+- [x] [src/static/container] Choix de meilleures icones
 - [x] [view/users][container.css]    Liens vers la modification/suppression depuis visu utilisateur
 	- [x] [view/users]               Lien physque
 	- [x] [view/js/users]            Lien dynamique (evt)