...
 
Commits (48)
This diff is collapsed.
This diff is collapsed.
......@@ -59,7 +59,7 @@
\parbox[b][\paperheight]{\paperwidth}{%
\vfill
\centering
{\transparent{0.1}\includegraphics[width=\textwidth]{../LogoListorique.png}}%
{\transparent{0.1}\includegraphics[width=\textwidth]{../LogoFinalist.png}}%
\vfill
}
}
......@@ -101,7 +101,7 @@
\geometry{verbose,tmargin=4em,bmargin=8em,lmargin=6em,rmargin=6em}
\setlength{\parindent}{0pt}
\setlength{\parindent}{1pt}
\setlength{\parskip}{1ex plus 0.5ex minus 0.2ex}
\thispagestyle{fancy}
......
......@@ -15,10 +15,10 @@
{% block content %}
<div class="page-header">
<h1>{% if isadmin and not isold %} {% trans "Administration des " %} {% endif %}
{% trans "Activités" %}
{% if isadmin and isold %} {% trans " passées" %} {% endif %}
</h1>
<h1>{% if isadmin and not isold %} {% trans "Administration des activités" %}
{% elif isadmin and isold %} {% trans "Activités passées" %}
{% else %} {% trans "Activités" %} {% endif %}
</h1>
{% if not isadmin %}
<h1><small>{% trans "Bienvenue sur l'interface permettant d'inviter tes amis aux pots." %}</small></h1>
</div>
......
......@@ -10,6 +10,15 @@
<h1><small>{% trans "Gestion des alias" %}</small></h1>
</div>
{% if compte %}
<form action="" method="post" class="well form-inline">{% csrf_token %}
{{ form.non_field_errors }}
{% for hidden in form.hidden_fields %}
{{ hidden }}
{% endfor %}
<input type="text" autocomplete="off" placeholder="{% trans "Nouvel alias" %}" id="alias" name="alias"/>
<input type="submit" class="btn btn-primary" value="{% trans "Ajouter" %}"/>
</form>
<div class="panel panel-default">
<div class="panel-heading lead">{% blocktrans with pseudo=compte.pseudo%}Alias de {{ pseudo }}{% endblocktrans %}</div>
<table class="table table-condensed table-hover">
......@@ -17,7 +26,7 @@
<tbody>
{% for alias in compte.aliases %}
<tr>
<td>{{ alias.alias }}</td> <td><a class="btn btn-danger btn-sm" href="{{ NOTE_ROOT_URL }}comptes/{{ compte.idbde }}/aliases/delete/{{ alias.id }}/">{% trans "Supprimer" %}</a></td>
<td>{{ alias.alias }}</td><td><a class="btn btn-danger btn-sm" href="{{ NOTE_ROOT_URL }}comptes/{{ compte.idbde }}/aliases/delete/{{ alias.id }}/">{% trans "Supprimer" %}</a></td>
</tr>
{% endfor %}
</tbody>
......@@ -29,14 +38,5 @@
{% endif %}
</table>
</div>
<form action="" method="post" class="well form-inline">{% csrf_token %}
{{ form.non_field_errors }}
{% for hidden in form.hidden_fields %}
{{ hidden }}
{% endfor %}
<input type="text" autocomplete="off" placeholder="{% trans "Nouvel alias" %}" id="alias" name="alias"/>
<input type="submit" class="btn btn-primary" value="{% trans "Ajouter" %}"/>
</form>
{% endif %}
{% endblock %}
{% extends "note/base.html" %}
{% load i18n %}
{% block title %}{% blocktrans with id=activite.id %}Liste des invités entrés à l'activité n°{{ idact }}{% endblocktrans %}{% endblock %}
{% block applets %}
<li role="presentation"{% if not hasadmin %} class="active"{% endif %}><a href="{{ NOTE_ROOT_URL }}activites/">{% trans "Activités" %}</a></li>
<li role="presentation"><a href="{{ NOTE_ROOT_URL }}mes_activites/">{% trans "Mes activités" %}</a></li>
{% if hasadmin %}
<li role="presentation"{% if hasadmin and not isold %} class="active"{% endif %}><a href="{{ NOTE_ROOT_URL }}activites/admin/">{% trans "Administration" %}</a></li>
<li role="presentation"{% if hasadmin and isold %} class="active"{% endif %}><a href="{{ NOTE_ROOT_URL }}activites/admin/old">{% trans "Activités Passées" %}</a></li>
<li role="presentation"><a href="{{ NOTE_ROOT_URL }}pot_gestion/">{% trans "Gestion des pots" %}</a></li>
{% endif %}
{% endblock %}
{% block content %}
<div class="page-header">
<h1>{% trans "Activités" %}</h1>
<h1><small>{% blocktrans with id=activite.id %}Liste des invités entrés à l'activité n°{{ idact }}{% endblocktrans %}</small></h1>
</div>
<h2>Invités entrés : {{ nb_invites }}</h2>
<table class="table">
<thead>
<tr>
<th class="text-center">{% trans "Date d'entrée au Pot" %}</th>
<th class="text-center">{% trans "Nom de l'invité" %}</th>
<th class="text-center">{% trans "Prénom de l'invité" %}</th>
<th class="text-center">{% trans "Nom de note de l'inviteur" %}</th>
</tr>
</thead>
<tbody>
{% for entry in invites_entres %}
<tr>
<td>{{ entry.heure_entree }}</td>
<td>{{ entry.nom_invite }}</td>
<td>{{ entry.prenom_invite }}</td>
<td>{{ entry.inviteur }}</td>
</tr>
{% empty %}
<tr>
<td colspan=15>{% trans "Aucun invité n'est encore rentré" %}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endblock %}
......@@ -52,13 +52,10 @@ Template de rendering d'une activité dans un tableau
{% if activite.liste %}
<td>{% trans "Liste d'invités" %}</td>
<td>
<a class="btn btn-success btn-small" href="{{ NOTE_ROOT_URL }}activites/{{activite.id}}/admin/">{% trans "Gérer" %}</a>
<!-- {% if activite.listeimprimee %} -->
<!-- <span class="btn btn-success disabled">{% trans "Liste imprimée" %}</span> -->
<!-- {% else %} -->
<!-- <a class="btn btn-success btn-small" href="{{ NOTE_ROOT_URL }}activites/{{activite.id}}/printlist/">{% trans "Imprimer la liste" %}</a> -->
<!-- {% endif %} -->
<a class="btn btn-success" href="{{ NOTE_ROOT_URL }}activites/{{activite.id}}/admin/">{% trans "Gérer" %}</a>
<a class="btn btn-info" href="{{ NOTE_ROOT_URL }}activites/{{activite.id}}/liste_invites">{% trans "Invités entrés" %}</a>
</td>
{% else %}
<td colspan="2">
<span class="text-danger">{% trans "Pas de liste d'invités" %}</span>
......
......@@ -82,6 +82,14 @@
<th>{% trans "Bus demandé" %}</th>
<td>{{ infos.bus }}</td>
</tr>
<tr>
<th>{% trans "Bus demandé 2" %}</th>
<td>{{ infos.bus2 }}</td>
</tr>
<tr>
<th>{% trans "Bus demandé 3" %}</th>
<td>{{ infos.bus3 }}</td>
</tr>
<tr>
<th>{% trans "Rôles demandés" %}</th>
<td>{{ infos.role }}</td>
......
......@@ -111,6 +111,7 @@ def render_activite(activite, isadmin=False, isgestion=False, ismine=False, hasn
'%s%sactivites/%s/%sdelete/' % (settings.NOTE_ROOT_URL, "mes_" if ismine else "", activite["id"], "gestion/" if isgestion else ""),
'danger'))
return {
'NOTE_ROOT_URL' : settings.NOTE_ROOT_URL,
'activite': activite,
......
......@@ -30,6 +30,8 @@ urlpatterns = [
url(ur'^/(?:activite|invitation)s?/(?P<idact>[^/]*)(?P<admin>/admin)?/*$', note.views.activite,name='activite'),
url(ur'^/(?:activite|invitation)s?/(?P<idact>[^/]*)/entree/*$', note.views.activite_entree, name='activite_entree'),
url(ur'^/(?:activite|invitation)s?/(?P<idact>[^/]*)/del_invite/(?P<idinv>[^/]*)(?P<admin>/admin)?/*$', note.views.del_invite,name='del_invite'),
# Afficher la liste des invités qui sont rentrés au pot
url(ur'^/(?:activite|invitation)s?/(?P<idact>[^/]*)/liste_invites/(?P<admin>/admin)?/*$', note.views.liste_invites_entres,name='liste_invites_entres'),
# mes_activités = création d'activités
url(ur'^/mes_activites(?:/(?P<idact>[^/]*))?(?P<delete>/delete)?/*$', note.views.mes_activites,name='mes_activites'),
# gestion des pots
......
This diff is collapsed.
:root{--main-color: #882558;
--second-color: #2BC82D; }
:root{--main-color: rgb(239, 21, 36);
--second-color: rgb(239, 0, 10); }
body {
background-image: url(../../../note/media/back.png);
......@@ -14,7 +14,7 @@ body {
/**** Tout ce qui concerne l'affichage des boutons sur la page conso ****/
.btn_conso:hover,
.btn_conso.active {
background: var(--main-color);
background: var(--second-color);
color: white;
border-bottom: 1px solid #103c56;
-webkit-box-shadow: inset 0px 1px 0px 0px #6ad2ef;
......@@ -50,23 +50,29 @@ body {
}
.btn_conso {
background-color: var(--second-color) ;
background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(000, 161, 212)),to(rgb(18,133,171)));
background-image: -webkit-linear-gradient(top, rgb(88, 223, 91), rgb(104, 223, 000));
background-image: -moz-linear-gradient(top, rgb(88, 223, 91), rgb(104, 223, 000));
background-image: -o-linear-gradient(top, rgb(88, 223, 91), rgb(104, 223, 000));
background-image: -ms-linear-gradient(top, rgb(88, 223, 91), rgb(104, 223, 000));
background-image: linear-gradient(top, rgb(88, 223, 91), rgb(104, 223, 000));
/* background-color: var(--second-color) ; */
/* background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(000, 161, 212)),to(rgb(18,133,171))); */
/* background-image: -webkit-linear-gradient(top, rgb(174, 245, 255), rgb(0,91,150)/\* rgb(174, 212, 255) *\/); */
/* background-image: -moz-linear-gradient(top, rgb(88, 223, 91), rgb(104, 223, 000)); */
/* background-image: -o-linear-gradient(top, rgb(88, 223, 91), rgb(104, 223, 000)); */
/* background-image: -ms-linear-gradient(top, rgb(88, 223, 91), rgb(104, 223, 000)); */
/* background-image: linear-gradient(top, rgb(88, 223, 91), rgb(104, 223, 000)); */
background: #000; /* Old browsers */
background: -moz-linear-gradient(top, #000 28%, #303030 100%); /* FF3.6-15 */
background: -webkit-linear-gradient(top, #000 28%,#303030 100%); /* Chrome10-25,Safari5.1-6 */
background: linear-gradient(to bottom, #000 28%,#303030 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
line-height: 2.5em;
width : 100%;
text-indent: 1em;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 500;
color: #222;
color: #DDD;
text-shadow: 0px 0.1px 0px rgba(0,0,0,.5);
border: 1px solid lightslategrey;
border: 1px solid #222;
}
......