Commit 93959c87 authored by matthieu's avatar matthieu Committed by root

Ajout d'une page A propos présantant l'association, re2o et listant c'est...

Ajout d'une page A propos présantant l'association, re2o et listant c'est principaux contributeurs. Ajout d'un champ description
(dans les parametres d'association) dans l'onglet préférences.
issue #64
parent 99c69a5d
# -*- 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=''),
),
]
......@@ -436,6 +436,7 @@ class AssoOption(models.Model):
blank=True,
null=True
)
description = models.TextField(default="")
class Meta:
permissions = (
......
......@@ -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>
......
{% 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 %}
......@@ -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)),
......
......@@ -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}
)
......@@ -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">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment