From 8326c965a2fdae0fff263ad8eb53ad10e57e8c6e Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 6 Mar 2018 15:02:36 +0100
Subject: [PATCH] [webpack.teacher.view] Cours|TD|TP card footer
 icons+explicity

---
 public_html/asset/svg/course.svg   | 37 ++++++++++----------
 public_html/asset/svg/td.svg       | 55 ++++++++++++++++++------------
 webpack/component/teacher/view.vue | 10 +++---
 webpack/scss/container.scss        | 10 ++++++
 4 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/public_html/asset/svg/course.svg b/public_html/asset/svg/course.svg
index 05112e1..78d1190 100644
--- a/public_html/asset/svg/course.svg
+++ b/public_html/asset/svg/course.svg
@@ -7,19 +7,19 @@
    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="16px"
-   id="Layer_1"
-   style="enable-background:new 0 0 16 16;"
+   enable-background="new 0 0 128 128"
+   height="128px"
+   id="Слой_1"
    version="1.1"
-   viewBox="0 0 16 16"
-   width="16px"
+   viewBox="0 0 128 128"
+   width="128px"
    xml:space="preserve"
    sodipodi:docname="course.svg"
    inkscape:version="0.92.2 5c3e80d, 2017-08-06"><metadata
-     id="metadata9"><rdf:RDF><cc:Work
+     id="metadata11"><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
+     id="defs9" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
@@ -28,17 +28,18 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1015"
-     id="namedview5"
+     inkscape:window-width="1280"
+     inkscape:window-height="684"
+     id="namedview7"
      showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="29"
+     inkscape:zoom="1.84375"
+     inkscape:cx="64"
+     inkscape:cy="64"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><path
-     d="M 13,5 H 12 V 9 L 10,7 8,9 V 5 H 5 C 4.448,5 4,4.552 4,4 4,3.448 4.448,3 5,3 h 8 C 13.55,3 14,2.55 14,2 14,1.45 13.55,1 13,1 H 5 C 3.343,1 2,2.343 2,4 v 8 c 0,1.656 1.343,3 3,3 h 8 c 0.55,0 1,-0.45 1,-1 V 6 C 14,5.45 13.55,5 13,5 Z"
+     inkscape:current-layer="Слой_1" /><path
+     style="fill:#373737"
+     inkscape:connector-curvature="0"
      id="fill-edit"
-     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
+     d="M 120.99512,7.4003906 C 119.4502,7.4003906 84.976562,7.6142578 64,24.602051 43.024902,7.6142578 8.5498047,7.4003906 7.0048828,7.4003906 H 1.7275391 V 112.94727 h 5.2773438 c 27.5346681,0 44.7817381,5.17187 51.4726561,7.65234 h 10.999024 c 6.597656,-2.47363 23.719726,-7.65234 51.518557,-7.65234 h 5.27734 V 7.4003906 Z M 58.722656,109.49316 C 50.262695,106.7334 34.794434,102.97168 12.282227,102.4541 V 18.204102 C 22.523926,18.95459 45.25,21.956055 58.722656,33.950684 Z m 56.995114,-7.03906 c -22.511715,0.51758 -37.980465,4.2793 -46.440426,7.03906 V 33.950684 C 82.750976,21.955078 105.47852,18.954102 115.71777,18.204102 Z" /></svg>
\ No newline at end of file
diff --git a/public_html/asset/svg/td.svg b/public_html/asset/svg/td.svg
index 9a35e77..0ec1b40 100644
--- a/public_html/asset/svg/td.svg
+++ b/public_html/asset/svg/td.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 500 500"
-   height="500px"
-   id="Layer_1"
+   height="16px"
    version="1.1"
-   viewBox="0 0 500 500"
-   width="500px"
-   xml:space="preserve"
+   viewBox="0 0 16 16"
+   width="16px"
+   id="svg9"
    sodipodi:docname="td.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"><metadata
-     id="metadata9"><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
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
+  <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"
@@ -28,18 +35,22 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1015"
-     id="namedview5"
+     inkscape:window-width="1280"
+     inkscape:window-height="684"
+     id="namedview11"
      showgrid="false"
-     inkscape:zoom="0.472"
-     inkscape:cx="250"
-     inkscape:cy="250"
-     inkscape:window-x="0"
-     inkscape:window-y="29"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><path
-     d="m 82.474,215.547 c -8.903,8.9 -13.177,21.622 -15.354,34.523 L 32.503,413.794 c -4.906,29.077 24.257,58.33 53.698,53.787 l 163.897,-34.167 c 11.996,-2.174 24.987,-5.902 33.894,-14.802 L 457.609,244.8 c 13.904,-13.982 13.904,-36.608 0,-50.6 L 305.977,42.382 c -13.992,-13.902 -36.615,-13.902 -50.516,0 z m 166.625,174.71 -84.856,16.273 -70.319,-70.415 16.169,-84.954 126.376,-126.557 c 6.996,-7 18.267,-7 25.263,0 6.999,6.992 6.999,18.348 0,25.35 L 144.888,266.973 c -8.717,8.723 -8.717,22.898 0,31.613 8.725,8.731 22.807,8.731 31.528,0 l 116.925,-117.02 c 7.005,-6.993 18.26,-6.993 25.26,0 7.005,7 7.005,18.268 0,25.259 L 201.766,323.846 c -8.723,8.721 -8.723,22.899 0,31.622 8.722,8.719 22.805,8.719 31.524,0 L 350.215,238.447 c 6.912,-6.912 18.269,-6.912 25.268,0 6.993,6.992 6.993,18.351 0,25.338 z"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs4" />
+  <path
+     d="M 1,11.95081 5,16 H 1 Z M 8,4 12,8 5.97864,15.04419 2,11 Z m 2.08462,-2.2185 c 0.62484,-0.62484 1.82467,-0.43807 2.6799,0.41715 l 0.77426,0.77427 c 0.85523,0.85523 1.042,2.05506 0.41716,2.6799 L 12.72039,6.88836 8.84907,3.01704 Z m 0,0"
      id="fill-edit"
      inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill:#010101;fill-rule:evenodd" /></svg>
\ No newline at end of file
+     style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1" />
+</svg>
diff --git a/webpack/component/teacher/view.vue b/webpack/component/teacher/view.vue
index fb03530..96df1f6 100644
--- a/webpack/component/teacher/view.vue
+++ b/webpack/component/teacher/view.vue
@@ -23,17 +23,17 @@
 						<span>heures à faire</span>
 					</div>
 					<div>
-						<span>{{ prof.VHCours + prof.VHTd + prof.VHTp }}</span>
+						<span>{{ prof.equiTD }}</span>
 						<span>heures prévues</span>
 					</div>
 				</div>
 
-				<div class='sub'><strong>{{ prof.equiTD }}h</strong> équivalents TD</div>
+				<div class='sub'><strong>{{ prof.VHCours + prof.VHTd + prof.VHTp }}h</strong> physiques prévues</div>
 
 				<div class='footer'>
-					<span :class="(prof.VHCours == 0) ? 'course' : 'course active'">{{ prof.VHCours }}</span><hr>
-					<span :class="(prof.VHTd    == 0) ? 'td'     : 'td active'">{{ prof.VHTd }}</span><hr>
-					<span :class="(prof.VHTp    == 0) ? 'tp'     : 'tp active'">{{ prof.VHTp }}</span>
+					<span :class="(prof.VHCours == 0) ? 'course' : 'course active'">{{ prof.VHCours }}h <span>Cours</span></span><hr>
+					<span :class="(prof.VHTd    == 0) ? 'td'     : 'td active'">{{ prof.VHTd }}h <span>TD</span></span><hr>
+					<span :class="(prof.VHTp    == 0) ? 'tp'     : 'tp active'">{{ prof.VHTp }}h <span>TP</span></span>
 				</div>
 			</section>
 
diff --git a/webpack/scss/container.scss b/webpack/scss/container.scss
index 49a7087..bfd57c3 100644
--- a/webpack/scss/container.scss
+++ b/webpack/scss/container.scss
@@ -330,6 +330,16 @@
 				&.td.active:before{     background-image: url('/asset/svg/td.svg@20b565'); }
 				&.tp.active:before{     background-image: url('/asset/svg/tp.svg@e85456'); }
 
+				& > span{
+					display: inline;
+
+					padding-left: .5em;
+					color: #bbb;
+
+					font-size: .9em;
+					text-transform: uppercase;
+				}
+
 			}
 
 			/* (5.2) Card footer separator */