Ménage, mise en var du nom re2o

13d4e2e7 · chirac · 915eb3e3 · 915eb3e3 · 13d4e2e7 · 13d4e2e7
Commit 13d4e2e7 authored Jul 20, 2016 by chirac
6 changed files
--- a/logs/templates/logs/index.html
+++ b/logs/templates/logs/index.html
-{% extends "base.html" %}
-{% load bootstrap3 %}
-
-{% block content %}
-    <h1>Bienvenue sur re2o.rez !</h1>
-{% endblock %}
-
--- a/logs/views.py
+++ b/logs/views.py
 from django.shortcuts import render

-def index(request):
-    return render(request, 'logs/index.html')
--- a/re2o/context_processors.py
+++ b/re2o/context_processors.py
 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,
    }
--- 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'
--- a/re2o/templates/re2o/index.html
+++ b/re2o/templates/re2o/index.html
@@ -5,7 +5,7 @@
 {% block title %}Accueil{% endblock %}

 {% block content %}
-    <h1>Bienvenue sur re2o.rez !</h1>
+    <h1>Bienvenue sur {{ site_name }} !</h1>

 <div class="row">
  {% if services_urls.zerobin %}

--- a/templates/base.html
+++ b/templates/base.html
@@ -12,7 +12,7 @@

        {% bootstrap_javascript %}
        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>Re2o : {% block title %}Accueil{% endblock %}</title>
+        <title>{{ site_name }} : {% block title %}Accueil{% endblock %}</title>
    </head>

    <body>
@@ -25,7 +25,7 @@
                            <span class="icon-bar"></span>
                            <span class="icon-bar"></span>
                        </button>
-                        <a class="navbar-brand" href="/">Re2o</a>
+                        <a class="navbar-brand" href="/">{{ site_name }}</a>
                    </div>
                    <div class="collapse navbar-collapse" id="myNavbar">
                        <ul class="nav navbar-nav">