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.,
Objet utilisateur de l'association |
{{ assooptions.utilisateur_asso }} |
+ Description de l'association |
+ {{ assooptions.description }} |
Messages personalisé dans les mails
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 %}
+À propos de {{AssoName}}
+ {{ description }}
+À propos de Re2o
+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.
+
+Liste des contributeurs
+
+ - Gabriel Detraz
+ - Maël Kervella
+ - Hugo Levy-Falk
+ - Augustin Lemesle
+ - Goulven Kermarec
+ - David Sinquin
+ - root
+ - Matthieu Michelet
+ - Guillaume Goessels
+ - Éloi Alain
+ - Simon Brélivet
+ - Laouen Fernet
+ - Pierre Cadart
+ - Thibault Deboutray
+ - Eloi Alain
+ - Daniel Stan
+ - Hugo Hervieux
+ - Thomas Goudine
+
+
+
+{% 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 %}
- Statistiques
{% acl_end %}
+ - À propos