Add club view / update profile view
Profile view - Let the user see his information. - List the clubs whose he is a member. Profile edition view - Renamed from previous "profile" view - User can now change "occupation" field. Club detail view - Informations about a club. - Accessible by staff members and "respos" of the club. - List members, with subscription fee (if applicable). Club admin - Change memberships of clubs added.
This commit is contained in:
parent
7c0bd2a271
commit
fe840f2003
12 changed files with 435 additions and 67 deletions
|
@ -332,8 +332,8 @@ fieldset legend {
|
|||
padding: 20px;
|
||||
}
|
||||
|
||||
#main-content a,
|
||||
#main-content a:hover {
|
||||
#main-content a:not(.btn),
|
||||
#main-content a:hover:not(.btn) {
|
||||
color : #D81138;
|
||||
}
|
||||
|
||||
|
@ -351,7 +351,7 @@ fieldset legend {
|
|||
#main-content h3.horizontal-title {
|
||||
display : block;
|
||||
padding : 12px;
|
||||
margin: -20px -20px 10px -20px ;
|
||||
margin: 0 -20px 10px -20px ;
|
||||
font-family: 'Dosis', sans-serif;
|
||||
font-weight: 700;
|
||||
color: white;
|
||||
|
@ -365,11 +365,11 @@ fieldset legend {
|
|||
border-width: 0px 0px 5px 0px;
|
||||
}
|
||||
|
||||
#main-content h2 a {
|
||||
#main-content h2 a:not(.btn) {
|
||||
color : #C9E5E1;
|
||||
}
|
||||
|
||||
#main-content h2 a:hover {
|
||||
#main-content h2 a:hover:not(.btn) {
|
||||
color : #ABB8B6;
|
||||
}
|
||||
|
||||
|
@ -377,10 +377,46 @@ fieldset legend {
|
|||
font-weight: 700;
|
||||
font-size: large;
|
||||
background-color:#EAA594;
|
||||
border-width: 0px 0px 3px 0px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
#main-content > :first-child {
|
||||
margin-top: -20px;
|
||||
}
|
||||
|
||||
#main-content > div:first-of-type > h3.horizontal-title:first-child {
|
||||
margin-top: -10px;
|
||||
}
|
||||
|
||||
#main-content h2 .actions ,
|
||||
#main-content h3 .actions {
|
||||
float: right;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
margin: -12px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
#main-content h2 .actions {
|
||||
min-height: 50px;
|
||||
}
|
||||
|
||||
#main-content h3 .actions {
|
||||
min-height: 44px;
|
||||
}
|
||||
|
||||
#main-content h2 .actions > *,
|
||||
#main-content h3 .actions > * {
|
||||
height: 100%;
|
||||
border-radius: 0;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#main-content h2 .actions > * + *,
|
||||
#main-content h3 .actions > * + * {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
/*
|
||||
main-container {
|
||||
|
|
|
@ -15,7 +15,21 @@
|
|||
Se déconnecter <span class="glyphicon glyphicon-log-out"></span>
|
||||
</a></span>
|
||||
</div>
|
||||
<h2 class="member-status">{% if user.first_name %}{{ user.first_name }}{% else %}<tt>{{ user.username }}</tt>{% endif %}, {% if user.profile.is_cof %}<tt class="user-is-cof">au COF{% else %}<tt class="user-is-not-cof">non-COF{% endif %}</tt></h2>
|
||||
<h2 class="member-status">
|
||||
<a href="{% url "gestion:profile" %}">
|
||||
{% if user.first_name %}
|
||||
{{ user.first_name }},
|
||||
{% else %}
|
||||
<tt>{{ user.username }}</tt>,
|
||||
{% endif %}
|
||||
</a>
|
||||
|
||||
{% if user.profile.is_cof %}
|
||||
<tt class="user-is-cof">au COF</tt>
|
||||
{% else %}
|
||||
<tt class="user-is-not-cof">non-COF</tt>
|
||||
{% endif %}
|
||||
</h2>
|
||||
</div><!-- /.container -->
|
||||
</header>
|
||||
{% block interm_content %}{% endblock %}
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{% extends "cof/base_header.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block homelink %}
|
||||
{% endblock %}
|
||||
|
@ -57,7 +58,11 @@
|
|||
<li><a href="{% url "calendar" %}">Calendrier dynamique</a></li>
|
||||
{% if user.profile.cof.is_cof %}<li><a href="{% url "petits-cours-inscription" %}">Inscription pour donner des petits cours</a></li>{% endif %}
|
||||
|
||||
<li><a href="{% url "gestion:profile" %}">Éditer mon profil</a></li>
|
||||
<li>
|
||||
<a href="{% url "gestion:profile" %}">
|
||||
{% trans "Voir/Éditer mon profil" %}
|
||||
</a>
|
||||
</li>
|
||||
{% if not user.profile.login_clipper %}<li><a href="{% url "password_change" %}">Changer mon mot de passe</a></li>{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue