From 93959c87f4220a6b94cbe116e64fe49c34a21630 Mon Sep 17 00:00:00 2001
From: matthieu <matthieu.michelet@supelec.fr>
Date: Mon, 8 Jan 2018 16:33:50 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Ajout=20d'une=20page=20A=20propos=20pr?=
 =?UTF-8?q?=C3=A9santant=20l'association,=20re2o=20et=20listant=20c'est=20?=
 =?UTF-8?q?principaux=20contributeurs.=20Ajout=20d'un=20champ=20descriptio?=
 =?UTF-8?q?n=20(dans=20les=20parametres=20d'association)=20dans=20l'onglet?=
 =?UTF-8?q?=20pr=C3=A9f=C3=A9rences.=20issue=20#64?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0028_assooption_description.py | 20 ++++++
 preferences/models.py                         |  1 +
 .../preferences/display_preferences.html      |  2 +
 re2o/templates/re2o/about.html                | 62 +++++++++++++++++++
 re2o/urls.py                                  |  3 +-
 re2o/views.py                                 | 11 +++-
 templates/base.html                           |  1 +
 7 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 preferences/migrations/0028_assooption_description.py
 create mode 100644 re2o/templates/re2o/about.html

diff --git a/preferences/migrations/0028_assooption_description.py b/preferences/migrations/0028_assooption_description.py
new file mode 100644
index 00000000..f4f1ccc2
--- /dev/null
+++ b/preferences/migrations/0028_assooption_description.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-08 14:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0027_merge_20180106_2019'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='assooption',
+            name='description',
+            field=models.TextField(default=''),
+        ),
+    ]
diff --git a/preferences/models.py b/preferences/models.py
index 8dfc4260..ffe3b7f4 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -436,6 +436,7 @@ class AssoOption(models.Model):
         blank=True,
         null=True
     )
+    description = models.TextField(default="")
 
     class Meta:
         permissions = (
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 2b1caec8..9df422d7 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -159,6 +159,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <tr>
             <th>Objet utilisateur de l'association</th>
             <td>{{ assooptions.utilisateur_asso }}</td>
+            <th>Description de l'association</th>
+            <td>{{ assooptions.description }}</td>
         </tr>
     </table>
     <h4>Messages personalisé dans les mails</h4>
diff --git a/re2o/templates/re2o/about.html b/re2o/templates/re2o/about.html
new file mode 100644
index 00000000..0d631d4a
--- /dev/null
+++ b/re2o/templates/re2o/about.html
@@ -0,0 +1,62 @@
+{% extends "re2o/sidebar.html" %}
+{% comment %}
+Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+se veut agnostique au réseau considéré, de manière à être installable en
+quelques clics.
+
+Copyright © 2017  Gabriel Détraz
+Copyright © 2017  Goulven Kermarec
+Copyright © 2017  Augustin Lemesle
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+{% endcomment %}
+
+{% load bootstrap3 %}
+
+{% block title %}Historique{% endblock %}
+
+{% block content %}
+<h2>À propos de {{AssoName}}</h2>
+    {{ description }}
+<h2>À propos de Re2o</h2>
+<p>Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+se veut agnostique au réseau considéré, de manière à être installable en
+quelques clics.
+</p>
+<h3>Liste des contributeurs</h3>
+<ul>
+  <li>Gabriel Detraz</li>
+  <li>Maël Kervella</li>
+  <li>Hugo Levy-Falk</li>
+  <li>Augustin Lemesle</li>
+  <li>Goulven Kermarec</li>
+  <li>David Sinquin</li>
+  <li>root</li>
+  <li>Matthieu Michelet</li>
+  <li>Guillaume Goessels</li>
+  <li>Éloi Alain</li>
+  <li>Simon Brélivet</li>
+  <li>Laouen Fernet</li>
+  <li>Pierre Cadart</li>
+  <li>Thibault Deboutray</li>
+  <li>Eloi Alain</li>
+  <li>Daniel Stan</li>
+  <li>Hugo Hervieux</li>
+  <li>Thomas Goudine</li>
+    <br />
+    <br />
+    <br />
+{% endblock %}
+
diff --git a/re2o/urls.py b/re2o/urls.py
index 00e658a3..48a7ea98 100644
--- a/re2o/urls.py
+++ b/re2o/urls.py
@@ -40,10 +40,11 @@ from django.conf.urls import include, url
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
 
-from .views import index
+from .views import index, about_page
 
 urlpatterns = [
     url(r'^$', index, name='index'),
+    url(r'^about/$', about_page, name='about'),
     url('^logout/', auth_views.logout, {'next_page': '/'}),
     url('^', include('django.contrib.auth.urls')),
     url(r'^admin/', include(admin.site.urls)),
diff --git a/re2o/views.py b/re2o/views.py
index dce28b5d..ec73b8da 100644
--- a/re2o/views.py
+++ b/re2o/views.py
@@ -35,7 +35,7 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from reversion.models import Version
 from django.contrib import messages
 from preferences.models import Service
-from preferences.models import OptionalUser, GeneralOption
+from preferences.models import OptionalUser, GeneralOption, AssoOption
 import users, preferences, cotisations, topologie, machines
 
 def form(ctx, template, request):
@@ -154,3 +154,12 @@ def history(request, application, object_name, object_id):
         {'reversions': reversions, 'object': instance}
     )
 
+
+def about_page(request):
+    option = AssoOption.objects.get()
+    return render(
+        request,
+        "re2o/about.html",
+        {'description': option.description , 'AssoName' : option.name}
+    )
+    
diff --git a/templates/base.html b/templates/base.html
index b3a9bb5d..40b56042 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -89,6 +89,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                             {% can_view_app logs %}
                             <li><a href="{% url "logs:index" %}">Statistiques</a></li>
                             {% acl_end %}
+			    <li><a href="{% url "about" %}">À propos</a></li>
                         </ul>
                         <div class="col-sm-3 col-md-3 navbar-right">
                             <form action="{% url "search:search"%}" class="navbar-form" role="search">

From 7fbfd6b351e0ec83614264ea22aa0108c0f7e70a Mon Sep 17 00:00:00 2001
From: Yoann Pietri <yoann.pietri@supelec.fr>
Date: Sat, 20 Jan 2018 01:50:02 +0100
Subject: [PATCH 2/2] Contributeurs sur 2 colonnes.

---
 re2o/templates/re2o/about.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/re2o/templates/re2o/about.html b/re2o/templates/re2o/about.html
index 0d631d4a..4d5b84ac 100644
--- a/re2o/templates/re2o/about.html
+++ b/re2o/templates/re2o/about.html
@@ -36,6 +36,8 @@ se veut agnostique au réseau considéré, de manière à être installable en
 quelques clics.
 </p>
 <h3>Liste des contributeurs</h3>
+<div class="row">
+<div class="col-md-6">
 <ul>
   <li>Gabriel Detraz</li>
   <li>Maël Kervella</li>
@@ -45,7 +47,12 @@ quelques clics.
   <li>David Sinquin</li>
   <li>root</li>
   <li>Matthieu Michelet</li>
+  <li>Yoann Pietri</li>
   <li>Guillaume Goessels</li>
+</ul>
+</div>
+<div class="col-md-6">
+<ul>
   <li>Éloi Alain</li>
   <li>Simon Brélivet</li>
   <li>Laouen Fernet</li>
@@ -55,6 +62,9 @@ quelques clics.
   <li>Daniel Stan</li>
   <li>Hugo Hervieux</li>
   <li>Thomas Goudine</li>
+</ul>
+</div>
+</div>
     <br />
     <br />
     <br />