From e92295ee12919a510ff9ee140c73c59301fc8797 Mon Sep 17 00:00:00 2001 From: Qwann Date: Mon, 11 Jul 2016 21:48:11 +0200 Subject: [PATCH] =?UTF-8?q?home=20fini,=20d=C3=A9but=20du=20=20reste?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cof/settings_dev.py | 1 + gestioncof/static/css/cof.css | 38 ++++++++++++++++++++++++--- gestioncof/templates/base_header.html | 14 ++++------ gestioncof/templates/base_title.html | 23 ++-------------- gestioncof/templates/home.html | 6 +++-- gestioncof/templates/survey.html | 3 ++- requirements.txt | 1 + 7 files changed, 50 insertions(+), 36 deletions(-) diff --git a/cof/settings_dev.py b/cof/settings_dev.py index 36cd8a3a..ee1c6c7e 100644 --- a/cof/settings_dev.py +++ b/cof/settings_dev.py @@ -46,6 +46,7 @@ INSTALLED_APPS = ( 'captcha', 'django_cas_ng', 'debug_toolbar', + 'bootstrapform', ) MIDDLEWARE_CLASSES = ( diff --git a/gestioncof/static/css/cof.css b/gestioncof/static/css/cof.css index e6d19fdb..a1439814 100644 --- a/gestioncof/static/css/cof.css +++ b/gestioncof/static/css/cof.css @@ -210,6 +210,25 @@ fieldset legend { border-radius: 20px; } +#main-content { + background-color: white ; + padding: 20px; +} + +#main-content h2 { + 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-container { max-width: 95%; @@ -504,12 +523,14 @@ header { } header .banner { - padding-top : 20px; - padding-bottom : 20px; + padding-top : 15px; + padding-bottom : 15px; } header a, -header a:hover { +header a:hover, +header a:focus, +header a:active { color : white ; } @@ -526,6 +547,13 @@ header a:hover { float: none; } +.user-is-cof { + color : #ADE297; +} +.user-is-not-cof { + color: #F6BEBE; +} + /* #header #homelink { float: right; @@ -547,6 +575,10 @@ header .member-status { padding-top: 5px; } +header h1 { + font-family: 'Dosis', sans-serif; + font-size: x-large; +} @media (min-width: 480px) { header .member-status { float: right !important; diff --git a/gestioncof/templates/base_header.html b/gestioncof/templates/base_header.html index a0d9b37d..83bcca56 100644 --- a/gestioncof/templates/base_header.html +++ b/gestioncof/templates/base_header.html @@ -4,17 +4,13 @@
diff --git a/gestioncof/templates/base_title.html b/gestioncof/templates/base_title.html index a2021537..2416f113 100644 --- a/gestioncof/templates/base_title.html +++ b/gestioncof/templates/base_title.html @@ -1,30 +1,11 @@ {% extends "base_header.html" %} -{% block content %} -
- -
{% block interm_content %} -
-
+
+
{% block realcontent %}{% endblock %}
{% endblock %} -{% endblock %} diff --git a/gestioncof/templates/home.html b/gestioncof/templates/home.html index 63ee0be0..45b0fcc4 100644 --- a/gestioncof/templates/home.html +++ b/gestioncof/templates/home.html @@ -101,13 +101,15 @@ {% endif %}
-
-
+ {% if not user.profile.is_buro %} +
+

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

+ {% endif %}
{% endblock %} diff --git a/gestioncof/templates/survey.html b/gestioncof/templates/survey.html index 94376977..edfbe54f 100644 --- a/gestioncof/templates/survey.html +++ b/gestioncof/templates/survey.html @@ -1,4 +1,5 @@ {% extends "base_title.html" %} +{% load bootstrap %} {% block realcontent %}

Sondage: {{ survey.title }}

@@ -14,7 +15,7 @@ {% endif %}
{% csrf_token %} - {{ form.as_p }} + {{ form | bootstrap}} {% if current_answer %} diff --git a/requirements.txt b/requirements.txt index e7e7087b..b8103dd3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,3 +10,4 @@ Pillow==2.9.0 simplejson==3.8.2 six==1.10.0 unicodecsv==0.14.1 +bootstrapform