From e92295ee12919a510ff9ee140c73c59301fc8797 Mon Sep 17 00:00:00 2001
From: Qwann <qwann@hotmail.fr>
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 @@
 <header>
     <div class="container banner">
         <a href="{% url "gestioncof.views.home" %}">
-        <div class="btn-toolbar" role=toolbar>
-            <div class="btn-group">
-                <button type=button class="btn btn-default home-link" aria-label="GestioCOF"><h1>{{ site.name }}</h1></button> 
-                {% block homelink %}
-                <button type=button class="btn btn-default home-link" aria-label="home"><span class="glyphicon glyphicon-home" aria-hidden=true></span></button> 
-                {% endblock %}
-            </div>
-        </div>
+            <h1>GestioCOF</h1>
+            {% block homelink %}
+            <span class="glyphicon glyphicon-home" aria-hidden=true></span>
+            {% endblock %}
         </a>
         <div class="member-status">
-        <h2>{% if user.first_name %}{{ user.first_name }}{% else %}<tt>{{ user.username }}</tt>{% endif %}, <tt>{% if user.profile.is_cof %}Membre du COF{% else %}Non-membre du COF{% endif %}</tt></h2>
+            <h2>{% if user.first_name %}{{ user.first_name }}{% else %}<tt>{{ user.username }}</tt>{% endif %}, {% if user.profile.is_cof %}<tt class="user-is-cof">Membre du COF{% else %}<tt class="user-is-not-cof">Non-membre du COF{% endif %}</tt></h2>
         </div>
     </div><!-- /.container -->
 </header>
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 %}
-<header>
-    <div class="container banner">
-        <a href="{% url "gestioncof.views.home" %}">
-        <div class="btn-toolbar" role=toolbar>
-            <div class="btn-group">
-                <button type=button class="btn btn-default home-link" aria-label="GestioCOF"><h1>{{ site.name }}</h1></button> 
-                {% block homelink %}
-                <button type=button class="btn btn-default home-link" aria-label="home"><span class="glyphicon glyphicon-home" aria-hidden=true></span></button> 
-                {% endblock %}
-            </div>
-        </div>
-        </a>
-        <div class="member-status">
-        <h2>{% if user.first_name %}{{ user.first_name }}{% else %}<tt>{{ user.username }}</tt>{% endif %}, <tt>{% if user.profile.is_cof %}Membre du COF{% else %}Non-membre du COF{% endif %}</tt></h2>
-        </div>
-    </div><!-- /.container -->
-</header>
 {% block interm_content %}
 <div class="container hidden-xs espace"></div>
-<div class="container" id="principal">
-    <div id="main-content">
+<div class="container">
+    <div class="row" id="main-content">
         {% block realcontent %}{% endblock %}
     </div>
 </div>
 <div class="container hidden-xs espace"></div>
 {% 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 %}
     </div> <!-- /.row.home-menu -->
     <div class="container hidden-xs espace"></div>
-    <div class="home-menu row {% if not user.profile.is_buro %}row-centered {%endif%}">
-        <div class="{% if user.profile.is_buro %}col-sm-6 {% else %}col-sm-8 col-sm-offset-2 col-xs-12 {%endif%}normal-user-hm">
+    {% if not user.profile.is_buro %}
+    <div class="home-menu row row-centered">
+        <div class="col-sm-8 col-sm-offset-2 col-xs-12 normal-user-hm">
             <div class="foot-banner">
                 <h3>Pour tout problème : <tt>cof@ens.fr.</tt></h3>
             </div>
         </div>
     </div><!-- /.row.home-menu -->
+    {% endif %}
     <div class="container hidden-xs espace"></div>
 </div><!-- /.container -->
 {% 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 %}
                 <h2>Sondage: {{ survey.title }}</h2>
@@ -14,7 +15,7 @@
                 {% endif %}
                 <form method="post" action="{% url 'gestioncof.views.survey' survey.id %}">
                 {% csrf_token %}
-                {{ form.as_p }}
+                {{ 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" />
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