From 3b9e5d086a4d04f97e85248ad12da33980f22d8b Mon Sep 17 00:00:00 2001
From: Evarin <champrobin@hotmail.com>
Date: Fri, 6 Oct 2017 10:59:48 +0200
Subject: [PATCH] Affichage recherche

---
 avisstage/sass/screen.scss                    |  20 ++
 avisstage/static/css/screen.css               | 188 ++++++++++--------
 .../avisstage/recherche/resultats.html        |   2 +-
 avisstage/templatetags/avisstage_tags.py      |   2 -
 4 files changed, 127 insertions(+), 85 deletions(-)

diff --git a/avisstage/sass/screen.scss b/avisstage/sass/screen.scss
index 78cbc67..a6b5a5b 100644
--- a/avisstage/sass/screen.scss
+++ b/avisstage/sass/screen.scss
@@ -302,6 +302,26 @@ ul.infos {
             color: #fff;
             display: none;
         }
+        &.avis-len {
+            background-color: transparent;
+            border: 1px solid #eee;
+            border-bottom: 3px solid;
+            padding: 4px;
+            padding-bottom: 2px;
+            
+            &.avis-vide {
+                border-bottom-color: #ddd;
+            }
+            &.avis-court {
+                border-bottom-color: lighten(#ff0, 20);
+            }
+            &.avis-moyen {
+                border-bottom-color: lighten($vert, 25);
+            }
+            &.avis-long {
+                border-bottom-color: lighten($fond, 10);
+            }
+        }
     }
     
     &:after {
diff --git a/avisstage/static/css/screen.css b/avisstage/static/css/screen.css
index f9f9fa4..2c98fdd 100644
--- a/avisstage/static/css/screen.css
+++ b/avisstage/static/css/screen.css
@@ -378,7 +378,31 @@ ul.infos li.year {
   color: #fff;
   display: none;
 }
-/* line 307, ../../sass/screen.scss */
+/* line 305, ../../sass/screen.scss */
+ul.infos li.avis-len {
+  background-color: transparent;
+  border: 1px solid #eee;
+  border-bottom: 3px solid;
+  padding: 4px;
+  padding-bottom: 2px;
+}
+/* line 312, ../../sass/screen.scss */
+ul.infos li.avis-len.avis-vide {
+  border-bottom-color: #ddd;
+}
+/* line 315, ../../sass/screen.scss */
+ul.infos li.avis-len.avis-court {
+  border-bottom-color: #ffff66;
+}
+/* line 318, ../../sass/screen.scss */
+ul.infos li.avis-len.avis-moyen {
+  border-bottom-color: #86bff1;
+}
+/* line 321, ../../sass/screen.scss */
+ul.infos li.avis-len.avis-long {
+  border-bottom-color: #a5d65c;
+}
+/* line 327, ../../sass/screen.scss */
 ul.infos:after {
   content: "";
   flex: 1000;
@@ -667,7 +691,7 @@ article.stage .section-wrapper .toc .toc-active a {
   border: 1px solid #ad0654;
 }
 
-/* line 325, ../../sass/screen.scss */
+/* line 345, ../../sass/screen.scss */
 input, textarea, select, div.tinymce, option, optgroup:before {
   background: #fff;
   font-size: 1em;
@@ -677,13 +701,13 @@ input, textarea, select, div.tinymce, option, optgroup:before {
   padding: 5px;
   text-align: left;
 }
-/* line 334, ../../sass/screen.scss */
+/* line 354, ../../sass/screen.scss */
 input:focus, input.mce-edit-focus, textarea:focus, textarea.mce-edit-focus, select:focus, select.mce-edit-focus, div.tinymce:focus, div.tinymce.mce-edit-focus, option:focus, option.mce-edit-focus, optgroup:before:focus, optgroup:before.mce-edit-focus {
   background-color: #e9f5d6;
   outline: none;
 }
 
-/* line 341, ../../sass/screen.scss */
+/* line 361, ../../sass/screen.scss */
 input[type='text'], input[type='password'],
 input[type='email'], input[type='number'], textarea, select {
   border: none;
@@ -693,7 +717,7 @@ input[type='email'], input[type='number'], textarea, select {
   transition: border 1s ease-out, background 1s ease-out;
 }
 
-/* line 350, ../../sass/screen.scss */
+/* line 370, ../../sass/screen.scss */
 select {
   -moz-appearance: none;
   appearance: none;
@@ -707,21 +731,21 @@ select {
   background-color: #fff;
   background-size: contain;
 }
-/* line 363, ../../sass/screen.scss */
+/* line 383, ../../sass/screen.scss */
 select option {
   padding: 3px;
   white-space: pre-wrap;
 }
-/* line 369, ../../sass/screen.scss */
+/* line 389, ../../sass/screen.scss */
 select optgroup option {
   padding-left: 10px;
 }
-/* line 372, ../../sass/screen.scss */
+/* line 392, ../../sass/screen.scss */
 select optgroup:before {
   font-weight: bold;
 }
 
-/* line 378, ../../sass/screen.scss */
+/* line 398, ../../sass/screen.scss */
 input[type="submit"], .btn {
   font: 19px "Dosis", sans-serif;
   background-color: #8fcc33;
@@ -732,17 +756,17 @@ input[type="submit"], .btn {
   display: inline-block;
 }
 
-/* line 388, ../../sass/screen.scss */
+/* line 408, ../../sass/screen.scss */
 p.submits {
   text-align: right;
 }
 
-/* line 392, ../../sass/screen.scss */
+/* line 412, ../../sass/screen.scss */
 form .commentaire {
   font-style: italic;
 }
 
-/* line 396, ../../sass/screen.scss */
+/* line 416, ../../sass/screen.scss */
 .edit-btn {
   border-color: #706c00;
   color: #000;
@@ -751,14 +775,14 @@ form .commentaire {
   background-origin: content-box;
   background-size: contain;
 }
-/* line 404, ../../sass/screen.scss */
+/* line 424, ../../sass/screen.scss */
 .edit-btn:after {
   content: "";
   width: 30px;
   display: inline-block;
 }
 
-/* line 411, ../../sass/screen.scss */
+/* line 431, ../../sass/screen.scss */
 textarea, div.tinymce {
   font-family: "Lato", sans-serif;
   border: none;
@@ -768,20 +792,20 @@ textarea, div.tinymce {
   transition: border 1s ease-out, background 1s ease-out;
 }
 
-/* line 420, ../../sass/screen.scss */
+/* line 440, ../../sass/screen.scss */
 textarea {
   height: 200px;
   resize: vertical;
 }
 
-/* line 428, ../../sass/screen.scss */
+/* line 448, ../../sass/screen.scss */
 form .field {
   margin: 5px 0;
   display: flex;
   background: #fff;
   padding: 10px;
 }
-/* line 434, ../../sass/screen.scss */
+/* line 454, ../../sass/screen.scss */
 form .field label, form .field .label {
   display: inline-block;
   width: 250px;
@@ -790,39 +814,39 @@ form .field label, form .field .label {
   padding-top: 5px;
   flex-shrink: 0;
 }
-/* line 442, ../../sass/screen.scss */
+/* line 462, ../../sass/screen.scss */
 form .field label.required:before, form .field .label.required:before {
   margin-right: 5px;
   content: "*";
   color: #f70978;
 }
-/* line 448, ../../sass/screen.scss */
+/* line 468, ../../sass/screen.scss */
 form .field label {
   font-family: Alegreya, serif;
   font-weight: bold;
 }
-/* line 452, ../../sass/screen.scss */
+/* line 472, ../../sass/screen.scss */
 form .field .help_text {
   font-style: italic;
   font-size: 0.9em;
 }
-/* line 456, ../../sass/screen.scss */
+/* line 476, ../../sass/screen.scss */
 form .field .input {
   display: inline-block;
   flex-grow: 1;
   margin-right: 10px;
 }
 
-/* line 466, ../../sass/screen.scss */
+/* line 486, ../../sass/screen.scss */
 ul.as-selections {
   display: flex;
   flex-wrap: wrap;
 }
-/* line 470, ../../sass/screen.scss */
+/* line 490, ../../sass/screen.scss */
 ul.as-selections li {
   display: inline-block;
 }
-/* line 474, ../../sass/screen.scss */
+/* line 494, ../../sass/screen.scss */
 ul.as-selections .as-selection-item {
   padding: 0 5px;
   background: #f99b20;
@@ -831,52 +855,52 @@ ul.as-selections .as-selection-item {
   border-radius: 2px;
   font-weight: 500;
 }
-/* line 482, ../../sass/screen.scss */
+/* line 502, ../../sass/screen.scss */
 ul.as-selections .as-selection-item a.as-close {
   color: #fff;
   -webkit-cursor: pointer;
   cursor: pointer;
   margin-right: 5px;
 }
-/* line 489, ../../sass/screen.scss */
+/* line 509, ../../sass/screen.scss */
 ul.as-selections .as-selection-item.selected {
   background: #8fcc33;
 }
-/* line 494, ../../sass/screen.scss */
+/* line 514, ../../sass/screen.scss */
 ul.as-selections .as-original {
   flex-grow: 1;
   min-width: 200px;
 }
-/* line 498, ../../sass/screen.scss */
+/* line 518, ../../sass/screen.scss */
 ul.as-selections .as-original input {
   width: 100%;
 }
 
-/* line 504, ../../sass/screen.scss */
+/* line 524, ../../sass/screen.scss */
 div.as-results {
   position: relative;
 }
-/* line 506, ../../sass/screen.scss */
+/* line 526, ../../sass/screen.scss */
 div.as-results ul {
   position: absolute;
   width: 100%;
   background: #fff;
   border: 1px solid #d2ebad;
 }
-/* line 513, ../../sass/screen.scss */
+/* line 533, ../../sass/screen.scss */
 div.as-results ul li {
   padding: 3px 5px;
 }
-/* line 519, ../../sass/screen.scss */
+/* line 539, ../../sass/screen.scss */
 div.as-results ul li.as-result-item.active {
   background: #fddeb5;
 }
-/* line 524, ../../sass/screen.scss */
+/* line 544, ../../sass/screen.scss */
 div.as-results ul li.as-message {
   font-style: italic;
 }
 
-/* line 534, ../../sass/screen.scss */
+/* line 554, ../../sass/screen.scss */
 .window {
   display: none;
   position: fixed;
@@ -887,11 +911,11 @@ div.as-results ul li.as-message {
   left: 0;
   z-index: 50;
 }
-/* line 544, ../../sass/screen.scss */
+/* line 564, ../../sass/screen.scss */
 .window.visible {
   display: block;
 }
-/* line 548, ../../sass/screen.scss */
+/* line 568, ../../sass/screen.scss */
 .window .window-bg {
   background: #000;
   opacity: 0.7;
@@ -902,7 +926,7 @@ div.as-results ul li.as-message {
   top: 0;
   z-index: -1;
 }
-/* line 559, ../../sass/screen.scss */
+/* line 579, ../../sass/screen.scss */
 .window .window-content {
   position: relative;
   margin: 0 auto;
@@ -916,11 +940,11 @@ div.as-results ul li.as-message {
   max-height: 100%;
   overflow: auto;
 }
-/* line 573, ../../sass/screen.scss */
+/* line 593, ../../sass/screen.scss */
 .window .window-content form label, .window .window-content form .label {
   width: 150px;
 }
-/* line 579, ../../sass/screen.scss */
+/* line 599, ../../sass/screen.scss */
 .window .window-closer {
   position: absolute;
   top: 0;
@@ -928,65 +952,65 @@ div.as-results ul li.as-message {
   padding: 12px;
   z-index: 3;
 }
-/* line 585, ../../sass/screen.scss */
+/* line 605, ../../sass/screen.scss */
 .window .window-closer:after {
   content: "×";
 }
 
-/* line 596, ../../sass/screen.scss */
+/* line 616, ../../sass/screen.scss */
 #lieu_widget .lieu-ui {
   position: relative;
 }
-/* line 598, ../../sass/screen.scss */
+/* line 618, ../../sass/screen.scss */
 #lieu_widget .lieu-ui .map {
   height: 400px;
   width: 100%;
 }
-/* line 602, ../../sass/screen.scss */
+/* line 622, ../../sass/screen.scss */
 #lieu_widget .lieu-ui.hidden {
   display: none;
 }
-/* line 605, ../../sass/screen.scss */
+/* line 625, ../../sass/screen.scss */
 #lieu_widget .lieu-ui .masked {
   visibility: hidden;
 }
-/* line 610, ../../sass/screen.scss */
+/* line 630, ../../sass/screen.scss */
 #lieu_widget .lieu-choixmodif {
   display: none;
 }
-/* line 615, ../../sass/screen.scss */
+/* line 635, ../../sass/screen.scss */
 #lieu_widget.modif .lieu-choixmodif {
   display: unset;
 }
-/* line 620, ../../sass/screen.scss */
+/* line 640, ../../sass/screen.scss */
 #lieu_widget.modif .lieu-ui, #lieu_widget.attente .lieu-ui {
   display: none;
 }
-/* line 627, ../../sass/screen.scss */
+/* line 647, ../../sass/screen.scss */
 #lieu_widget.edit .lieu-ui .lieu-acinput {
   display: none;
 }
-/* line 630, ../../sass/screen.scss */
+/* line 650, ../../sass/screen.scss */
 #lieu_widget.edit .lieu-ui .map {
   height: 200px;
 }
-/* line 636, ../../sass/screen.scss */
+/* line 656, ../../sass/screen.scss */
 #lieu_widget #avis_lieu_vide {
   display: none;
 }
-/* line 640, ../../sass/screen.scss */
+/* line 660, ../../sass/screen.scss */
 #lieu_widget .message {
   background: #fddeb5;
   padding: 5px;
   font-style: italic;
   font-size: 0.9em;
 }
-/* line 646, ../../sass/screen.scss */
+/* line 666, ../../sass/screen.scss */
 #lieu_widget .message.hidden {
   display: none;
 }
 
-/* line 652, ../../sass/screen.scss */
+/* line 672, ../../sass/screen.scss */
 a.lieu-change {
   color: #fff;
   background: #f99b20;
@@ -999,25 +1023,25 @@ a.lieu-change {
   border-radius: 5px;
   margin-right: 7px;
 }
-/* line 664, ../../sass/screen.scss */
+/* line 684, ../../sass/screen.scss */
 a.lieu-change.ajout:before {
   content: "+";
   margin-right: 5px;
 }
 
-/* line 670, ../../sass/screen.scss */
+/* line 690, ../../sass/screen.scss */
 #stages-map {
   width: 100%;
   height: 600px;
   max-height: 90vh;
 }
 
-/* line 677, ../../sass/screen.scss */
+/* line 697, ../../sass/screen.scss */
 #id_stage-thematiques {
   display: none;
 }
 
-/* line 683, ../../sass/screen.scss */
+/* line 703, ../../sass/screen.scss */
 .homeh1 {
   display: flex;
   justify-content: space-between;
@@ -1027,26 +1051,26 @@ a.lieu-change.ajout:before {
   border-bottom: 3px solid #000;
   margin-bottom: 15px;
 }
-/* line 692, ../../sass/screen.scss */
+/* line 712, ../../sass/screen.scss */
 .homeh1 h1 {
   margin-bottom: 3px;
 }
-/* line 696, ../../sass/screen.scss */
+/* line 716, ../../sass/screen.scss */
 .homeh1 > * {
   display: inline-block;
 }
-/* line 699, ../../sass/screen.scss */
+/* line 719, ../../sass/screen.scss */
 .homeh1 p {
   text-align: right;
 }
 
-/* line 704, ../../sass/screen.scss */
+/* line 724, ../../sass/screen.scss */
 .betacadre {
   background: #fa6cae;
   padding: 10px;
 }
 
-/* line 709, ../../sass/screen.scss */
+/* line 729, ../../sass/screen.scss */
 .entrer {
   background: #fff;
   max-width: 500px;
@@ -1055,84 +1079,84 @@ a.lieu-change.ajout:before {
   margin: 15px auto;
 }
 
-/* line 717, ../../sass/screen.scss */
+/* line 737, ../../sass/screen.scss */
 article.promo {
   display: block;
   font-size: 1.1em;
 }
-/* line 721, ../../sass/screen.scss */
+/* line 741, ../../sass/screen.scss */
 article.promo .explications {
   display: table;
 }
-/* line 724, ../../sass/screen.scss */
+/* line 744, ../../sass/screen.scss */
 article.promo .explications:first-child {
   direction: rtl;
 }
-/* line 726, ../../sass/screen.scss */
+/* line 746, ../../sass/screen.scss */
 article.promo .explications:first-child > * {
   direction: ltr;
 }
-/* line 731, ../../sass/screen.scss */
+/* line 751, ../../sass/screen.scss */
 article.promo .explications > div {
   display: table-cell;
   vertical-align: middle;
   text-align: center;
 }
-/* line 736, ../../sass/screen.scss */
+/* line 756, ../../sass/screen.scss */
 article.promo .explications > div p {
   margin: 15px 15px;
 }
 
-/* line 744, ../../sass/screen.scss */
+/* line 764, ../../sass/screen.scss */
 .faq-toc {
   font-family: "Lato", sans-serif;
   display: block;
   max-width: 700px;
   margin: 0 auto;
 }
-/* line 749, ../../sass/screen.scss */
+/* line 769, ../../sass/screen.scss */
 .faq-toc ul {
   margin: 20px;
 }
-/* line 753, ../../sass/screen.scss */
+/* line 773, ../../sass/screen.scss */
 .faq-toc ul li a {
   color: #000;
   display: block;
   padding: 5px;
 }
-/* line 759, ../../sass/screen.scss */
+/* line 779, ../../sass/screen.scss */
 .faq-toc ul li.toc-h1 {
   display: none;
 }
-/* line 763, ../../sass/screen.scss */
+/* line 783, ../../sass/screen.scss */
 .faq-toc ul li.toc-h2 a {
   background: #fcc883;
 }
-/* line 767, ../../sass/screen.scss */
+/* line 787, ../../sass/screen.scss */
 .faq-toc ul li.toc-h3 a {
   padding-left: 10px;
   background: #fff;
   font-weight: normal;
 }
-/* line 773, ../../sass/screen.scss */
+/* line 793, ../../sass/screen.scss */
 .faq-toc ul li a:hover {
   color: #395214;
   background: #bce085 !important;
 }
 
-/* line 782, ../../sass/screen.scss */
+/* line 802, ../../sass/screen.scss */
 .faq article {
   background: #fff;
   padding: 15px;
 }
-/* line 785, ../../sass/screen.scss */
+/* line 805, ../../sass/screen.scss */
 .faq article h2 {
   background-color: #fcc883;
   color: #ae6505;
   margin: -15px;
   padding: 15px;
 }
-/* line 792, ../../sass/screen.scss */
+/* line 812, ../../sass/screen.scss */
 .faq article h3 {
   color: #0f4c82;
   background-color: #9dcbf3;
@@ -1140,19 +1164,19 @@ article.promo .explications > div p {
   margin-top: 30px;
   padding: 10px 15px;
 }
-/* line 799, ../../sass/screen.scss */
+/* line 819, ../../sass/screen.scss */
 .faq article h3:nth-child(2) {
   margin-top: 0;
 }
-/* line 804, ../../sass/screen.scss */
+/* line 824, ../../sass/screen.scss */
 .faq article ul {
   padding-left: 20px;
 }
-/* line 806, ../../sass/screen.scss */
+/* line 826, ../../sass/screen.scss */
 .faq article ul li {
   list-style: initial;
 }
-/* line 811, ../../sass/screen.scss */
+/* line 831, ../../sass/screen.scss */
 .faq article p, .faq article ul {
   font-family: "Lato", sans-serif;
   font-size: 18px;
diff --git a/avisstage/templates/avisstage/recherche/resultats.html b/avisstage/templates/avisstage/recherche/resultats.html
index 435c79e..5b0ff8c 100644
--- a/avisstage/templates/avisstage/recherche/resultats.html
+++ b/avisstage/templates/avisstage/recherche/resultats.html
@@ -45,7 +45,7 @@
                         <div>
                             <ul class="infos">
                                 <li class="type">{{ stage.get_type_stage_display }}</li>
-                                <li class="structure">{{ stage.structure }}</li>
+                                {% if stage.structure %}<li class="structure">{{ stage.structure }}</li>{% endif %}
                                 {% for lieu in stage.lieux.all %}<li class="lieu">{{ lieu.nom }}</li>{% endfor %}
                                 {% for matiere in stage.matieres.all %}
                                     <li class="matiere">{{ matiere.nom }}</li>
diff --git a/avisstage/templatetags/avisstage_tags.py b/avisstage/templatetags/avisstage_tags.py
index ac697f1..98d9ebb 100644
--- a/avisstage/templatetags/avisstage_tags.py
+++ b/avisstage/templatetags/avisstage_tags.py
@@ -31,7 +31,5 @@ def avis_len(value):
         return "vide"
     elif value < 30:
         return "court"
-    elif value < 100:
-        return "moyen"
     else:
         return "long"