From 8aefc37eca30a4c6ba4d20f7ea64024a9f09d623 Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Fri, 10 Aug 2018 10:23:54 +0200 Subject: [PATCH 01/18] change couleur des panel heading en accordeon pour une meilleur comprehension --- static/css/base.css | 9 +++++++++ users/templates/users/profil.html | 12 ++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/static/css/base.css b/static/css/base.css index 2dc17770..04bffbb7 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -129,3 +129,12 @@ td.long_text{ th.long_text{ width: 60%; } + +/* change color of panel heading on hover */ + +.panel > .profil:hover { + background-image: none; + background-color: #e6e6e6; + color: black; +} + diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 1e1926cc..5fde20f2 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -110,7 +110,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-
+

Informations détaillées

@@ -303,7 +303,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %}
-
+

Machines @@ -327,7 +327,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

-
+

Cotisations @@ -358,7 +358,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

-
+

Bannissements @@ -383,7 +383,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

-
+

Accès à titre gracieux @@ -408,7 +408,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

-
+

Email settings

From 5f4affd8ec7182a7fa2d7dbcc03fb151e97008bb Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Fri, 10 Aug 2018 13:05:13 +0200 Subject: [PATCH 02/18] Vu profil d'un autre user et solde correct --- users/templates/users/profil.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 5fde20f2..d1f3ee4a 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -32,7 +32,11 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}
-

Welcome {{ users.name }} {{ users.surname }}

+ {% if user == users %} +

Welcome {{ users.name }} {{ users.surname }}

+ {% else %} +

Profil de {{ users.name }} {{ users.surname }}

+ {% endif %}
@@ -70,7 +74,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
- € {{ user.solde }} + € {{ users.solde }}
From 93f4983fb9c0ed1ef20c9d8c10607491c38a8282 Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Fri, 10 Aug 2018 15:53:12 +0200 Subject: [PATCH 03/18] Suppresion du cache qui permetait de voir d'autres user --- re2o/views.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/re2o/views.py b/re2o/views.py index 1f9e6ab8..c3f13332 100644 --- a/re2o/views.py +++ b/re2o/views.py @@ -70,7 +70,6 @@ def index(request): }, 're2o/index.html', request) -@cache_page(7 * 24 * 60 * 60) def about_page(request): """ The view for the about page. Fetch some info about the configuration of the project. If it can't @@ -108,7 +107,6 @@ def about_page(request): } ) - def contact_page(request): """The view for the contact page Send all the objects MailContact From 51bfb5d6ce4ea44d184f56d50eb5414856583da1 Mon Sep 17 00:00:00 2001 From: Charlie Jacomme Date: Fri, 10 Aug 2018 16:03:11 +0200 Subject: [PATCH 04/18] Aff_article template bug fix --- cotisations/templates/cotisations/aff_article.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cotisations/templates/cotisations/aff_article.html b/cotisations/templates/cotisations/aff_article.html index 2afe726d..558dd7a2 100644 --- a/cotisations/templates/cotisations/aff_article.html +++ b/cotisations/templates/cotisations/aff_article.html @@ -35,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% trans "Cotisation type" %} {% trans "Duration (month)" %} {% trans "Concerned users" %} - {% trans "Available for everyone" | tick %} + {% trans "Available for everyone" %} @@ -46,7 +46,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {{ article.type_cotisation }} {{ article.duration }} {{ article.type_user }} - {{ article.available_for_everyone }} + {{ article.available_for_everyone|tick }} {% can_edit article %} From bb67127c3d1aefb6cfc54f0249f970be3b67d969 Mon Sep 17 00:00:00 2001 From: Charlie Jacomme Date: Fri, 10 Aug 2018 16:03:30 +0200 Subject: [PATCH 05/18] media_url bug fix --- re2o/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/re2o/settings.py b/re2o/settings.py index b68e4997..8c5476f6 100644 --- a/re2o/settings.py +++ b/re2o/settings.py @@ -179,7 +179,7 @@ STATIC_URL = '/static/' # Directory where the media files served by the server are stored MEDIA_ROOT = os.path.join(BASE_DIR, 'media').replace('\\', '/') # The URL to access the static files -MEDIA_URL = '/media/' +MEDIA_URL = os.path.join(BASE_DIR,'/media/') # Models to use for graphs GRAPH_MODELS = { From c16f635c48893c1f09c01871f7245becc66401d7 Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Fri, 10 Aug 2018 17:15:03 +0200 Subject: [PATCH 06/18] frontend sur le profil --- static/css/base.css | 5 +++++ users/templates/users/profil.html | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/static/css/base.css b/static/css/base.css index 04bffbb7..bf1775af 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -138,3 +138,8 @@ th.long_text{ color: black; } +/* add padding under title in profile */ +.title-dashboard{ + padding-bottom: 30px; +} + diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index d1f3ee4a..0e286aa7 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block title %}Profil{% endblock %} {% block content %} - From 2d41c8ba0b886c6e32d1959c56ed01797c0f7341 Mon Sep 17 00:00:00 2001 From: Charlie Jacomme Date: Fri, 10 Aug 2018 21:09:50 +0200 Subject: [PATCH 07/18] update contributors --- re2o/contributors.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/re2o/contributors.py b/re2o/contributors.py index 92b349a5..ac663d9c 100644 --- a/re2o/contributors.py +++ b/re2o/contributors.py @@ -27,5 +27,7 @@ CONTRIBUTORS = [ 'Hugo "Shaka" Hervieux', '"Mikachu"', 'Thomas "Nymous" Gaudin', - '"Esum"' + 'Benjamin "Esum" Graillot', + 'Gabriel "Boudy" Le Bouder', + 'Charlie "Le membre" Jacomme', ] From 018dae90fa77b22bfc5c2f9babbc0f5b9c0a681c Mon Sep 17 00:00:00 2001 From: Charlie Jacomme Date: Fri, 10 Aug 2018 21:15:16 +0200 Subject: [PATCH 08/18] update of footer and contributor text --- re2o/management/commands/gen_contrib.py | 2 +- re2o/templates/re2o/about.html | 4 +--- templates/base.html | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/re2o/management/commands/gen_contrib.py b/re2o/management/commands/gen_contrib.py index 6003b30f..9951a383 100644 --- a/re2o/management/commands/gen_contrib.py +++ b/re2o/management/commands/gen_contrib.py @@ -41,7 +41,7 @@ class Command(BaseCommand): self.stdout.write(self.style.SUCCESS("Exportation Sucessfull")) with open("re2o/contributors.py", "w") as contrib_file: contrib_file.write("\"\"\"re2o.contributors\n") - contrib_file.write("A list of the proud contributors to Re2o\n") + contrib_file.write("A list of the contributors to Re2o\n") contrib_file.write("\"\"\"\n") contrib_file.write("\n") contrib_file.write("CONTRIBUTORS = " + str(contributeurs)) diff --git a/re2o/templates/re2o/about.html b/re2o/templates/re2o/about.html index 8e88f5bb..d960067a 100644 --- a/re2o/templates/re2o/about.html +++ b/re2o/templates/re2o/about.html @@ -42,9 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc., so it can be setup in "a few steps". This tool is entirely free and available under a GNU Public License v2 (GPLv2) license on FedeRez gitlab.
- Re2o's mainteners are proud volunteers mainly from French engineering - schools (but not limited to) who have given a lot of their time to make - this project possible. So please be kind with them.
+ Re2o's mainteners are volunteers mainly from French schools.
If you want to get involved in the development process, we will be glad to welcome you so do not hesitate to contact us and come help us build the future of Re2o. diff --git a/templates/base.html b/templates/base.html index 8a21a612..49fb2da1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -252,7 +252,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {# Read the documentation for more information #} From b24ef60d6ab1a9a3618263d9d05145ffd17bbc30 Mon Sep 17 00:00:00 2001 From: Charlie Jacomme Date: Sat, 11 Aug 2018 00:13:48 +0200 Subject: [PATCH 09/18] Preferences renamed in administration --- templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base.html b/templates/base.html index 49fb2da1..baa6f46d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -120,7 +120,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_view_app preferences %}
  • - {% trans "Preferences" %} + {% trans "Administration" %}
    • {% acl_end %} From 7938c64a56961c871d0f2b0a39fab671df74d863 Mon Sep 17 00:00:00 2001 From: Charlie Jacomme Date: Sat, 11 Aug 2018 00:34:32 +0200 Subject: [PATCH 10/18] bug fix acl -> this system is not understanble, and is buggy --- re2o/templatetags/acl.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/re2o/templatetags/acl.py b/re2o/templatetags/acl.py index 19bd0fae..6fd00e19 100644 --- a/re2o/templatetags/acl.py +++ b/re2o/templatetags/acl.py @@ -146,7 +146,7 @@ def get_callback(tag_name, obj=None): if tag_name == 'can_view_app': return acl_fct( lambda x: ( - not any(not sys.modules[o].can_view(x) for o in obj), + not any(not sys.modules[o].can_view(x)[0] for o in obj), None ), False @@ -154,7 +154,7 @@ def get_callback(tag_name, obj=None): if tag_name == 'cannot_view_app': return acl_fct( lambda x: ( - not any(not sys.modules[o].can_view(x) for o in obj), + not any(not sys.modules[o].can_view(x)[0] for o in obj), None ), True @@ -171,12 +171,12 @@ def get_callback(tag_name, obj=None): ) if tag_name == 'can_view_any_app': return acl_fct( - lambda x: (any(sys.modules[o].can_view(x) for o in obj), None), + lambda x: (any(sys.modules[o].can_view(x)[0] for o in obj), None), False ) if tag_name == 'cannot_view_any_app': return acl_fct( - lambda x: (any(sys.modules[o].can_view(x) for o in obj), None), + lambda x: (any(sys.modules[o].can_view(x)[0] for o in obj), None), True ) From c7a1d38b5376c1a340d23bc97550cea88f662f7f Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Sat, 11 Aug 2018 01:21:57 +0200 Subject: [PATCH 11/18] on ne voit la barre de recherche qu'avec les droits suffisants --- templates/base.html | 46 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/templates/base.html b/templates/base.html index baa6f46d..e00cc337 100644 --- a/templates/base.html +++ b/templates/base.html @@ -132,30 +132,32 @@ with this program; if not, write to the Free Software Foundation, Inc., {% if not request.user.is_authenticated %} - {% if var_sa %} -
  • - - {% trans "Sign in" %} - -
    • - {% endif %} -
  • - - {% trans "Log in" %} - -
    • + {% if var_sa %} +
  • + + {% trans "Sign in" %} + +
    • + {% endif %} +
  • + + {% trans "Log in" %} + +
    • {% else %} -
  • -
    • + + + {% acl_end %} {% endif %}
  • {% include 'buttons/setlang.html' %} From ec0b47ac05094ec6adbf13b600633383ba50bd1e Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Sat, 11 Aug 2018 01:37:08 +0200 Subject: [PATCH 12/18] =?UTF-8?q?r=C3=A9organisation=20des=20onglets=20das?= =?UTF-8?q?n=20la=20navbar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/base.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/base.html b/templates/base.html index e00cc337..698195f7 100644 --- a/templates/base.html +++ b/templates/base.html @@ -76,15 +76,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,