diff --git a/bda/static/css/bda.css b/bda/static/css/bda.css index 8851eeee..72ca451f 100644 --- a/bda/static/css/bda.css +++ b/bda/static/css/bda.css @@ -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; +} diff --git a/bda/templates/bda-attrib-extra.html b/bda/templates/bda-attrib-extra.html index 8ffccf34..1fdb29a5 100644 --- a/bda/templates/bda-attrib-extra.html +++ b/bda/templates/bda-attrib-extra.html @@ -2,10 +2,10 @@ {% block extracontent %} -

Attribution (détails)

-

Token :

+

Attribution (détails)

+

Token :

{{ token }}
-

Placés : {{ total_slots }} ; Déçus : {{ total_losers }}

+

Placés : {{ total_slots }} ; Déçus : {{ total_losers }}

{% for member, shows in members2 %} diff --git a/bda/templates/bda-attrib.html b/bda/templates/bda-attrib.html index f0bfd955..cbfffacf 100644 --- a/bda/templates/bda-attrib.html +++ b/bda/templates/bda-attrib.html @@ -7,16 +7,16 @@ {% block realcontent %} -

Attribution

-

Token :

+

Attribution

+

Token :

{{ token }}
-

Placés : {{ total_slots }} ; Déçus : {{ total_losers }}

-{% if user.profile.is_buro %}

Déficit total: {{ total_deficit }} €, Opéra: {{ opera_deficit }} €, Attribué: {{ total_sold }} €

{% endif %} -

Temps de calcul : {{ duration|floatformat }}s

+

Placés : {{ total_slots }} ; Déçus : {{ total_losers }}

+{% if user.profile.is_buro %}

Déficit total: {{ total_deficit }} €, Opéra: {{ opera_deficit }} €, Attribué: {{ total_sold }} €

{% endif %} +

Temps de calcul : {{ duration|floatformat }}s

{% for show, members, losers in results %}
-

{{ show.title }} - {{ show.date_no_seconds }} @ {{ show.location }}

+

{{ show.title }} - {{ show.date_no_seconds }} @ {{ show.location }}

{{ show.nrequests }} demandes pour {{ show.slots }} places {{ show.price }}€ par place{% if user.profile.is_buro and show.nrequests < show.slots %}, {{ show.deficit }}€ de déficit{% endif %} diff --git a/bda/templates/inscription-bda.html b/bda/templates/inscription-bda.html index 5f529eef..f0c2a8af 100644 --- a/bda/templates/inscription-bda.html +++ b/bda/templates/inscription-bda.html @@ -1,4 +1,5 @@ {% extends "base_title.html" %} +{% load staticfiles %} {% block extra_head %} @@ -6,6 +7,7 @@ + {% 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); -

Inscription au tirage au sort du BdA

- {% if success %} -

Votre inscription a été mise à jour avec succès !

- {% endif %} - {% if stateerror %} -

Impossible d'enregistrer vos modifications: vous avez apporté d'autres modifications entre temps

- {% endif %} -
- {% csrf_token %} - {% include "inscription-formset.html" %} - - - - - Prix total actuel : {{ total_price }}€ -
+

Inscription au tirage au sort du BdA

+ {% if success %} +

Votre inscription a été mise à jour avec succès !

+ {% endif %} + {% if stateerror %} +

Impossible d'enregistrer vos modifications: vous avez apporté d'autres modifications entre temps

+ {% endif %} + + {% csrf_token %} + {% include "inscription-formset.html" %} +
+ Prix total actuel : {{ total_price }}€ +
+ + + + +

- 1: cette liste de vœu est ordonnée (du plus important au moins important), pour ajuster la priorité vous pouvez déplacer chaque vœu
+ 1: cette liste de vœu est ordonnée (du plus important au moins important), pour ajuster la priorité vous pouvez déplacer chaque vœu.

- +
+ {% endblock %} diff --git a/bda/templates/inscription-formset.html b/bda/templates/inscription-formset.html index cb249835..6dd2e545 100644 --- a/bda/templates/inscription-formset.html +++ b/bda/templates/inscription-formset.html @@ -1,5 +1,6 @@ +{% load bootstrap %} {{ formset.non_form_errors.as_ul }} -
+
{{ 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 }} {% endif %} {% endfor %} diff --git a/gestioncof/forms.py b/gestioncof/forms.py index bf983df5..ae8d1a91 100644 --- a/gestioncof/forms.py +++ b/gestioncof/forms.py @@ -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', diff --git a/gestioncof/static/css/cof.css b/gestioncof/static/css/cof.css index a1439814..4e501b45 100644 --- a/gestioncof/static/css/cof.css +++ b/gestioncof/static/css/cof.css @@ -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; diff --git a/gestioncof/templates/base.html b/gestioncof/templates/base.html index fb6361c5..7d03b4c7 100644 --- a/gestioncof/templates/base.html +++ b/gestioncof/templates/base.html @@ -7,8 +7,7 @@ - - + {% block extra_head %}{% endblock %} diff --git a/gestioncof/templates/base_title.html b/gestioncof/templates/base_title.html index 2416f113..c52f29bb 100644 --- a/gestioncof/templates/base_title.html +++ b/gestioncof/templates/base_title.html @@ -3,9 +3,18 @@ {% block interm_content %}
-
+
+
{% block realcontent %}{% endblock %} +
+
+
+
+

Pour tout problème : cof@ens.fr.

+
+
+
{% endblock %} diff --git a/gestioncof/templates/login.html b/gestioncof/templates/login.html index 7e6a6e66..62ad69d0 100644 --- a/gestioncof/templates/login.html +++ b/gestioncof/templates/login.html @@ -1,32 +1,36 @@ {% extends "base.html" %} +{% load bootstrap %} {% block content %} -
-
- + - +
- - - - - - - - -
{{ form.username.label_tag }}{{ form.username }}
{{ form.password.label_tag }}{{ form.password }}
- - - - + {% endblock %} diff --git a/gestioncof/templates/login_switch.html b/gestioncof/templates/login_switch.html index fe816a78..b33b0fb0 100644 --- a/gestioncof/templates/login_switch.html +++ b/gestioncof/templates/login_switch.html @@ -1,15 +1,29 @@ {% extends "base.html" %} {% block content %} -
-
- - Compte clipper - - - Extérieur - -
+
+
+
+
+ +
+ +
diff --git a/gestioncof/templates/profile.html b/gestioncof/templates/profile.html index d226ed72..c8ba2cf1 100644 --- a/gestioncof/templates/profile.html +++ b/gestioncof/templates/profile.html @@ -1,15 +1,20 @@ {% extends "base_title.html" %} +{% load bootstrap %} + +{% block page_size %}col-sm-8{%endblock%} {% block realcontent %}

Modifier mon profil

{% if success %}

Votre profil a été mis à jour avec succès !

{% endif %} -
+ {% csrf_token %} - - {{ form.as_table }} -
- +
+ {% for field in form %} + {{ field | bootstrap}} + {% endfor %} +
+
{% endblock %} diff --git a/gestioncof/templates/survey.html b/gestioncof/templates/survey.html index edfbe54f..4d836545 100644 --- a/gestioncof/templates/survey.html +++ b/gestioncof/templates/survey.html @@ -1,24 +1,29 @@ {% extends "base_title.html" %} {% load bootstrap %} +{% block page_size %}col-sm-8{% endblock %} + {% block realcontent %} -

Sondage: {{ survey.title }}

- {% if success %} - {% if deleted %} -

Votre réponse a bien été supprimée !

- {% else %} -

Votre réponse a bien été enregistrée ! Vous pouvez cependant la modifier jusqu'à la fin du sondage.

- {% endif %} - {% endif %} - {% if survey.details %} -

{{ survey.details }}

- {% endif %} -
- {% csrf_token %} - {{ form | bootstrap}} - - {% if current_answer %} - - {% endif %} -
+

Sondage: {{ survey.title }}

+ {% if success %} + {% if deleted %} +

Votre réponse a bien été supprimée !

+ {% else %} +

Votre réponse a bien été enregistrée ! Vous pouvez cependant la modifier jusqu'à la fin du sondage.

+ {% endif %} + {% endif %} + {% if survey.details %} +

{{ survey.details }}

+ {% endif %} +
+ {% csrf_token %} + {{ form | bootstrap}} + +
+ {% if current_answer %} + + {% endif %} + +
+
{% endblock %}