From 13d4e2e79504d5763ab5e04ec734ed4ca981b9e0 Mon Sep 17 00:00:00 2001 From: chirac Date: Wed, 20 Jul 2016 12:18:37 +0200 Subject: [PATCH] =?UTF-8?q?M=C3=A9nage,=20mise=20en=20var=20du=20nom=20re2?= =?UTF-8?q?o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logs/templates/logs/index.html | 7 ------- logs/views.py | 2 -- re2o/context_processors.py | 3 ++- re2o/settings_local.example.py | 14 ++++++++++++++ re2o/templates/re2o/index.html | 2 +- templates/base.html | 4 ++-- 6 files changed, 19 insertions(+), 13 deletions(-) delete mode 100644 logs/templates/logs/index.html diff --git a/logs/templates/logs/index.html b/logs/templates/logs/index.html deleted file mode 100644 index 3047a7f1..00000000 --- a/logs/templates/logs/index.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "base.html" %} -{% load bootstrap3 %} - -{% block content %} -

Bienvenue sur re2o.rez !

-{% endblock %} - diff --git a/logs/views.py b/logs/views.py index 971138fe..28002783 100644 --- a/logs/views.py +++ b/logs/views.py @@ -1,4 +1,2 @@ from django.shortcuts import render -def index(request): - return render(request, 'logs/index.html') diff --git a/re2o/context_processors.py b/re2o/context_processors.py index 3cd99903..87dc3a9c 100644 --- a/re2o/context_processors.py +++ b/re2o/context_processors.py @@ -1,5 +1,5 @@ from machines.models import Interface, Machine - +from .settings import SITE_NAME def context_user(request): user = request.user @@ -20,4 +20,5 @@ def context_user(request): 'is_trez': is_trez, 'is_infra': is_infra, 'interfaces': interfaces, + 'site_name': SITE_NAME, } diff --git a/re2o/settings_local.example.py b/re2o/settings_local.example.py index 960f7e82..72a1b9de 100644 --- a/re2o/settings_local.example.py +++ b/re2o/settings_local.example.py @@ -19,6 +19,8 @@ DATABASES = { # Association information +SITE_NAME = "Re2o.rez" + LOGO_PATH = "static_files/logo.png" ASSO_NAME = "Asso reseau" ASSO_ADDRESS_LINE1 = "2, rue Edouard Belin" @@ -26,3 +28,15 @@ ASSO_ADDRESS_LINE2 = "57070 Metz" ASSO_SIRET = "" ASSO_EMAIL = "tresorier@ecole.fr" ASSO_PHONE = "01 02 03 04 05" + +services_urls = { + #Fill IT : ex : 'gitlab': {'url': 'https://gitlab.rezometz.org', 'logo': 'gitlab.png'}, + } + +# Number of hours a token remains valid after having been created. Numeric and string +# versions should have the same meaning. +REQ_EXPIRE_HRS = 48 +REQ_EXPIRE_STR = '48 heures' + +# Email `From` field +EMAIL_FROM = 'www-data@serveur.net' diff --git a/re2o/templates/re2o/index.html b/re2o/templates/re2o/index.html index 1796ede6..33d11dec 100644 --- a/re2o/templates/re2o/index.html +++ b/re2o/templates/re2o/index.html @@ -5,7 +5,7 @@ {% block title %}Accueil{% endblock %} {% block content %} -

Bienvenue sur re2o.rez !

+

Bienvenue sur {{ site_name }} !

{% if services_urls.zerobin %} diff --git a/templates/base.html b/templates/base.html index 19e6da79..09e05af3 100644 --- a/templates/base.html +++ b/templates/base.html @@ -12,7 +12,7 @@ {% bootstrap_javascript %} - Re2o : {% block title %}Accueil{% endblock %} + {{ site_name }} : {% block title %}Accueil{% endblock %} @@ -25,7 +25,7 @@ - Re2o + {{ site_name }}