cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

tout plein de modif, toujours pas fini

Browse source
This commit is contained in:
Qwann 2016-07-14 19:29:15 +02:00
parent 6e314afd70
commit f14ddef88a
13 changed files with 342 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
bda/static/css/bda.css
View file

@ -1,10 +1,64 @@
form#tokenform {text-align: center; font-size: 2em;}
label {margin-right: 10px; vertical-align: top;}
form#tokenform textarea {font-size: 2em; width: 350px; height: 200px; font-family: 'Droif Serif', serif;}
input {width: 400px; font-size: 2em;}
ul.losers {display: inline; margin: 0; padding: 0;}
ul.losers li {display: inline;}
span.details {font-size: 0.7em;}
table {border: 1px solid black; border-collapse: collapse;}
td {border: 1px solid black; padding: 2px;}
.attribresult {margin: 10px 0px;}
form#tokenform {
text-align: center;
font-size: 2em;
}
label {
margin-right: 10px;
vertical-align: top;
}
form#tokenform textarea {
font-size: 2em;
width: 350px;
height: 200px;
font-family: 'Droif Serif', serif;
}
/* wft ?
input {
width: 400px;
font-size: 2em;
}*/
ul.losers {
display: inline;
margin: 0;
padding: 0;
}
ul.losers li {
display: inline;
}
span.details {
font-size: 0.7em;
}
td {
border: 0px solid black;
padding: 2px;
}
.attribresult {
margin: 10px 0px;
}
.inscription-bottom {
display: block;
padding: 0px 20px 20px 20px ;
margin-top : 15px;
}
.bda-prix {
font-weight: bold;
color:#DE826B;
}
.table-top {
background-color: #F0F0F0;
margin: -20px;
margin-top: 0px;
padding:20px;
padding-bottom: 28px;
padding-top: 8px;
}

6
bda/templates/bda-attrib-extra.html
View file

@ -2,10 +2,10 @@
{% block extracontent %}
<h1>Attribution (détails)</h1>
<h2>Token :</h2>
<h2>Attribution (détails)</h2>
<h3 class="horizontal-title">Token :</h3>
<pre>{{ token }}</pre>
<h2>Placés : {{ total_slots }} ; Déçus : {{ total_losers }}</h2>
<h3 class="horizontal-title">Placés : {{ total_slots }} ; Déçus : {{ total_losers }}</h3>
<table>
{% for member, shows in members2 %}

12
bda/templates/bda-attrib.html
View file

@ -7,16 +7,16 @@
{% block realcontent %}
<h1>Attribution</h1>
<h2>Token :</h2>
<h2>Attribution</h2>
<h3 class="horizontal-title">Token :</h3>
<pre>{{ token }}</pre>
<h2>Placés : {{ total_slots }} ; Déçus : {{ total_losers }}</h2>
{% if user.profile.is_buro %}<h2>Déficit total: {{ total_deficit }} €, Opéra: {{ opera_deficit }} €, Attribué: {{ total_sold }} €</h2>{% endif %}
<h2>Temps de calcul : {{ duration|floatformat }}s</h2>
<h3 class="horizontal-title">Placés : {{ total_slots }} ; Déçus : {{ total_losers }}</h3>
{% if user.profile.is_buro %}<h3 class="horizontal-title">Déficit total: {{ total_deficit }} €, Opéra: {{ opera_deficit }} €, Attribué: {{ total_sold }} €</h3>{% endif %}
<h3 class="horizontal-title">Temps de calcul : {{ duration|floatformat }}s</h3>
{% for show, members, losers in results %}
<div class="attribresult">
<h2>{{ show.title }} - {{ show.date_no_seconds }} @ {{ show.location }}</h2>
<h3 class="horizontal-title">{{ show.title }} - {{ show.date_no_seconds }} @ {{ show.location }}</h3>
<p>
<strong>{{ show.nrequests }} demandes pour {{ show.slots }} places</strong>
{{ show.price }}€ par place{% if user.profile.is_buro and show.nrequests < show.slots %}, {{ show.deficit }}€ de déficit{% endif %}

53
bda/templates/inscription-bda.html
View file

@ -1,4 +1,5 @@
{% extends "base_title.html" %}
{% load staticfiles %}
{% block extra_head %}
<link href="{{ STATIC_URL }}grappelli/jquery/ui/css/custom-theme/jquery-ui-1.8.custom.css" rel="stylesheet" type="text/css" media="screen" title="no title" charset="utf-8" />
@ -6,6 +7,7 @@
<script src="{{ STATIC_URL }}grappelli/jquery/ui/js/jquery-ui-1.8.15.custom.min.js" type="text/javascript"></script>
<link href="{{ STATIC_URL }}grappelli/css/tools.css" rel="stylesheet" type="text/css" />
<link href="{{ STATIC_URL }}grappelli/css/jquery-ui-grappelli-extensions.css" rel="stylesheet" type="text/css" />
<link type="text/css" rel="stylesheet" href="{% static "css/bda.css" %}" />
{% endblock %}
{% block realcontent %}
@ -49,9 +51,9 @@ var django = {
});
};
$(document).ready(function($) {
deleteButtonHandler($("table#bda_formset tbody.bda_formset_content").find("a.delete-handler"));
deleteButtonHandler($("table#bda_formset tbody.bda_formset_content").find("a.remove-btn"));
$("table#bda_formset tbody.bda_formset_content").sortable({
handle: "a.drag-handler",
handle: "a.drag-btn",
items: "tr",
axis: "y",
appendTo: 'body',
@ -91,28 +93,31 @@ var django = {
})(django.jQuery);
</script>
<h2>Inscription au tirage au sort du BdA</h2>
{% if success %}
<p class="success">Votre inscription a été mise à jour avec succès !</p>
{% endif %}
{% if stateerror %}
<p class="error">Impossible d'enregistrer vos modifications: vous avez apporté d'autres modifications entre temps</p>
{% endif %}
<form id="bda_form" method="post" action="{% url 'bda-tirage-inscription' tirage.id %}">
{% csrf_token %}
{% include "inscription-formset.html" %}
<input type="button" class="btn-addmore" value="Ajouter un autre v&oelig;u" id="add_more">
<script>
django.jQuery('#add_more').click(function() {
cloneMore('tbody.bda_formset_content tr:last-child', 'choixspectacle_set');
});
</script>
<input type="hidden" name="dbstate" value="{{ dbstate }}" />
<input type="submit" class="btn-submit" value="Enregistrer" />
Prix total actuel : {{ total_price }}€
<hr />
<h2 class="no-bottom-margin">Inscription au tirage au sort du BdA</h2>
{% if success %}
<p class="success table-top">Votre inscription a été mise à jour avec succès !</p>
{% endif %}
{% if stateerror %}
<p class="error table-top">Impossible d'enregistrer vos modifications: vous avez apporté d'autres modifications entre temps</p>
{% endif %}
<form id="bda_form" method="post" action="{% url 'bda-tirage-inscription' tirage.id %}">
{% csrf_token %}
{% include "inscription-formset.html" %}
<div class="inscription-bottom">
<span class="bda-prix">Prix total actuel : {{ total_price }}€</span>
<div class="pull-right">
<input type="button" class="btn btn-default" value="Ajouter un autre v&oelig;u" id="add_more">
<script>
django.jQuery('#add_more').click(function() {
cloneMore('tbody.bda_formset_content tr:last-child', 'choixspectacle_set');
});
</script>
<input type="hidden" name="dbstate" value="{{ dbstate }}" />
<input type="submit" class="btn btn-primary" value="Enregistrer" />
</div>
<p class="footnotes">
<sup>1</sup>: cette liste de v&oelig;u est ordonnée (du plus important au moins important), pour ajuster la priorité vous pouvez déplacer chaque v&oelig;u<br />
<sup>1</sup>: cette liste de v&oelig;u est ordonnée (du plus important au moins important), pour ajuster la priorité vous pouvez déplacer chaque v&oelig;u.<br />
</p>
</form>
</div>
</form>
{% endblock %}

9
bda/templates/inscription-formset.html
View file

@ -1,5 +1,6 @@
{% load bootstrap %}
{{ formset.non_form_errors.as_ul }}
<table id="bda_formset" class="form">
<table id="bda_formset" class="form table">
{{ formset.management_form }}
{% for form in formset.forms %}
{% if forloop.first %}
@ -22,15 +23,15 @@
{% for hidden in form.hidden_fields %}{{ hidden }}{% endfor %}
{% endif %}
{{ field.errors.as_ul }}
{{ field }}
{{ field | bootstrap }}
</td>
{% endif %}
{% endfor %}
<td class="tools-cell"><div class="tools">
<a href="javascript://" class="icon drag-handler" title="Déplacer"></a>
<a href="javascript://" class="glyphicon glyphicon-th drag-btn" title="Déplacer"></a>
<input type="checkbox" name="{{ form.DELETE.html_name }}" style="display: none;" />
<input type="hidden" name="{{ form.priority.html_name }}" style="{{ form.priority.value }}" />
<a href="javascript://" class="icon delete-handler" title="Supprimer"></a>
<a href="javascript://" class="glyphicon glyphicon-remove remove-btn" title="Supprimer"></a>
</div>
<div class="spacer"></div>
</td>

1
gestioncof/forms.py
View file

@ -176,7 +176,6 @@ class UserProfileForm(forms.ModelForm):
super(UserProfileForm, self).__init__(*args, **kw)
self.fields['first_name'].initial = self.instance.user.first_name
self.fields['last_name'].initial = self.instance.user.last_name
self.fields.keyOrder = [
'first_name',
'last_name',

198
gestioncof/static/css/cof.css
View file

@ -1,9 +1,9 @@
html,body {
background-color : #A7D4CD;
font-family: 'Hind', sans-serif;
/*
font-family: 'Roboto', sans-serif;
font-family: 'Hind', sans-serif;
*/
font-family: 'Roboto', sans-serif;
}
#principal {
@ -27,6 +27,10 @@ html,body {
min-height : 30px;
}
.no-bottom-margin {
margin-bottom: 0px !important;
}
.spacer {
clear: both;
}
@ -77,6 +81,7 @@ table#bda_formset {
width: 32px;
}
/*
.tools {
width: 32px;
}
@ -87,12 +92,72 @@ table#bda_formset {
.tools a.icon.drag-handler {
margin-right: 5px;
}*/
.form-horizontal .form-group {
margin-right: 0px;
margin-left: 0px;
}
form .control-label {
color: #B56A59;
}
.remove-btn {
color: #E6516A ;
font-size: x-large;
}
.drag-btn {
color :#4F504B;
font-size: x-large;
}
.btn-primary,
.btn-primary:active,
.btn-primary:focus,
.btn-primary.focus {
color: #fff;
background-color: #DE826B;
border-color: #4F504B;
}
.btn-primary:active:hover,
.btn-primary:hover {
color: #fff;
background-color: #D89C8D;
border-color: #4F504B;
}
label {
font-weight: normal;
}
form#bda_form {
margin-top:15px;
}
form#bda_form p {
font-size: 0.8em;
}
form#bda_form thead {
color : #B56A59
}
form#bda_form label.control-label {
visibility: hidden;
}
form#bda_form thead {
background-color: #F7F7F7;
}
form#bda_form {
margin-top: 0px;
margin-left: -20px;
margin-right: -20px;
}
table#bda_formset {
border-spacing: 0px 5px;
}
@ -100,6 +165,22 @@ table#bda_formset {
tbody.bda_formset_content {
}
tr.dynamic-form td {
background: #F0F0F0;
}
tr.dynamic-form.predelete td {
background-color: #FFECEC;
}
tr.ui-sortable-placeholder td, .placeholder-cell {
background: transparent;
}
/*
tr.dynamic-form td {
border-width: 1px 1px 1px 0px;
border-style: solid;
@ -149,7 +230,7 @@ tr.ui-sortable-placeholder td:first-child {
tr.ui-sortable-placeholder td:last-child {
border-top-right-radius: 10px;
border-bottom-right-radius: 10px;
}
}*/
form {
padding: 0;
@ -177,7 +258,6 @@ form#profile table td, form#profile table th {
/* reset the text-align */
text-align:left;
/* inline-block space fix */
margin-right:-4px;
}
form#profile table th {
@ -198,16 +278,21 @@ fieldset legend {
}
#main-login-container {
width: 500px;
margin: 7em auto;
margin-top : 7em;
margin-bottom: 7em;
}
#main-login-container .banner {
padding-right: 15px;
padding-left: 15px;
}
#main-login {
width: 500px;
border: 15px solid #333;
-webkit-border-radius: 20px;
-moz-border-radius: 20px;
border-radius: 20px;
background-color: #DE826B;
}
#main-login .btn-primary {
background-color: #B56A59
}
#main-content {
@ -215,20 +300,41 @@ fieldset legend {
padding: 20px;
}
#main-content h2 {
#main-content h2,
#main-content h3.horizontal-title {
display : block;
padding : 12px;
margin: -20px -20px 10px -20px ;
font-family: 'Dosis', sans-serif;
font-weight: 700;
font-size: x-large;
color: white;
background-color:#DE826B;
border-style: solid;
border-width: 0px 0px 5px 0px;
border-color: #4F504B;
}
#main-content h2 {
font-size: x-large;
background-color:#DE826B;
border-width: 0px 0px 5px 0px;
}
#main-content h3.horizontal-title {
font-weight: 700;
font-size: large;
background-color:#EAA594;
border-width: 0px 0px 3px 0px;
}
#main-content > h2,
#main-content > h3.horizontal-title {
margin-top:-10px;
}
#main-content > h2:first-child,
#main-content > h3.horizontal-title:first-child {
margin-top:-20px;
}
/*
main-container {
max-width: 95%;
@ -363,19 +469,19 @@ h4.block-title {
text-transform: uppercase;
}
#main form li {
#main-content form li {
list-style: none;
}
.success {
font-weight: bold;
color: #00B000;
color: #7AB85F;
background-color: transparent;
}
.error {
font-weight: bold;
color: #B00000;
color: #F6BEBE;
background-color: transparent;
}
@ -393,39 +499,32 @@ form#bda_form ul.errorlist li {
#main-login.login_block {
padding: 2em;
box-shadow: 0 0 100px #AAA inset;
}
a#login_clipper, a#login_outsider {
float: left;
display: block;
width: 250px;
#login_clipper, #login_outsider {
height: 200px;
text-align: center;
font-family: 'Droid Serif', serif;
font-size: 2em;
font-weight: bold;
line-height: 190px;
text-decoration: none;
color: #FFF;
padding: 70px 20px 40px 20px;
}
a#login_clipper {
background-color: #123E96;
box-shadow: 0 0 100px #040C78 inset;
#login_clipper {
background-color: #49A5E3;
}
a#login_clipper:hover {
background-color: #164BB6;
#login_clipper:hover {
background-color: #71B5E3;
}
a#login_outsider {
background-color: #961221;
box-shadow: 0 0 100px #780411 inset;
#login_outsider {
background-color: #E36748;
}
a#login_outsider:hover {
background-color: #B31729;
#login_outsider:hover {
background-color: #E38871;
}
#main-login label {
@ -543,9 +642,6 @@ header a:active {
float: left;
}*/
#main-login #header h1 {
float: none;
}
.user-is-cof {
color : #ADE297;
@ -563,10 +659,6 @@ tt {
font-weight: bold;
}
.error {
color: #BB0000;
background-color: transparent;
}
header .member-status {
float: left;
@ -616,23 +708,6 @@ header .open > .dropdown-toggle.btn-default {
/* FORMS --------------------------------- */
#main-login input {
border-width: 1px;
font-family: Verdana,sans-serif;
font-size: 1.1em;
color: #000;
padding: 3px;
min-height: 1.5em;
}
#main-login input[type="text"], #main-login input[type=password] {
border: 2px solid #888;
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
box-shadow: 0 0 12px #AAA inset;
min-height: 2em;
}
input[disabled], input[readonly] {
color: #BBB;
@ -856,6 +931,11 @@ tr.awesome{
color: red;
}
.title-foot {
padding-right:0px;
padding-left:0px;
}
.foot-banner {
font-family: 'Dosis', sans-serif;
background-color :#4F504B;

3
gestioncof/templates/base.html
View file

@ -7,8 +7,7 @@
<link type="text/css" rel="stylesheet" href="{% static "css/bootstrap.min.css" %}" />
<link type="text/css" rel="stylesheet" href="{% static "css/cof.css" %}" />
<link href="https://fonts.googleapis.com/css?family=Dosis:700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Dosis|Hind:300|Raleway|Roboto:300" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Dosis|Dosis:700|Raleway|Roboto:300,300i,700" rel="stylesheet">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
{% block extra_head %}{% endblock %}

11
gestioncof/templates/base_title.html
View file

@ -3,9 +3,18 @@
{% block interm_content %}
<div class="container hidden-xs espace"></div>
<div class="container">
<div class="row" id="main-content">
<div class="row row-centered">
<div class="col-xs-12 {%block page_size%}col-sm-12{%endblock%} col-centered" id="main-content">
{% block realcontent %}{% endblock %}
</div>
</div>
<div class="home-menu row row-centered">
<div class="visible-xs-block col-xs-12 title-foot">
<div class="foot-banner">
<h3>Pour tout problème : <tt>cof@ens.fr.</tt></h3>
</div>
</div>
</div><!-- /.row.home-menu -->
</div>
<div class="container hidden-xs espace"></div>
{% endblock %}

52
gestioncof/templates/login.html
View file

@ -1,32 +1,36 @@
{% extends "base.html" %}
{% load bootstrap %}
{% block content %}
<div id="main-login-container">
<div id="main-login" class="login_block">
<div id="header">
<h1>{{ site.name }} &ndash; Connexion</h1>
<div id="main-login-container" class="container">
<div class="row row-centered">
<div class="col-xs-10 col-sm-8 col-md-5 col-centered">
<header>
<div class="banner">
<h1>GestioCOF &ndash; Connexion</h1>
</div>
</header>
<div id="main-login" class="login_block">
{% if form.errors %}
<p class="error">Identifiants incorrects.</p>
{% endif %}
<form class="form-horizontal" method="post" action="{% url 'gestioncof.views.login_ext' %}">
{% csrf_token %}
<div class="form-group">
<input class="form-control" id="id_username" maxlength="254" name="username" type="text" placeholder="Nom d'utilisateur">
</div>
<div class="form-group">
<input class="form-control" id="id_password" name="password" type="password" placeholder="Mot de passe">
</div>
<div class="form-actions">
<input type="submit" name="submit" class="btn btn-primary " value="Se Connecter" />
<input type="hidden" name="next" value="{{ next }}" />
</div>
</form>
</div>
{% if form.errors %}
<p class="error">Identifiants incorrects.</p>
{% endif %}
<form method="post" action="{% url 'gestioncof.views.login_ext' %}">
{% csrf_token %}
<table>
<tr>
<td>{{ form.username.label_tag }}</td>
<td>{{ form.username }}</td>
</tr>
<tr>
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
</table>
<input type="submit" name="submit" class="btn-submit" value="SE CONNECTER" />
<input type="hidden" name="next" value="{{ next }}" />
</form>
</div>
</div><!-- /.row -->
</div>
{% endblock %}

32
gestioncof/templates/login_switch.html
View file

@ -1,15 +1,29 @@
{% extends "base.html" %}
{% block content %}
<div id="main-login-container">
<div id="main-login">
<a id="login_clipper" href="{% url 'django_cas_ng.views.login' %}">
Compte clipper
</a>
<a id="login_outsider" href="{% url 'gestioncof.views.login_ext' %}">
Extérieur
</a>
<div class="spacer"></div>
<div id="main-login-container" class="container">
<div class="row row-centered">
<div class="col-xs-10 col-sm-8 col-md-8 col-centered">
<header>
<div class="banner">
<h1>GestioCOF &ndash; Mode de connexion</h1>
</div>
</header>
<div class="container-fluid">
<div class="row" style="margin:0;">
<a aria-label="Compte clipper" href="{% url 'django_cas_ng.views.login' %}">
<div class="col-xs-12 col-sm-6" id="login_clipper">
Compte clipper
</div>
</a>
<a aria-label="Extérieur" href="{% url 'gestioncof.views.login_ext' %}">
<div class="col-xs-12 col-sm-6" id="login_outsider">
Extérieur
</div>
</a>
</div>
</div>
</div>
</div>
</div>

15
gestioncof/templates/profile.html
View file

@ -1,15 +1,20 @@
{% extends "base_title.html" %}
{% load bootstrap %}
{% block page_size %}col-sm-8{%endblock%}
{% block realcontent %}
<h2>Modifier mon profil</h2>
{% if success %}
<p class="success">Votre profil a été mis à jour avec succès !</p>
{% endif %}
<form id="profile" method="post" action="{% url 'gestioncof.views.profile' %}">
<form id="profile form-inline" method="post" action="{% url 'gestioncof.views.profile' %}">
{% csrf_token %}
<table>
{{ form.as_table }}
</table>
<input type="submit" class="btn-submit" value="Enregistrer" />
<fieldset>
{% for field in form %}
{{ field | bootstrap}}
{% endfor %}
</fieldset>
<input type="submit" class="btn btn-primary pull-right" value="Enregistrer" />
</form>
{% endblock %}

43
gestioncof/templates/survey.html
View file

@ -1,24 +1,29 @@
{% extends "base_title.html" %}
{% load bootstrap %}
{% block page_size %}col-sm-8{% endblock %}
{% block realcontent %}
<h2>Sondage: {{ survey.title }}</h2>
{% if success %}
{% if deleted %}
<p class="success">Votre réponse a bien été supprimée !</p>
{% else %}
<p class="success">Votre réponse a bien été enregistrée ! Vous pouvez cependant la modifier jusqu'à la fin du sondage.</p>
{% endif %}
{% endif %}
{% if survey.details %}
<p>{{ survey.details }}</p>
{% endif %}
<form method="post" action="{% url 'gestioncof.views.survey' survey.id %}">
{% csrf_token %}
{{ form | bootstrap}}
<input type="submit" class="btn-submit" value="Enregistrer" />
{% if current_answer %}
<input type="submit" name="delete" class="btn-submit" value="Supprimer ma réponse" />
{% endif %}
</form>
<h2>Sondage: {{ survey.title }}</h2>
{% if success %}
{% if deleted %}
<p class="success">Votre réponse a bien été supprimée !</p>
{% else %}
<p class="success">Votre réponse a bien été enregistrée ! Vous pouvez cependant la modifier jusqu'à la fin du sondage.</p>
{% endif %}
{% endif %}
{% if survey.details %}
<p>{{ survey.details }}</p>
{% endif %}
<form class="form-horizontal" method="post" action="{% url 'gestioncof.views.survey' survey.id %}">
{% csrf_token %}
{{ form | bootstrap}}
<div class="pull-right">
{% if current_answer %}
<input type="submit" name="delete" class="btn btn btn-default" value="Supprimer ma réponse" />
{% endif %}
<input type="submit" class="btn btn-primary" value="Enregistrer" />
</div>
</form>
{% endblock %}