diff --git a/logs/templates/logs/index.html b/logs/templates/logs/index.html deleted file mode 100644 index 3047a7f1d17a0c8c55253ee83992de0259316608..0000000000000000000000000000000000000000 --- 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 971138fea72c8b4239d25a74a65e6d145ddac755..28002783dc74bc0628f8612cc901c42c893d5a01 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 3cd99903f0bd1b72a4145257a9e9cb4895028cb5..87dc3a9cdef0c69058196694ca20c96dfbd37b65 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 960f7e82f3acbd2c8f3381331299c09af9c17936..72a1b9dedb01b3118ad88701a06216c7b86b8491 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 1796ede6122dff2da57627b39e4ae5cec9ba9bde..33d11deccdf12eb7f3bb45992404d85424a51e6b 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 19e6da79761fe0107ab249d0ec11eced472e6bd4..09e05af3ee46ed8570218cb21ca4d67d4c35bb68 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 }}