Profil mieux

This commit is contained in:
Evarin 2017-10-06 11:28:22 +02:00
parent 3b9e5d086a
commit f6b43bc8eb
4 changed files with 151 additions and 90 deletions

View file

@ -330,6 +330,22 @@ ul.infos {
}
}
section.profil {
background: #fff;
max-width: 600px;
padding: 5px 15px;
margin: 5px auto;
margin-bottom: 15px;
div.infos {
border-bottom: 3px solid $vert;
display: flex;
width: 100%;
justify-content: space-between;
flex-wrap: wrap;
}
}
//
//
// Détail d'un stage

View file

@ -408,6 +408,23 @@ ul.infos:after {
flex: 1000;
}
/* line 333, ../../sass/screen.scss */
section.profil {
background: #fff;
max-width: 600px;
padding: 5px 15px;
margin: 5px auto;
margin-bottom: 15px;
}
/* line 340, ../../sass/screen.scss */
section.profil div.infos {
border-bottom: 3px solid #1a82dd;
display: flex;
width: 100%;
justify-content: space-between;
flex-wrap: wrap;
}
/* line 4, ../../sass/_stage_detail.scss */
article.stage .avis ul, article.stage .avis ol, div.tinymce ul, div.tinymce ol {
list-style: unset;
@ -691,7 +708,7 @@ article.stage .section-wrapper .toc .toc-active a {
border: 1px solid #ad0654;
}
/* line 345, ../../sass/screen.scss */
/* line 361, ../../sass/screen.scss */
input, textarea, select, div.tinymce, option, optgroup:before {
background: #fff;
font-size: 1em;
@ -701,13 +718,13 @@ input, textarea, select, div.tinymce, option, optgroup:before {
padding: 5px;
text-align: left;
}
/* line 354, ../../sass/screen.scss */
/* line 370, ../../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 361, ../../sass/screen.scss */
/* line 377, ../../sass/screen.scss */
input[type='text'], input[type='password'],
input[type='email'], input[type='number'], textarea, select {
border: none;
@ -717,7 +734,7 @@ input[type='email'], input[type='number'], textarea, select {
transition: border 1s ease-out, background 1s ease-out;
}
/* line 370, ../../sass/screen.scss */
/* line 386, ../../sass/screen.scss */
select {
-moz-appearance: none;
appearance: none;
@ -731,21 +748,21 @@ select {
background-color: #fff;
background-size: contain;
}
/* line 383, ../../sass/screen.scss */
/* line 399, ../../sass/screen.scss */
select option {
padding: 3px;
white-space: pre-wrap;
}
/* line 389, ../../sass/screen.scss */
/* line 405, ../../sass/screen.scss */
select optgroup option {
padding-left: 10px;
}
/* line 392, ../../sass/screen.scss */
/* line 408, ../../sass/screen.scss */
select optgroup:before {
font-weight: bold;
}
/* line 398, ../../sass/screen.scss */
/* line 414, ../../sass/screen.scss */
input[type="submit"], .btn {
font: 19px "Dosis", sans-serif;
background-color: #8fcc33;
@ -756,17 +773,17 @@ input[type="submit"], .btn {
display: inline-block;
}
/* line 408, ../../sass/screen.scss */
/* line 424, ../../sass/screen.scss */
p.submits {
text-align: right;
}
/* line 412, ../../sass/screen.scss */
/* line 428, ../../sass/screen.scss */
form .commentaire {
font-style: italic;
}
/* line 416, ../../sass/screen.scss */
/* line 432, ../../sass/screen.scss */
.edit-btn {
border-color: #706c00;
color: #000;
@ -775,14 +792,14 @@ form .commentaire {
background-origin: content-box;
background-size: contain;
}
/* line 424, ../../sass/screen.scss */
/* line 440, ../../sass/screen.scss */
.edit-btn:after {
content: "";
width: 30px;
display: inline-block;
}
/* line 431, ../../sass/screen.scss */
/* line 447, ../../sass/screen.scss */
textarea, div.tinymce {
font-family: "Lato", sans-serif;
border: none;
@ -792,20 +809,20 @@ textarea, div.tinymce {
transition: border 1s ease-out, background 1s ease-out;
}
/* line 440, ../../sass/screen.scss */
/* line 456, ../../sass/screen.scss */
textarea {
height: 200px;
resize: vertical;
}
/* line 448, ../../sass/screen.scss */
/* line 464, ../../sass/screen.scss */
form .field {
margin: 5px 0;
display: flex;
background: #fff;
padding: 10px;
}
/* line 454, ../../sass/screen.scss */
/* line 470, ../../sass/screen.scss */
form .field label, form .field .label {
display: inline-block;
width: 250px;
@ -814,39 +831,39 @@ form .field label, form .field .label {
padding-top: 5px;
flex-shrink: 0;
}
/* line 462, ../../sass/screen.scss */
/* line 478, ../../sass/screen.scss */
form .field label.required:before, form .field .label.required:before {
margin-right: 5px;
content: "*";
color: #f70978;
}
/* line 468, ../../sass/screen.scss */
/* line 484, ../../sass/screen.scss */
form .field label {
font-family: Alegreya, serif;
font-weight: bold;
}
/* line 472, ../../sass/screen.scss */
/* line 488, ../../sass/screen.scss */
form .field .help_text {
font-style: italic;
font-size: 0.9em;
}
/* line 476, ../../sass/screen.scss */
/* line 492, ../../sass/screen.scss */
form .field .input {
display: inline-block;
flex-grow: 1;
margin-right: 10px;
}
/* line 486, ../../sass/screen.scss */
/* line 502, ../../sass/screen.scss */
ul.as-selections {
display: flex;
flex-wrap: wrap;
}
/* line 490, ../../sass/screen.scss */
/* line 506, ../../sass/screen.scss */
ul.as-selections li {
display: inline-block;
}
/* line 494, ../../sass/screen.scss */
/* line 510, ../../sass/screen.scss */
ul.as-selections .as-selection-item {
padding: 0 5px;
background: #f99b20;
@ -855,52 +872,52 @@ ul.as-selections .as-selection-item {
border-radius: 2px;
font-weight: 500;
}
/* line 502, ../../sass/screen.scss */
/* line 518, ../../sass/screen.scss */
ul.as-selections .as-selection-item a.as-close {
color: #fff;
-webkit-cursor: pointer;
cursor: pointer;
margin-right: 5px;
}
/* line 509, ../../sass/screen.scss */
/* line 525, ../../sass/screen.scss */
ul.as-selections .as-selection-item.selected {
background: #8fcc33;
}
/* line 514, ../../sass/screen.scss */
/* line 530, ../../sass/screen.scss */
ul.as-selections .as-original {
flex-grow: 1;
min-width: 200px;
}
/* line 518, ../../sass/screen.scss */
/* line 534, ../../sass/screen.scss */
ul.as-selections .as-original input {
width: 100%;
}
/* line 524, ../../sass/screen.scss */
/* line 540, ../../sass/screen.scss */
div.as-results {
position: relative;
}
/* line 526, ../../sass/screen.scss */
/* line 542, ../../sass/screen.scss */
div.as-results ul {
position: absolute;
width: 100%;
background: #fff;
border: 1px solid #d2ebad;
}
/* line 533, ../../sass/screen.scss */
/* line 549, ../../sass/screen.scss */
div.as-results ul li {
padding: 3px 5px;
}
/* line 539, ../../sass/screen.scss */
/* line 555, ../../sass/screen.scss */
div.as-results ul li.as-result-item.active {
background: #fddeb5;
}
/* line 544, ../../sass/screen.scss */
/* line 560, ../../sass/screen.scss */
div.as-results ul li.as-message {
font-style: italic;
}
/* line 554, ../../sass/screen.scss */
/* line 570, ../../sass/screen.scss */
.window {
display: none;
position: fixed;
@ -911,11 +928,11 @@ div.as-results ul li.as-message {
left: 0;
z-index: 50;
}
/* line 564, ../../sass/screen.scss */
/* line 580, ../../sass/screen.scss */
.window.visible {
display: block;
}
/* line 568, ../../sass/screen.scss */
/* line 584, ../../sass/screen.scss */
.window .window-bg {
background: #000;
opacity: 0.7;
@ -926,7 +943,7 @@ div.as-results ul li.as-message {
top: 0;
z-index: -1;
}
/* line 579, ../../sass/screen.scss */
/* line 595, ../../sass/screen.scss */
.window .window-content {
position: relative;
margin: 0 auto;
@ -940,11 +957,11 @@ div.as-results ul li.as-message {
max-height: 100%;
overflow: auto;
}
/* line 593, ../../sass/screen.scss */
/* line 609, ../../sass/screen.scss */
.window .window-content form label, .window .window-content form .label {
width: 150px;
}
/* line 599, ../../sass/screen.scss */
/* line 615, ../../sass/screen.scss */
.window .window-closer {
position: absolute;
top: 0;
@ -952,65 +969,65 @@ div.as-results ul li.as-message {
padding: 12px;
z-index: 3;
}
/* line 605, ../../sass/screen.scss */
/* line 621, ../../sass/screen.scss */
.window .window-closer:after {
content: "×";
}
/* line 616, ../../sass/screen.scss */
/* line 632, ../../sass/screen.scss */
#lieu_widget .lieu-ui {
position: relative;
}
/* line 618, ../../sass/screen.scss */
/* line 634, ../../sass/screen.scss */
#lieu_widget .lieu-ui .map {
height: 400px;
width: 100%;
}
/* line 622, ../../sass/screen.scss */
/* line 638, ../../sass/screen.scss */
#lieu_widget .lieu-ui.hidden {
display: none;
}
/* line 625, ../../sass/screen.scss */
/* line 641, ../../sass/screen.scss */
#lieu_widget .lieu-ui .masked {
visibility: hidden;
}
/* line 630, ../../sass/screen.scss */
/* line 646, ../../sass/screen.scss */
#lieu_widget .lieu-choixmodif {
display: none;
}
/* line 635, ../../sass/screen.scss */
/* line 651, ../../sass/screen.scss */
#lieu_widget.modif .lieu-choixmodif {
display: unset;
}
/* line 640, ../../sass/screen.scss */
/* line 656, ../../sass/screen.scss */
#lieu_widget.modif .lieu-ui, #lieu_widget.attente .lieu-ui {
display: none;
}
/* line 647, ../../sass/screen.scss */
/* line 663, ../../sass/screen.scss */
#lieu_widget.edit .lieu-ui .lieu-acinput {
display: none;
}
/* line 650, ../../sass/screen.scss */
/* line 666, ../../sass/screen.scss */
#lieu_widget.edit .lieu-ui .map {
height: 200px;
}
/* line 656, ../../sass/screen.scss */
/* line 672, ../../sass/screen.scss */
#lieu_widget #avis_lieu_vide {
display: none;
}
/* line 660, ../../sass/screen.scss */
/* line 676, ../../sass/screen.scss */
#lieu_widget .message {
background: #fddeb5;
padding: 5px;
font-style: italic;
font-size: 0.9em;
}
/* line 666, ../../sass/screen.scss */
/* line 682, ../../sass/screen.scss */
#lieu_widget .message.hidden {
display: none;
}
/* line 672, ../../sass/screen.scss */
/* line 688, ../../sass/screen.scss */
a.lieu-change {
color: #fff;
background: #f99b20;
@ -1023,25 +1040,25 @@ a.lieu-change {
border-radius: 5px;
margin-right: 7px;
}
/* line 684, ../../sass/screen.scss */
/* line 700, ../../sass/screen.scss */
a.lieu-change.ajout:before {
content: "+";
margin-right: 5px;
}
/* line 690, ../../sass/screen.scss */
/* line 706, ../../sass/screen.scss */
#stages-map {
width: 100%;
height: 600px;
max-height: 90vh;
}
/* line 697, ../../sass/screen.scss */
/* line 713, ../../sass/screen.scss */
#id_stage-thematiques {
display: none;
}
/* line 703, ../../sass/screen.scss */
/* line 719, ../../sass/screen.scss */
.homeh1 {
display: flex;
justify-content: space-between;
@ -1051,26 +1068,26 @@ a.lieu-change.ajout:before {
border-bottom: 3px solid #000;
margin-bottom: 15px;
}
/* line 712, ../../sass/screen.scss */
/* line 728, ../../sass/screen.scss */
.homeh1 h1 {
margin-bottom: 3px;
}
/* line 716, ../../sass/screen.scss */
/* line 732, ../../sass/screen.scss */
.homeh1 > * {
display: inline-block;
}
/* line 719, ../../sass/screen.scss */
/* line 735, ../../sass/screen.scss */
.homeh1 p {
text-align: right;
}
/* line 724, ../../sass/screen.scss */
/* line 740, ../../sass/screen.scss */
.betacadre {
background: #fa6cae;
padding: 10px;
}
/* line 729, ../../sass/screen.scss */
/* line 745, ../../sass/screen.scss */
.entrer {
background: #fff;
max-width: 500px;
@ -1079,84 +1096,84 @@ a.lieu-change.ajout:before {
margin: 15px auto;
}
/* line 737, ../../sass/screen.scss */
/* line 753, ../../sass/screen.scss */
article.promo {
display: block;
font-size: 1.1em;
}
/* line 741, ../../sass/screen.scss */
/* line 757, ../../sass/screen.scss */
article.promo .explications {
display: table;
}
/* line 744, ../../sass/screen.scss */
/* line 760, ../../sass/screen.scss */
article.promo .explications:first-child {
direction: rtl;
}
/* line 746, ../../sass/screen.scss */
/* line 762, ../../sass/screen.scss */
article.promo .explications:first-child > * {
direction: ltr;
}
/* line 751, ../../sass/screen.scss */
/* line 767, ../../sass/screen.scss */
article.promo .explications > div {
display: table-cell;
vertical-align: middle;
text-align: center;
}
/* line 756, ../../sass/screen.scss */
/* line 772, ../../sass/screen.scss */
article.promo .explications > div p {
margin: 15px 15px;
}
/* line 764, ../../sass/screen.scss */
/* line 780, ../../sass/screen.scss */
.faq-toc {
font-family: "Lato", sans-serif;
display: block;
max-width: 700px;
margin: 0 auto;
}
/* line 769, ../../sass/screen.scss */
/* line 785, ../../sass/screen.scss */
.faq-toc ul {
margin: 20px;
}
/* line 773, ../../sass/screen.scss */
/* line 789, ../../sass/screen.scss */
.faq-toc ul li a {
color: #000;
display: block;
padding: 5px;
}
/* line 779, ../../sass/screen.scss */
/* line 795, ../../sass/screen.scss */
.faq-toc ul li.toc-h1 {
display: none;
}
/* line 783, ../../sass/screen.scss */
/* line 799, ../../sass/screen.scss */
.faq-toc ul li.toc-h2 a {
background: #fcc883;
}
/* line 787, ../../sass/screen.scss */
/* line 803, ../../sass/screen.scss */
.faq-toc ul li.toc-h3 a {
padding-left: 10px;
background: #fff;
font-weight: normal;
}
/* line 793, ../../sass/screen.scss */
/* line 809, ../../sass/screen.scss */
.faq-toc ul li a:hover {
color: #395214;
background: #bce085 !important;
}
/* line 802, ../../sass/screen.scss */
/* line 818, ../../sass/screen.scss */
.faq article {
background: #fff;
padding: 15px;
}
/* line 805, ../../sass/screen.scss */
/* line 821, ../../sass/screen.scss */
.faq article h2 {
background-color: #fcc883;
color: #ae6505;
margin: -15px;
padding: 15px;
}
/* line 812, ../../sass/screen.scss */
/* line 828, ../../sass/screen.scss */
.faq article h3 {
color: #0f4c82;
background-color: #9dcbf3;
@ -1164,19 +1181,19 @@ article.promo .explications > div p {
margin-top: 30px;
padding: 10px 15px;
}
/* line 819, ../../sass/screen.scss */
/* line 835, ../../sass/screen.scss */
.faq article h3:nth-child(2) {
margin-top: 0;
}
/* line 824, ../../sass/screen.scss */
/* line 840, ../../sass/screen.scss */
.faq article ul {
padding-left: 20px;
}
/* line 826, ../../sass/screen.scss */
/* line 842, ../../sass/screen.scss */
.faq article ul li {
list-style: initial;
}
/* line 831, ../../sass/screen.scss */
/* line 847, ../../sass/screen.scss */
.faq article p, .faq article ul {
font-family: "Lato", sans-serif;
font-size: 18px;

View file

@ -9,13 +9,21 @@
<a href="{% url "avisstage:profil_edit" %}" class="btn edit-btn">Modifier mes infos</a>
{% endif %}
</h1>
<p><b>Promotion :</b> {{ object.promotion }}</p>
{% if object.contactez_moi %}
<p><b>Adresse de contact :</b> <a href="mailto:{{ object.mail }}">{{ object.mail }}</a></p>
{% endif %}
{% if object.bio %}
<p>{{ object.bio|linebreaks }}</p>
{% endif %}
<section class="profil">
<div class="infos">
<p class="promo">Promotion : <b>{{ object.promotion }}</b></p>
<p class="contact">
{% if object.contactez_moi %}
Contact : <a href="mailto:{{ object.mail }}">{{ object.mail }}</a>
{% endif %}
</p>
</div>
{% if object.bio %}
<div class="bio">{{ object.bio|linebreaks }}</div>
{% else %}
<div class="bio"><p>&nbsp;</p></div>
{% endif %}
</section>
<article>
<h2>Son expérience</h2>

View file

@ -4,8 +4,7 @@
{% block title %}Espace personnel - ExperiENS{% endblock %}
{% block content %}
<h1>Mon espace personnel</h1>
<p>Bonjour <a href="{% url "avisstage:profil" user.username %}">{{ user.profil.nom }}</a> ! <a href="{% url "avisstage:profil_edit" %}" class="edit-btn btn">Modifier mes infos</a></p>
<h1>Bonjour {{ user.profil.nom }} !</h1>
<article>
<h2>Mes stages</h2>
@ -24,4 +23,25 @@
</li>
</ul>
</article>
<article>
<h2><a href="{% url "avisstage:profil" user.username %}">Mon profil public</a> <a href="{% url "avisstage:profil_edit" %}" class="edit-btn btn">Modifier mes infos</a></h2>
{% with object=user.profil %}
<section class="profil">
<div class="infos">
<p class="promo">Promotion : <b>{{ object.promotion }}</b></p>
<p class="contact">
{% if object.contactez_moi %}
Contact : {{ object.mail }}
{% endif %}
</p>
</div>
{% if object.bio %}
<div class="bio">{{ object.bio|linebreaks }}</div>
{% else %}
<div class="bio"><p><i>Vous n'avez rien mis ici. <a href="{% url "avisstage:profil_edit" %}">Écrivez un peu à propos de vous !</a></i></p></div>
{% endif %}
</section>
{% endwith %}
</article>
{% endblock %}