icones apercus

diff --git a/project/assets/img/dossier-apercu.png b/project/assets/img/dossier-apercu.png
new file mode 100644 (file)
index 0000000..dd3275d
Binary files /dev/null and b/project/assets/img/dossier-apercu.png differ

diff --git a/project/assets/img/employe-apercu.png b/project/assets/img/employe-apercu.png
new file mode 100644 (file)
index 0000000..4bd2065
Binary files /dev/null and b/project/assets/img/employe-apercu.png differ

diff --git a/project/assets/img/master/employe-apercu-master.svg b/project/assets/img/master/employe-apercu-master.svg
new file mode 100644 (file)
index 0000000..eedb849
--- /dev/null
+++ b/project/assets/img/master/employe-apercu-master.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="Nouveau document 1">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2884"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2958"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.66905966"
+     inkscape:cx="-147.14286"
+     inkscape:cy="518.0181"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1005"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g2966"
+       inkscape:export-xdpi="111"
+       inkscape:export-ydpi="111">
+      <image
+         xlink:href="file:///net/nfs-authnss.b.ca.auf/home/davin.baragiotta/Desktop/user.png"
+         width="48"
+         height="48"
+         id="image2886"
+         x="-118.28571"
+         y="568.36218" />
+      <image
+         xlink:href="file:///net/nfs-authnss.b.ca.auf/home/davin.baragiotta/Desktop/bullet-magnify.png"
+         width="48"
+         height="48"
+         id="image2960"
+         x="-103.57162"
+         y="582.7973" />
+    </g>
+  </g>
+</svg>

diff --git a/project/assets/img/master/essais/poste-apercu1.png b/project/assets/img/master/essais/poste-apercu1.png
new file mode 100644 (file)
index 0000000..d46a43c
Binary files /dev/null and b/project/assets/img/master/essais/poste-apercu1.png differ

diff --git a/project/assets/img/master/essais/poste-apercu2.png b/project/assets/img/master/essais/poste-apercu2.png
new file mode 100644 (file)
index 0000000..e4fbb1e
Binary files /dev/null and b/project/assets/img/master/essais/poste-apercu2.png differ

diff --git a/project/assets/img/master/materiel/bullet-magnify-10x11.png b/project/assets/img/master/materiel/bullet-magnify-10x11.png
new file mode 100644 (file)
index 0000000..4fc1181
Binary files /dev/null and b/project/assets/img/master/materiel/bullet-magnify-10x11.png differ

diff --git a/project/assets/img/master/materiel/bullet-magnify.png b/project/assets/img/master/materiel/bullet-magnify.png
new file mode 100644 (file)
index 0000000..dbc692d
Binary files /dev/null and b/project/assets/img/master/materiel/bullet-magnify.png differ

diff --git a/project/assets/img/master/materiel/chart_organisation.png b/project/assets/img/master/materiel/chart_organisation.png
new file mode 100644 (file)
index 0000000..c32d25c
Binary files /dev/null and b/project/assets/img/master/materiel/chart_organisation.png differ

diff --git a/project/assets/img/master/materiel/user.png b/project/assets/img/master/materiel/user.png
new file mode 100644 (file)
index 0000000..a5abf1f
Binary files /dev/null and b/project/assets/img/master/materiel/user.png differ

diff --git a/project/assets/img/master/poste-apercu-master.xcf b/project/assets/img/master/poste-apercu-master.xcf
new file mode 100644 (file)
index 0000000..44e5a05
Binary files /dev/null and b/project/assets/img/master/poste-apercu-master.xcf differ

diff --git a/project/assets/img/poste-apercu.png b/project/assets/img/poste-apercu.png
new file mode 100644 (file)
index 0000000..218724f
Binary files /dev/null and b/project/assets/img/poste-apercu.png differ

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 609ab41..76adef5 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -397,7 +397,7 @@ class DossierAdmin(DateRangeMixin, AUFMetadataAdminMixin,
         apercu_link = u"""<a title="Aperçu du dossier"
                              onclick="return showAddAnotherPopup(this);"
                              href='%s'>
-                             <img src="%simg/loupe.png" />
+                             <img src="%simg/dossier-apercu.png" />
                              </a>""" % \
                 (reverse('dossier_apercu', args=(d.id,)),
                  settings.STATIC_URL,
@@ -443,7 +443,7 @@ class DossierAdmin(DateRangeMixin, AUFMetadataAdminMixin,
     def _poste(self, dossier):
         link = u"""<a title="Aperçu du poste"
                       onclick="return showAddAnotherPopup(this);"
-                      href='%s'><img src="%simg/loupe.png" />
+                      href='%s'><img src="%simg/poste-apercu.png" />
                     </a>
                     <a href="%s" title="Modifier le poste">%s</a>""" % \
                 (reverse('poste_apercu', args=(dossier.poste.id,)),
@@ -465,7 +465,7 @@ class DossierAdmin(DateRangeMixin, AUFMetadataAdminMixin,
         view = u"""<a href="%s"
                       title="Aperçu l'employé"
                       onclick="return showAddAnotherPopup(this);">
-                      <img src="%simg/loupe.png" />
+                      <img src="%simg/employe-apercu.png" />
                     </a>""" % (view_link, settings.STATIC_URL,)
         return u"""%s<a href='%s' style="%s;">%s</a>""" % \
         (view, edit_link, style, employe)
@@ -540,7 +540,7 @@ class EmployeAdmin(DateRangeMixin, AUFMetadataAdminMixin,
         return u"""<a title="Aperçu de l'employé"
                       onclick="return showAddAnotherPopup(this);"
                       href='%s'>
-                      <img src="%simg/loupe.png" />
+                      <img src="%simg/employe-apercu.png" />
                     </a>""" % \
             (reverse('employe_apercu', args=(obj.id,)), settings.STATIC_URL)
     _apercu.allow_tags = True
@@ -572,7 +572,7 @@ class EmployeAdmin(DateRangeMixin, AUFMetadataAdminMixin,
                              href="%s"
                              onclick="return showAddAnotherPopup(this);"
                              title="Aperçu du dossier">
-                             <img src="%simg/loupe.png" />
+                             <img src="%simg/dossier-apercu.png" />
                           </a>
                           <a href="%s">Dossier</a>
                           &nbsp;""" % \
@@ -584,7 +584,7 @@ class EmployeAdmin(DateRangeMixin, AUFMetadataAdminMixin,
                            href="%s"
                            onclick="return showAddAnotherPopup(this);"
                            title="Aperçu du poste">
-                           <img src="%simg/loupe.png" />
+                           <img src="%simg/poste-apercu.png" />
                         </a>
                         <a href="%s">Poste</a>
                         &nbsp;""" % \
@@ -811,7 +811,7 @@ class PosteAdmin(DateRangeMixin, AUFMetadataAdminMixin,
         view_link = u"""<a onclick="return showAddAnotherPopup(this);"
                            title="Aperçu du poste"
                            href='%s'>
-                        <img src="%simg/loupe.png" />
+                        <img src="%simg/poste-apercu.png" />
                         </a>""" % \
                 (reverse('poste_apercu', args=(poste.id,)),
                  settings.STATIC_URL,)
@@ -851,7 +851,7 @@ class PosteAdmin(DateRangeMixin, AUFMetadataAdminMixin,
         try:
             responsable = u"""<a href="%s"
                                  onclick="return showAddAnotherPopup(this)">
-                                <img src="%simg/loupe.png"
+                                <img src="%simg/poste-apercu.png"
                                      title="Aperçu du poste" />
                               </a>
                               <a href="%s">%s</a>
@@ -869,7 +869,7 @@ class PosteAdmin(DateRangeMixin, AUFMetadataAdminMixin,
             employe_html = u"""<br />
                     <a href="%s"
                        onclick="return showAddAnotherPopup(this)">
-                       <img src="%simg/loupe.png"
+                       <img src="%simg/employe-apercu.png"
                             title="Aperçu de l'employé">
                     </a>
                     <a href="%s">%s</a>""" % \
@@ -912,9 +912,9 @@ class PosteAdmin(DateRangeMixin, AUFMetadataAdminMixin,
             l = []
             for e in employes:
                 link = u"""<a href='%s'
-                              title='Aperçu de l\'employer'
+                              title='Aperçu de l\'employé'
                               onclick='return showAddAnotherPopup(this)'>
-                              <img src='%simg/loupe.png' />
+                              <img src='%simg/employe-apercu.png' />
                             </a>
                             <a href='%s'>%s</a>""" % \
                      (reverse('employe_apercu', args=(e.id,)),