diff --git a/med/templates/med/aff_history.html b/med/templates/med/aff_history.html deleted file mode 100644 index 8f14352..0000000 --- a/med/templates/med/aff_history.html +++ /dev/null @@ -1,55 +0,0 @@ -{% 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 %} - - {% endif %} - - - - - - - - - - {% for rev in reversions %} - - - - - - {% endfor %} -
DateCableurCommentaire
{{ rev.revision.date_created }}{{ rev.revision.user }}{{ rev.revision.comment }}
diff --git a/med/templates/med/history.html b/med/templates/med/history.html index 3785f25..6b4a42b 100644 --- a/med/templates/med/history.html +++ b/med/templates/med/history.html @@ -1,26 +1,6 @@ -{% 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 %} -

Historique de {{ object }}

- {% include "med/aff_history.html" with reversions=reversions %} -
-
-
+

Historique de {{ object }}

+ {% if reversions.paginator %} + + {% endif %} + + + + + + + + + {% for rev in reversions %} + + + + + + {% endfor %} +
DateCableurCommentaire
{{ rev.revision.date_created }}{{ rev.revision.user }}{{ rev.revision.comment }}
{% endblock %} diff --git a/med/templates/med/index.html b/med/templates/med/index.html index 03fca22..4814333 100644 --- a/med/templates/med/index.html +++ b/med/templates/med/index.html @@ -1,25 +1,49 @@ -{% 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 extrastyle %} + {{ block.super }} + +{% endblock %} + +{% block coltype %}colMS{% endblock %} + +{% block bodyclass %}{{ block.super }} dashboard{% endblock %} + +{% block breadcrumbs %}{% endblock %} {% block content %} -

Bienvenue sur la base de données de la Mediatek.

-

Welcome to procrastination heaven !

- -

- Le site va subir progressivement des mises à jour pendant ces vacances. - Si vous rencontrez des instabilités, - veuillez nous faire remonter les problèmes au webmaster. -

- -
- Poulpy +
+

Bienvenue sur la base de données de la Mediatek.

+

Welcome to procrastination heaven !

+

+ Le site va subir progressivement des mises à jour pendant ces vacances. + Si vous rencontrez des instabilités, + veuillez nous faire remonter les problèmes au webmaster. +

+ Poulpy
{% endblock %} +{% block sidebar %} +
+
+ {% if request_user.is_authenticated %} +

{{ request_user.name }} {{ request_user.last_name }}

+ +

{% trans 'My profile' %}

+
    +
  • {% trans 'username' %} : {{ request_user.username }}
    • +
+ {% else %} +

Vous n'êtes pas connecté.

+ {% endif %} +
+
+{% endblock %} diff --git a/med/templates/med/sidebar.html b/med/templates/med/sidebar.html deleted file mode 100644 index 4f69298..0000000 --- a/med/templates/med/sidebar.html +++ /dev/null @@ -1,28 +0,0 @@ -{% 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 %} diff --git a/theme/locale/fr/LC_MESSAGES/django.po b/theme/locale/fr/LC_MESSAGES/django.po index e70bbc7..2f733c4 100644 --- a/theme/locale/fr/LC_MESSAGES/django.po +++ b/theme/locale/fr/LC_MESSAGES/django.po @@ -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 \n" "Language-Team: LANGUAGE \n" @@ -13,11 +13,31 @@ 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/admin/base_site.html:29 +msgid "My profile" +msgstr "Mon profil" + +#: templates/admin/base_site.html:41 templates/admin/base_site.html:60 +msgid "View admin" +msgstr "Administration" + +#: templates/admin/base_site.html:53 +msgid "Documentation" +msgstr "" + +#: 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 @@ -27,18 +47,6 @@ msgstr "" msgid "Home" msgstr "" -#: templates/admin/base_site.html:32 templates/admin/base_site.html:51 -msgid "View admin" -msgstr "Administration" - -#: templates/admin/base_site.html:44 -msgid "Documentation" -msgstr "" - -#: templates/admin/base_site.html:53 -msgid "Log out" -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" diff --git a/theme/static/css/admin.css b/theme/static/css/admin.css index 74fe094..0fb636e 100644 --- a/theme/static/css/admin.css +++ b/theme/static/css/admin.css @@ -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 diff --git a/theme/templates/admin/base_site.html b/theme/templates/admin/base_site.html index bc1456a..6841a32 100644 --- a/theme/templates/admin/base_site.html +++ b/theme/templates/admin/base_site.html @@ -17,15 +17,23 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endblock %} {% block usertools %} - {% if user.is_authenticated %} -
- {% block welcome-msg %} +
+ {% block welcome-msg %} + {% if user.is_authenticated %} {% trans 'Welcome,' %} {% firstof user.get_short_name user.get_username %}. - {% endblock %} - {% block userlinks %} - {# Link to our apps outside of admin #} - {% trans 'Home' %} / + {% endif %} + {% endblock %} + {% block userlinks %} + {# Link to our apps outside of admin #} + {% trans 'My profile' %} / + Media / + + {% if user.is_authenticated %} + {% if is_perm %} + Utilisateurs / + Statistiques / + {% 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 {% trans 'View admin' %} / {% endif %} {% trans 'Log out' %} - {% endblock %} -
- {% endif %} + {% else %} + {% trans 'Log in' %} + {% endif %} + {% endblock %} +
{% endblock %} {% block extrastyle %}