DGNum/experiENS
6
0
Fork 0
Code Issues 11 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Petites améliorations et clarifications

Browse source
This commit is contained in:
Evarin 2017-05-16 20:18:30 +02:00
parent a4272b6820
commit ce563447b4
9 changed files with 77 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
avisstage/sass/screen.scss
View file

@ -548,6 +548,12 @@ form {
margin-right: 12px; margin-right: 12px;
padding-top: 5px; padding-top: 5px;
flex-shrink: 0; flex-shrink: 0;
&.required:before {
margin-right: 5px;
content:"*";
color: $rouge;
}
} }
label { label {
font-family: $headfont; font-family: $headfont;

BIN
avisstage/static/css/images/ui-icons_444444_256x240.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
avisstage/static/css/images/ui-icons_555555_256x240.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
avisstage/static/css/images/ui-icons_777620_256x240.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
avisstage/static/css/images/ui-icons_777777_256x240.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
avisstage/static/css/images/ui-icons_cc0000_256x240.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
avisstage/static/css/images/ui-icons_ffffff_256x240.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

128
avisstage/static/css/screen.css
View file

@ -628,32 +628,38 @@ form .field label, form .field .label {
flex-shrink: 0; flex-shrink: 0;
} }
/* line 552, ../../sass/screen.scss */ /* line 552, ../../sass/screen.scss */
form .field label.required:before, form .field .label.required:before {
margin-right: 5px;
content: "*";
color: #f70978;
}
/* line 558, ../../sass/screen.scss */
form .field label { form .field label {
font-family: Podkova, serif; font-family: Podkova, serif;
font-weight: bold; font-weight: bold;
} }
/* line 556, ../../sass/screen.scss */ /* line 562, ../../sass/screen.scss */
form .field .help_text { form .field .help_text {
font-style: italic; font-style: italic;
font-size: 0.9em; font-size: 0.9em;
} }
/* line 560, ../../sass/screen.scss */ /* line 566, ../../sass/screen.scss */
form .field .input { form .field .input {
display: inline-block; display: inline-block;
flex-grow: 1; flex-grow: 1;
margin-right: 10px; margin-right: 10px;
} }
/* line 570, ../../sass/screen.scss */ /* line 576, ../../sass/screen.scss */
ul.as-selections { ul.as-selections {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
/* line 574, ../../sass/screen.scss */ /* line 580, ../../sass/screen.scss */
ul.as-selections li { ul.as-selections li {
display: inline-block; display: inline-block;
} }
/* line 578, ../../sass/screen.scss */ /* line 584, ../../sass/screen.scss */
ul.as-selections .as-selection-item { ul.as-selections .as-selection-item {
padding: 0 5px; padding: 0 5px;
background: #f99b20; background: #f99b20;
@ -662,52 +668,52 @@ ul.as-selections .as-selection-item {
border-radius: 2px; border-radius: 2px;
font-weight: 500; font-weight: 500;
} }
/* line 586, ../../sass/screen.scss */ /* line 592, ../../sass/screen.scss */
ul.as-selections .as-selection-item a.as-close { ul.as-selections .as-selection-item a.as-close {
color: #fff; color: #fff;
-webkit-cursor: pointer; -webkit-cursor: pointer;
cursor: pointer; cursor: pointer;
margin-right: 5px; margin-right: 5px;
} }
/* line 593, ../../sass/screen.scss */ /* line 599, ../../sass/screen.scss */
ul.as-selections .as-selection-item.selected { ul.as-selections .as-selection-item.selected {
background: #8fcc33; background: #8fcc33;
} }
/* line 598, ../../sass/screen.scss */ /* line 604, ../../sass/screen.scss */
ul.as-selections .as-original { ul.as-selections .as-original {
flex-grow: 1; flex-grow: 1;
min-width: 200px; min-width: 200px;
} }
/* line 602, ../../sass/screen.scss */ /* line 608, ../../sass/screen.scss */
ul.as-selections .as-original input { ul.as-selections .as-original input {
width: 100%; width: 100%;
} }
/* line 608, ../../sass/screen.scss */ /* line 614, ../../sass/screen.scss */
div.as-results { div.as-results {
position: relative; position: relative;
} }
/* line 610, ../../sass/screen.scss */ /* line 616, ../../sass/screen.scss */
div.as-results ul { div.as-results ul {
position: absolute; position: absolute;
width: 100%; width: 100%;
background: #fff; background: #fff;
border: 1px solid #d2ebad; border: 1px solid #d2ebad;
} }
/* line 617, ../../sass/screen.scss */ /* line 623, ../../sass/screen.scss */
div.as-results ul li { div.as-results ul li {
padding: 3px 5px; padding: 3px 5px;
} }
/* line 623, ../../sass/screen.scss */ /* line 629, ../../sass/screen.scss */
div.as-results ul li.as-result-item.active { div.as-results ul li.as-result-item.active {
background: #fddeb5; background: #fddeb5;
} }
/* line 628, ../../sass/screen.scss */ /* line 634, ../../sass/screen.scss */
div.as-results ul li.as-message { div.as-results ul li.as-message {
font-style: italic; font-style: italic;
} }
/* line 638, ../../sass/screen.scss */ /* line 644, ../../sass/screen.scss */
.window { .window {
display: none; display: none;
position: fixed; position: fixed;
@ -718,11 +724,11 @@ div.as-results ul li.as-message {
left: 0; left: 0;
z-index: 50; z-index: 50;
} }
/* line 648, ../../sass/screen.scss */ /* line 654, ../../sass/screen.scss */
.window.visible { .window.visible {
display: block; display: block;
} }
/* line 652, ../../sass/screen.scss */ /* line 658, ../../sass/screen.scss */
.window .window-bg { .window .window-bg {
background: #000; background: #000;
opacity: 0.7; opacity: 0.7;
@ -733,7 +739,7 @@ div.as-results ul li.as-message {
top: 0; top: 0;
z-index: -1; z-index: -1;
} }
/* line 663, ../../sass/screen.scss */ /* line 669, ../../sass/screen.scss */
.window .window-content { .window .window-content {
position: relative; position: relative;
margin: 0 auto; margin: 0 auto;
@ -747,11 +753,11 @@ div.as-results ul li.as-message {
max-height: 100%; max-height: 100%;
overflow: auto; overflow: auto;
} }
/* line 677, ../../sass/screen.scss */ /* line 683, ../../sass/screen.scss */
.window .window-content form label, .window .window-content form .label { .window .window-content form label, .window .window-content form .label {
width: 150px; width: 150px;
} }
/* line 683, ../../sass/screen.scss */ /* line 689, ../../sass/screen.scss */
.window .window-closer { .window .window-closer {
position: absolute; position: absolute;
top: 0; top: 0;
@ -759,65 +765,65 @@ div.as-results ul li.as-message {
padding: 12px; padding: 12px;
z-index: 3; z-index: 3;
} }
/* line 689, ../../sass/screen.scss */ /* line 695, ../../sass/screen.scss */
.window .window-closer:after { .window .window-closer:after {
content: "×"; content: "×";
} }
/* line 700, ../../sass/screen.scss */ /* line 706, ../../sass/screen.scss */
#lieu_widget .lieu-ui { #lieu_widget .lieu-ui {
position: relative; position: relative;
} }
/* line 702, ../../sass/screen.scss */ /* line 708, ../../sass/screen.scss */
#lieu_widget .lieu-ui .map { #lieu_widget .lieu-ui .map {
height: 400px; height: 400px;
width: 100%; width: 100%;
} }
/* line 706, ../../sass/screen.scss */ /* line 712, ../../sass/screen.scss */
#lieu_widget .lieu-ui.hidden { #lieu_widget .lieu-ui.hidden {
display: none; display: none;
} }
/* line 709, ../../sass/screen.scss */ /* line 715, ../../sass/screen.scss */
#lieu_widget .lieu-ui .masked { #lieu_widget .lieu-ui .masked {
visibility: hidden; visibility: hidden;
} }
/* line 714, ../../sass/screen.scss */ /* line 720, ../../sass/screen.scss */
#lieu_widget .lieu-choixmodif { #lieu_widget .lieu-choixmodif {
display: none; display: none;
} }
/* line 719, ../../sass/screen.scss */ /* line 725, ../../sass/screen.scss */
#lieu_widget.modif .lieu-choixmodif { #lieu_widget.modif .lieu-choixmodif {
display: unset; display: unset;
} }
/* line 724, ../../sass/screen.scss */ /* line 730, ../../sass/screen.scss */
#lieu_widget.modif .lieu-ui, #lieu_widget.attente .lieu-ui { #lieu_widget.modif .lieu-ui, #lieu_widget.attente .lieu-ui {
display: none; display: none;
} }
/* line 731, ../../sass/screen.scss */ /* line 737, ../../sass/screen.scss */
#lieu_widget.edit .lieu-ui .lieu-acinput { #lieu_widget.edit .lieu-ui .lieu-acinput {
display: none; display: none;
} }
/* line 734, ../../sass/screen.scss */ /* line 740, ../../sass/screen.scss */
#lieu_widget.edit .lieu-ui .map { #lieu_widget.edit .lieu-ui .map {
height: 200px; height: 200px;
} }
/* line 740, ../../sass/screen.scss */ /* line 746, ../../sass/screen.scss */
#lieu_widget #avis_lieu_vide { #lieu_widget #avis_lieu_vide {
display: none; display: none;
} }
/* line 744, ../../sass/screen.scss */ /* line 750, ../../sass/screen.scss */
#lieu_widget .message { #lieu_widget .message {
background: #fddeb5; background: #fddeb5;
padding: 5px; padding: 5px;
font-style: italic; font-style: italic;
font-size: 0.9em; font-size: 0.9em;
} }
/* line 750, ../../sass/screen.scss */ /* line 756, ../../sass/screen.scss */
#lieu_widget .message.hidden { #lieu_widget .message.hidden {
display: none; display: none;
} }
/* line 756, ../../sass/screen.scss */ /* line 762, ../../sass/screen.scss */
a.lieu-change { a.lieu-change {
color: #fff; color: #fff;
background: #f99b20; background: #f99b20;
@ -830,25 +836,25 @@ a.lieu-change {
border-radius: 5px; border-radius: 5px;
margin-right: 7px; margin-right: 7px;
} }
/* line 768, ../../sass/screen.scss */ /* line 774, ../../sass/screen.scss */
a.lieu-change.ajout:before { a.lieu-change.ajout:before {
content: "+"; content: "+";
margin-right: 5px; margin-right: 5px;
} }
/* line 774, ../../sass/screen.scss */ /* line 780, ../../sass/screen.scss */
#stages-map { #stages-map {
width: 100%; width: 100%;
height: 600px; height: 600px;
max-height: 90vh; max-height: 90vh;
} }
/* line 781, ../../sass/screen.scss */ /* line 787, ../../sass/screen.scss */
#id_stage-thematiques { #id_stage-thematiques {
display: none; display: none;
} }
/* line 787, ../../sass/screen.scss */ /* line 793, ../../sass/screen.scss */
.homeh1 { .homeh1 {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -858,22 +864,22 @@ a.lieu-change.ajout:before {
border-bottom: 3px solid #000; border-bottom: 3px solid #000;
margin-bottom: 15px; margin-bottom: 15px;
} }
/* line 796, ../../sass/screen.scss */ /* line 802, ../../sass/screen.scss */
.homeh1 > * { .homeh1 > * {
display: inline-block; display: inline-block;
} }
/* line 799, ../../sass/screen.scss */ /* line 805, ../../sass/screen.scss */
.homeh1 p { .homeh1 p {
text-align: right; text-align: right;
} }
/* line 804, ../../sass/screen.scss */ /* line 810, ../../sass/screen.scss */
.betacadre { .betacadre {
background: #fa6cae; background: #fa6cae;
padding: 10px; padding: 10px;
} }
/* line 809, ../../sass/screen.scss */ /* line 815, ../../sass/screen.scss */
.entrer { .entrer {
background: #fff; background: #fff;
max-width: 500px; max-width: 500px;
@ -882,82 +888,82 @@ a.lieu-change.ajout:before {
margin: 15px auto; margin: 15px auto;
} }
/* line 817, ../../sass/screen.scss */ /* line 823, ../../sass/screen.scss */
article.promo { article.promo {
display: block; display: block;
font-size: 1.1em; font-size: 1.1em;
} }
/* line 821, ../../sass/screen.scss */ /* line 827, ../../sass/screen.scss */
article.promo .explications { article.promo .explications {
display: table; display: table;
} }
/* line 824, ../../sass/screen.scss */ /* line 830, ../../sass/screen.scss */
article.promo .explications:first-child { article.promo .explications:first-child {
direction: rtl; direction: rtl;
} }
/* line 826, ../../sass/screen.scss */ /* line 832, ../../sass/screen.scss */
article.promo .explications:first-child > * { article.promo .explications:first-child > * {
direction: ltr; direction: ltr;
} }
/* line 831, ../../sass/screen.scss */ /* line 837, ../../sass/screen.scss */
article.promo .explications > div { article.promo .explications > div {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
} }
/* line 836, ../../sass/screen.scss */ /* line 842, ../../sass/screen.scss */
article.promo .explications > div p { article.promo .explications > div p {
margin: 15px 15px; margin: 15px 15px;
} }
/* line 844, ../../sass/screen.scss */ /* line 850, ../../sass/screen.scss */
.faq-toc { .faq-toc {
display: block; display: block;
max-width: 700px; max-width: 700px;
margin: 0 auto; margin: 0 auto;
} }
/* line 848, ../../sass/screen.scss */ /* line 854, ../../sass/screen.scss */
.faq-toc ul { .faq-toc ul {
margin: 20px; margin: 20px;
} }
/* line 852, ../../sass/screen.scss */ /* line 858, ../../sass/screen.scss */
.faq-toc ul li a { .faq-toc ul li a {
color: #000; color: #000;
display: block; display: block;
padding: 5px; padding: 5px;
} }
/* line 858, ../../sass/screen.scss */ /* line 864, ../../sass/screen.scss */
.faq-toc ul li.toc-h1 { .faq-toc ul li.toc-h1 {
display: none; display: none;
} }
/* line 862, ../../sass/screen.scss */ /* line 868, ../../sass/screen.scss */
.faq-toc ul li.toc-h2 a { .faq-toc ul li.toc-h2 a {
background: #fcc883; background: #fcc883;
} }
/* line 866, ../../sass/screen.scss */ /* line 872, ../../sass/screen.scss */
.faq-toc ul li.toc-h3 a { .faq-toc ul li.toc-h3 a {
padding-left: 10px; padding-left: 10px;
background: #fff; background: #fff;
font-weight: normal; font-weight: normal;
} }
/* line 872, ../../sass/screen.scss */ /* line 878, ../../sass/screen.scss */
.faq-toc ul li a:hover { .faq-toc ul li a:hover {
color: #fff; color: #fff;
background: #f99b20 !important; background: #f99b20 !important;
} }
/* line 881, ../../sass/screen.scss */ /* line 887, ../../sass/screen.scss */
.faq article { .faq article {
background: #fff; background: #fff;
padding: 15px; padding: 15px;
} }
/* line 884, ../../sass/screen.scss */ /* line 890, ../../sass/screen.scss */
.faq article h2 { .faq article h2 {
background: #fcc883; background: #fcc883;
margin: -15px; margin: -15px;
padding: 15px; padding: 15px;
} }
/* line 890, ../../sass/screen.scss */ /* line 896, ../../sass/screen.scss */
.faq article h3 { .faq article h3 {
background: #1a82dd; background: #1a82dd;
color: #fff; color: #fff;
@ -965,15 +971,15 @@ article.promo .explications > div p {
margin-top: 30px; margin-top: 30px;
padding: 10px 15px; padding: 10px 15px;
} }
/* line 897, ../../sass/screen.scss */ /* line 903, ../../sass/screen.scss */
.faq article h3:nth-child(2) { .faq article h3:nth-child(2) {
margin-top: 0; margin-top: 0;
} }
/* line 902, ../../sass/screen.scss */ /* line 908, ../../sass/screen.scss */
.faq article ul { .faq article ul {
padding-left: 20px; padding-left: 20px;
} }
/* line 904, ../../sass/screen.scss */ /* line 910, ../../sass/screen.scss */
.faq article ul li { .faq article ul li {
list-style: initial; list-style: initial;
} }

5
avisstage/templates/avisstage/formulaires/stage.html
View file

@ -1,6 +1,8 @@
{% extends "avisstage/base.html" %} {% extends "avisstage/base.html" %}
{% load staticfiles avisstage_tags %} {% load staticfiles avisstage_tags %}
{% block title %}{% if creation %}Nouvelle expérience{% else %}Modification d'une expérience{% endif %}{% endblock %}
{% block extra_head %} {% block extra_head %}
<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?libraries=places&key=AIzaSyDd4innPShfHcW8KDJB833vZHZSsqt-ACw"></script> <script type="text/javascript" src="//maps.googleapis.com/maps/api/js?libraries=places&key=AIzaSyDd4innPShfHcW8KDJB833vZHZSsqt-ACw"></script>
<script type="text/javascript" src="{% static "js/leaflet.js" %}"></script> <script type="text/javascript" src="{% static "js/leaflet.js" %}"></script>
@ -173,7 +175,7 @@
{% for field in form %} {% for field in form %}
{{ field.errors }} {{ field.errors }}
<div class="field"> <div class="field">
<label for="{{ field.id_for_label }}">{{ field.label }}</label> <label for="{{ field.id_for_label }}" {% if field.field.required %}class="required"{% endif %}>{{ field.label }}</label>
<div class="input"> <div class="input">
{{ field }} {{ field }}
{% if field.help_text %} {% if field.help_text %}
@ -197,6 +199,7 @@
<input type="submit" value="Enregistrer" /> <input type="submit" value="Enregistrer" />
</div> </div>
<div id="avis-general"> <div id="avis-general">
<p class="commentaire">Ne répondez pas littéralement aux questions&nbsp;: elles n'apparaissent pas à la lecture, et ne sont là que pour vous aider à écrire&nbsp;! Tous les champs n'ont pas non plus besoin d'être remplis.</p>
{# Avis - général #} {# Avis - général #}
<h2>Commentaires sur le travail</h2> <h2>Commentaires sur le travail</h2>
{{ avis_stage_form.non_field_errors }} {{ avis_stage_form.non_field_errors }}