Skip to content

GitLab

Verified Commit 0b42060c authored by erdnaxe's avatar erdnaxe 🦋
Browse files
Options

Update homepage to new theme

parent 35094910
Pipeline #1394 failed with stage
    in 3 minutes and 11 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 122 additions and 153 deletions
    med/templates/med/aff_history.html deleted 100644 → 0
    View file @ 35094910
    {% 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 %}
    {% if reversions.paginator %}
    <ul class="pagination nav navbar-nav">
    {% if reversions.has_previous %}
    <li><a href="?page={{ reversions.previous_page_number }}">Suivants</a></li>
    {% endif %}
    {% for page in reversions.paginator.page_range %}
    <li class="{% if reversions.number == page %}active{% endif %}"><a href="?page={{page }}">{{ page }}</a></li>
    {% endfor %}
    {% if reversions.has_next %}
    <li> <a href="?page={{ reversions.next_page_number }}">Précédents</a></li>
    {% endif %}
    </ul>
    {% endif %}
    <table class="table table-striped">
    <thead>
    <tr>
    <th>Date</th>
    <th>Cableur</th>
    <th>Commentaire</th>
    </tr>
    </thead>
    {% for rev in reversions %}
    <tr>
    <td>{{ rev.revision.date_created }}</td>
    <td>{{ rev.revision.user }}</td>
    <td>{{ rev.revision.comment }}</td>
    </tr>
    {% endfor %}
    </table>
    med/templates/med/history.html
    View file @ 0b42060c
    {% extends "med/sidebar.html" %}
    {% extends "base.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.
    SPDX-License-Identifier: GPL-3.0-or-later
    {% endcomment %}
    {% load bootstrap3 %}
    ......@@ -28,9 +8,36 @@ with this program; if not, write to the Free Software Foundation, Inc.,
    {% block title %}Historique{% endblock %}
    {% block content %}
    <h2>Historique de {{ object }}</h2>
    {% include "med/aff_history.html" with reversions=reversions %}
    <br />
    <br />
    <br />
    <h2>Historique de {{ object }}</h2>
    {% if reversions.paginator %}
    <ul class="pagination nav navbar-nav">
    {% if reversions.has_previous %}
    <li><a href="?page={{ reversions.previous_page_number }}">Suivants</a></li>
    {% endif %}
    {% for page in reversions.paginator.page_range %}
    <li class="{% if reversions.number == page %}active{% endif %}"><a
    href="?page={{ page }}">{{ page }}</a></li>
    {% endfor %}
    {% if reversions.has_next %}
    <li><a href="?page={{ reversions.next_page_number }}">Précédents</a></li>
    {% endif %}
    </ul>
    {% endif %}
    <table class="table table-striped">
    <thead>
    <tr>
    <th>Date</th>
    <th>Cableur</th>
    <th>Commentaire</th>
    </tr>
    </thead>
    {% for rev in reversions %}
    <tr>
    <td>{{ rev.revision.date_created }}</td>
    <td>{{ rev.revision.user }}</td>
    <td>{{ rev.revision.comment }}</td>
    </tr>
    {% endfor %}
    </table>
    {% endblock %}
    med/templates/med/index.html
    View file @ 0b42060c
    {% extends "med/sidebar.html" %}
    {% extends "admin/base_site.html" %}
    {% comment %}
    SPDX-License-Identifier: GPL-3.0-or-later
    {% endcomment %}
    {% load bootstrap3 %}
    {% load staticfiles %}
    {% load i18n static %}
    {% block title %}Accueil{% endblock %}
    {% block title %}Base de donnée de la Mediatek{% endblock %}
    {% block content %}
    <h1>Bienvenue sur la base de données de la Mediatek.</h1>
    <h1>Welcome to procrastination heaven !</h1>
    {% block extrastyle %}
    {{ block.super }}
    <link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}"/>
    {% endblock %}
    {% block coltype %}colMS{% endblock %}
    {% block bodyclass %}{{ block.super }} dashboard{% endblock %}
    <p class="lead">
    Le site va subir progressivement des mises à jour pendant ces vacances.
    Si vous rencontrez des instabilités,
    veuillez nous faire remonter les problèmes <a href="mailto:a@crans.org,club-med@crans.org">au webmaster</a>.
    </p>
    {% block breadcrumbs %}{% endblock %}
    <div class="text-center">
    <img src="{% static "images/splash.png" %}" class="img-responsive" alt="Poulpy">
    {% block content %}
    <div id="content-main">
    <h1>Bienvenue sur la base de données de la Mediatek.</h1>
    <h1>Welcome to procrastination heaven !</h1>
    <p>
    Le site va subir progressivement des mises à jour pendant ces vacances.
    Si vous rencontrez des instabilités,
    veuillez nous faire remonter les problèmes <a href="mailto:a@crans.org,club-med@crans.org">au webmaster</a>.
    </p>
    <img src="{% static "images/splash.png" %}" class="poulpy" alt="Poulpy">
    </div>
    {% endblock %}
    {% block sidebar %}
    <div id="content-related">
    <div class="module" id="recent-actions-module">
    {% if request_user.is_authenticated %}
    <h2>{{ request_user.name }} {{ request_user.last_name }}</h2>
    <h3>{% trans 'My profile' %}</h3>
    <ul>
    <li>{% trans 'username' %} : {{ request_user.username }}</li>
    </ul>
    {% else %}
    <p>Vous n'êtes pas connecté.</p>
    {% endif %}
    </div>
    </div>
    {% endblock %}
    med/templates/med/sidebar.html deleted 100644 → 0
    View file @ 35094910
    {% extends "base.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 %}
    {% block sidebar %}
    {% endblock %}
    theme/locale/fr/LC_MESSAGES/django.po
    View file @ 0b42060c
    ......@@ -3,7 +3,7 @@ msgid ""
    msgstr ""
    "Project-Id-Version: PACKAGE VERSION\n"
    "Report-Msgid-Bugs-To: \n"
    "POT-Creation-Date: 2019-08-02 15:17+0200\n"
    "POT-Creation-Date: 2019-08-03 13:24+0200\n"
    "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    "Language-Team: LANGUAGE <LL@li.org>\n"
    ......@@ -13,32 +13,40 @@ msgstr ""
    "Content-Transfer-Encoding: 8bit\n"
    "Plural-Forms: nplurals=2; plural=(n > 1);\n"
    #: templates/admin/base_site.html:22
    #: templates/admin/base_site.html:23
    msgid "Welcome,"
    msgstr ""
    #: templates/admin/base_site.html:27 templates/registration/logged_out.html:9
    #: templates/registration/password_change_done.html:9
    #: templates/registration/password_change_form.html:9
    #: templates/registration/password_reset_complete.html:9
    #: templates/registration/password_reset_confirm.html:9
    #: templates/registration/password_reset_done.html:9
    #: templates/registration/password_reset_form.html:9
    msgid "Home"
    msgstr ""
    #: templates/admin/base_site.html:29
    msgid "My profile"
    msgstr "Mon profil"
    #: templates/admin/base_site.html:32 templates/admin/base_site.html:51
    #: templates/admin/base_site.html:41 templates/admin/base_site.html:60
    msgid "View admin"
    msgstr "Administration"
    #: templates/admin/base_site.html:44
    #: templates/admin/base_site.html:53
    msgid "Documentation"
    msgstr ""
    #: templates/admin/base_site.html:53
    #: templates/admin/base_site.html:62
    msgid "Log out"
    msgstr ""
    #: templates/admin/base_site.html:64 templates/registration/login.html:8
    msgid "Log in"
    msgstr ""
    #: templates/registration/logged_out.html:9
    #: templates/registration/password_change_done.html:9
    #: templates/registration/password_change_form.html:9
    #: templates/registration/password_reset_complete.html:9
    #: templates/registration/password_reset_confirm.html:9
    #: templates/registration/password_reset_done.html:9
    #: templates/registration/password_reset_form.html:9
    msgid "Home"
    msgstr ""
    #: templates/registration/logged_out.html:14
    msgid "Thanks for spending some quality time with the Web site today."
    msgstr ""
    ......@@ -47,10 +55,6 @@ msgstr ""
    msgid "Log in again"
    msgstr ""
    #: templates/registration/login.html:8
    msgid "Log in"
    msgstr ""
    #: templates/registration/password_change_done.html:9
    #: templates/registration/password_change_form.html:9
    msgid "Password change"
    ......
    theme/static/css/admin.css
    View file @ 0b42060c
    ......@@ -9,7 +9,7 @@
    /* Colors */
    #header {
    background-color: #151515;
    border-bottom: solid 5px #d8660f;
    border-bottom: solid 5px #ff4541;
    }
    .module h2, .module caption, .inline-group h2 {
    ......@@ -151,4 +151,11 @@ input[type=button]:focus, .button:hover, input[type=submit]:hover, input[type=bu
    /* Login page background */
    body.login {
    background: linear-gradient(-225deg, #FFE29F 0%, #ffb7b7 48%, #ff8477 100%) fixed !important;
    }
    img.poulpy {
    display: block;
    max-width: 100%;
    width: 1000px;
    height: auto;
    }
    \ No newline at end of file
    theme/templates/admin/base_site.html
    View file @ 0b42060c
    ......@@ -17,15 +17,23 @@ SPDX-License-Identifier: GPL-3.0-or-later
    {% endblock %}
    {% block usertools %}
    {% if user.is_authenticated %}
    <div id="user-tools">
    {% block welcome-msg %}
    <div id="user-tools">
    {% block welcome-msg %}
    {% if user.is_authenticated %}
    {% trans 'Welcome,' %}
    <strong>{% firstof user.get_short_name user.get_username %}</strong>.
    {% endblock %}
    {% block userlinks %}
    {# Link to our apps outside of admin #}
    <a href="{% url 'index' %}">{% trans 'Home' %}</a> /
    {% endif %}
    {% endblock %}
    {% block userlinks %}
    {# Link to our apps outside of admin #}
    <a href="{% url "users:mon-profil" %}">{% trans 'My profile' %}</a> /
    <a href="{% url "media:index" %}">Media</a> /
    {% if user.is_authenticated %}
    {% if is_perm %}
    <a href="{% url "users:index" %}">Utilisateurs</a> /
    <a href="{% url "logs:index" %}">Statistiques</a> /
    {% endif %}
    {% if available_apps %}
    {# When in admin site, list all admin pages and documentation #}
    ......@@ -52,9 +60,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
    <a href="{% url 'admin:index' %}">{% trans 'View admin' %}</a> /
    {% endif %}
    <a href="{% url 'logout' %}">{% trans 'Log out' %}</a>
    {% endblock %}
    </div>
    {% endif %}
    {% else %}
    <a href="{% url 'login' %}">{% trans 'Log in' %}</a>
    {% endif %}
    {% endblock %}
    </div>
    {% endblock %}
    {% block extrastyle %}
    ......
    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