+
+
+
+ {% if not popup %}
+
+ {% endif %}
+
+ {% block script %}
+
+
+
+
+ {% endblock %}
+
diff --git a/core/templates/core/create.jinja b/core/templates/core/create.jinja
index 04d8f866..332bb94b 100644
--- a/core/templates/core/create.jinja
+++ b/core/templates/core/create.jinja
@@ -1,16 +1,16 @@
{% extends "core/base.jinja" %}
{% block title %}
-{% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %}
+ {% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %}
{% endblock %}
{% block content %}
--
+ {% for n in quick_notifs %}
+
- {{ n }} + {% endfor %} +
+ {% if list_of_tabs %}
+
{% endif %}
-
- {% block script %}
-
-
-
-
-
-
-
+ {% if error %}
+ {{ error }}
+ {% endif %}
+ {% block content %}
{% endblock %}
-
+
+ {% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %}
- + {% endblock %} diff --git a/core/templates/core/delete_confirm.jinja b/core/templates/core/delete_confirm.jinja index a439c9e0..3a393b67 100644 --- a/core/templates/core/delete_confirm.jinja +++ b/core/templates/core/delete_confirm.jinja @@ -1,7 +1,7 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Delete confirmation{% endtrans %} + {% trans %}Delete confirmation{% endtrans %} {% endblock %} {% block info_boxes %} @@ -11,14 +11,14 @@ {% endblock %} {% block content %} -{% trans %}Delete confirmation{% endtrans %}
- - + + {% endblock %} diff --git a/core/templates/core/edit.jinja b/core/templates/core/edit.jinja index a6fe7a40..25c6bd74 100644 --- a/core/templates/core/edit.jinja +++ b/core/templates/core/edit.jinja @@ -1,24 +1,24 @@ {% extends "core/base.jinja" %} {% block title %} -{% if object %} -{% trans obj=object %}Edit {{ obj }}{% endtrans %} -{% else %} -{% trans %}Save{% endtrans %} -{% endif %} + {% if object %} + {% trans obj=object %}Edit {{ obj }}{% endtrans %} + {% else %} + {% trans %}Save{% endtrans %} + {% endif %} {% endblock %} {% block content %} -{% if object %} -{% trans obj=object %}Edit {{ obj }}{% endtrans %}
-{% else %} -{% trans %}Save{% endtrans %}
-{% endif %} - + {% endblock %} diff --git a/core/templates/core/file.jinja b/core/templates/core/file.jinja index f6e2d856..f8f42990 100644 --- a/core/templates/core/file.jinja +++ b/core/templates/core/file.jinja @@ -1,62 +1,62 @@ {% extends "core/base.jinja" %} {% block title %} -{% if file %} -{{ file.get_display_name() }} -{% elif file_list %} -{% trans %}File list{% endtrans %} -{% elif new_file %} -{% trans %}New file{% endtrans %} -{% else %} -{% trans %}Not found{% endtrans %} -{% endif %} + {% if file %} + {{ file.get_display_name() }} + {% elif file_list %} + {% trans %}File list{% endtrans %} + {% elif new_file %} + {% trans %}New file{% endtrans %} + {% else %} + {% trans %}Not found{% endtrans %} + {% endif %} {% endblock %} {% macro print_file_name(file) %} -{% if file %} -{{ print_file_name(file.parent) }} > -{{ file.get_display_name() }} -{% else %} -{% trans %}Files{% endtrans %} -{% endif %} + {% if file %} + {{ print_file_name(file.parent) }} > + {{ file.get_display_name() }} + {% else %} + {% trans %}Files{% endtrans %} + {% endif %} {% endmacro %} {% block content %} -{{ print_file_name(file) }} + {{ print_file_name(file) }} - +-{% if file %} -{% block file %} -{% endblock %} -{% endif %} + {% if file %} + {% block file %} + {% endblock %} + {% endif %} -{% block script %} -{{ super() }} -{% if popup %} - -{% endif %} -{% endblock %} + {% block script %} + {{ super() }} + {% if popup %} + + {% endif %} + {% endblock %} {% endblock %} diff --git a/core/templates/core/file_delete_confirm.jinja b/core/templates/core/file_delete_confirm.jinja index 3efd2bd7..521413e2 100644 --- a/core/templates/core/file_delete_confirm.jinja +++ b/core/templates/core/file_delete_confirm.jinja @@ -1,18 +1,18 @@ {% extends "core/file.jinja" %} {% block title %} -{% trans %}Delete confirmation{% endtrans %} + {% trans %}Delete confirmation{% endtrans %} {% endblock %} {% block file %} -
{% trans %}Delete confirmation{% endtrans %}
- - + + {% endblock %} diff --git a/core/templates/core/file_detail.jinja b/core/templates/core/file_detail.jinja index 4d0a2887..b8b5c18b 100644 --- a/core/templates/core/file_detail.jinja +++ b/core/templates/core/file_detail.jinja @@ -2,78 +2,78 @@ {% block file %} --{% if file.is_folder %} - -{% else %} - -{% endif %} -{{ file.get_display_name() }} -
-{% trans %}Owner: {% endtrans %}{{ file.owner.get_display_name() }}
-{% if file.is_folder %} -{% if user.can_edit(file) %} - -{% endif %} - + {% endif %} + -{% else %} -{% trans %}Real name: {% endtrans %}{{ file.file.name.split('/')[-1] }}
-{% trans %}Date: {% endtrans %}{{ file.date|localtime|date(DATETIME_FORMAT) }} - -{{ file.date|localtime|time(DATETIME_FORMAT) }}
-{% trans %}Type: {% endtrans %}{{ file.mime_type }}
-{% trans %}Size: {% endtrans %}{{ file.size }} {% trans %}bytes{% endtrans %}
+ + + {% else %} +{% trans %}Real name: {% endtrans %}{{ file.file.name.split('/')[-1] }}
+{% trans %}Date: {% endtrans %}{{ file.date|localtime|date(DATETIME_FORMAT) }} - + {{ file.date|localtime|time(DATETIME_FORMAT) }}
+{% trans %}Type: {% endtrans %}{{ file.mime_type }}
+{% trans %}Size: {% endtrans %}{{ file.size }} {% trans %}bytes{% endtrans %}
-{% trans %}Download{% endtrans %}
-{% endif %} -{% if not file.home_of and not file.home_of_club and file.parent %} -{% trans %}Delete{% endtrans %}
-{% endif %} -{% if user.is_com_admin %} -{% trans %}Moderate{% endtrans %}
-{% endif %} +{% trans %}Download{% endtrans %}
+ {% endif %} + {% if not file.home_of and not file.home_of_club and file.parent %} +{% trans %}Delete{% endtrans %}
+ {% endif %} + {% if user.is_com_admin %} +{% trans %}Moderate{% endtrans %}
+ {% endif %} {% endblock %} {% block script %} -{{ super() }} - + {{ super() }} + {% endblock %} diff --git a/core/templates/core/file_edit.jinja b/core/templates/core/file_edit.jinja index 38d74695..338fa2b9 100644 --- a/core/templates/core/file_edit.jinja +++ b/core/templates/core/file_edit.jinja @@ -1,12 +1,12 @@ {% extends "core/file.jinja" %} {% block file %} -{% trans obj=object %}Edit {{ obj }}{% endtrans %}
- + {% endblock %} diff --git a/core/templates/core/file_list.jinja b/core/templates/core/file_list.jinja index b8b28261..077a2bf9 100644 --- a/core/templates/core/file_list.jinja +++ b/core/templates/core/file_list.jinja @@ -1,23 +1,23 @@ {% extends "core/file.jinja" %} {% block content %} -{{ super() }} -{% if file_list %} -{% trans %}File list{% endtrans %}
--
- {% for f in file_list %}
-
- - {% if f.is_folder %} - - {% else %} - - {% endif %} - {{ f.name }} - {% endfor %} -
{% trans %}There is no file in this website.{% endtrans %}
-{% endif %} + {{ super() }} + {% if file_list %} +{% trans %}File list{% endtrans %}
+-
+ {% for f in file_list %}
+
- + {% if f.is_folder %} + + {% else %} + + {% endif %} + {{ f.name }} + {% endfor %} +
{% trans %}There is no file in this website.{% endtrans %}
+ {% endif %} {% endblock %} diff --git a/core/templates/core/file_moderation.jinja b/core/templates/core/file_moderation.jinja index ba46d806..f8fd255e 100644 --- a/core/templates/core/file_moderation.jinja +++ b/core/templates/core/file_moderation.jinja @@ -1,28 +1,28 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}File moderation{% endtrans %} + {% trans %}File moderation{% endtrans %} {% endblock %} {% block content %} -{% trans %}File moderation{% endtrans %}
-
+
{% endblock %}
diff --git a/core/templates/core/group_detail.jinja b/core/templates/core/group_detail.jinja
index 3e9dfe45..0c9ebb53 100644
--- a/core/templates/core/group_detail.jinja
+++ b/core/templates/core/group_detail.jinja
@@ -2,38 +2,38 @@
{% from "core/macros.jinja" import select_all_checkbox %}
{% block title %}
- {% trans %}Group detail{% endtrans %}
+ {% trans %}Group detail{% endtrans %}
{% endblock title %}
{% block content %}
- {% trans %}File moderation{% endtrans %}
+
{% for f in files %}
-
+
+
{% endfor %}
-
{% if f.is_folder %}
- Folder
+ Folder
{% else %}
- File
+ File
{% endif %}
+ {% trans %}Delete{% endtrans %}
+
- {{ f.name }}
- {% trans %}Full name: {% endtrans %}{{ f.get_parent_path()+'/'+f.name }}
- {% trans %}Owner: {% endtrans %}{{ f.owner.get_display_name() }}
- {% trans %}Date: {% endtrans %}{{ f.date|date(DATE_FORMAT) }} {{ f.date|time(TIME_FORMAT) }}
+ {{ f.name }}
+ {% trans %}Full name: {% endtrans %}{{ f.get_parent_path()+'/'+f.name }}
+ {% trans %}Owner: {% endtrans %}{{ f.owner.get_display_name() }}
+ {% trans %}Date: {% endtrans %}{{ f.date|date(DATE_FORMAT) }} {{ f.date|time(TIME_FORMAT) }}
{% trans %}Moderate{% endtrans %} - - {% trans %}Delete{% endtrans %}
-{{ object }}
-{% trans %}Back to list{% endtrans %}
- {% if form.users_removed | length <= 0 %} -{% trans %}No user in this group{% endtrans %}
- {% else %} - - {% endif %} +{{ object }}
+{% trans %}Back to list{% endtrans %}
+ {% if form.users_removed | length <= 0 %} +{% trans %}No user in this group{% endtrans %}
+ {% else %} + {% endif %} + {% endblock content %} \ No newline at end of file diff --git a/core/templates/core/group_edit.jinja b/core/templates/core/group_edit.jinja index 44ad2d1c..081cf303 100644 --- a/core/templates/core/group_edit.jinja +++ b/core/templates/core/group_edit.jinja @@ -1,13 +1,13 @@ {% extends "core/base.jinja" %} {% block content %} -{% trans %}Back to list{% endtrans %}
-{% trans %}Edit group{% endtrans %}
- + {% endblock %} diff --git a/core/templates/core/group_list.jinja b/core/templates/core/group_list.jinja index e655335d..1cf9cab9 100644 --- a/core/templates/core/group_list.jinja +++ b/core/templates/core/group_list.jinja @@ -1,31 +1,31 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Group list{% endtrans %} + {% trans %}Group list{% endtrans %} {% endblock %} {% block content %} -{% trans %}Group list{% endtrans %}
-{% trans %}New group{% endtrans %}
-| {% trans %}ID{% endtrans %} | -{% trans %}Group{% endtrans %} | -{% trans %}Description{% endtrans %} | -||
| {{ group.id }} | -{{ group }} | -{{ group.description }} | -{% trans %}Edit{% endtrans %} | -{% trans %}Delete{% endtrans %} | -
{% trans %}Group list{% endtrans %}
+{% trans %}New group{% endtrans %}
+| {% trans %}ID{% endtrans %} | +{% trans %}Group{% endtrans %} | +{% trans %}Description{% endtrans %} | +||
| {{ group.id }} | +{{ group }} | +{{ group.description }} | +{% trans %}Edit{% endtrans %} | +{% trans %}Delete{% endtrans %} | +
{% trans %}Login{% endtrans %}
+{% trans %}Login{% endtrans %}
- {% if next %} - {% if user.is_authenticated %} -{% trans %}Your account doesn't have access to this page. To proceed, + {% if next %} + {% if user.is_authenticated %} +
{% trans %}Your account doesn't have access to this page. To proceed, please login with an account that has access.{% endtrans %}
- {% else %} -{% trans %}Please login or create an account to see this page.{% endtrans %}
- {% endif %} + {% else %} +{% trans %}Please login or create an account to see this page.{% endtrans %}
+ {% endif %} + {% endif %} + + ++ {% trans %}Lost password?{% endtrans %} + + {% trans %}Create account{% endtrans %} +
+ {% endblock %} diff --git a/core/templates/core/macros.jinja b/core/templates/core/macros.jinja index 02a3ceae..2344de37 100644 --- a/core/templates/core/macros.jinja +++ b/core/templates/core/macros.jinja @@ -1,155 +1,155 @@ {% macro user_profile_link(user) -%} -{{ user.get_display_name() }} + {{ user.get_display_name() }} {%- endmacro %} {% macro user_profile_link_short_name(user) -%} -{{ user.get_short_name() }} + {{ user.get_short_name() }} {%- endmacro %} {% macro user_link_with_pict(user) -%} - + {{ user.get_mini_item()|safe }} - + {%- endmacro %} {% macro link_news_logo(news) -%} - {% if news.club.logo -%} - {{ news.club.logo.url }} - {% else -%} - {{ static("com/img/news.png") }} - {% endif %} + {% if news.club.logo -%} + {{ news.club.logo.url }} + {% else -%} + {{ static("com/img/news.png") }} + {% endif %} {%- endmacro %} {% macro gen_news_metatags(news) -%} - - - - - - - - + + + + + + + + {%- endmacro %} {% macro facebook_share(news) -%} -{% trans %}Share on Facebook{% endtrans %} + {% trans %}Share on Facebook{% endtrans %} {%- endmacro %} {% macro tweet(news) -%} -{% trans %}Tweet{% endtrans %} + {% trans %}Tweet{% endtrans %} {%- endmacro %} {% macro fb_quick(news) -%} - + {%- endmacro %} {% macro tweet_quick(news) -%} - + {%- endmacro %} {% macro user_mini_profile(user) %} -
+
+
{%- endmacro %}
{% macro user_subscription(user) %}
- {% trans subscription_end=user.subscriptions.order_by('subscription_end').last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}
-
-
- {% if user.promo %}
- {{ user.get_full_name() }}
- {% if user.nick_name %}
- « {{ user.nick_name }} »
- {% endif %}
- {% if user.pronouns %}
- {{ user.pronouns }}
- {% endif %}
- {% if user.date_of_birth %}
-
- {{ user.date_of_birth|date("d/m/Y") }} ({{ user.get_age() }})
-
- {% endif %}
-
-  }} "Promo {{ user.promo }}")
-
+
-
+
+ {% if user.promo %}
+ {{ user.get_full_name() }}
+ {% if user.nick_name %}
+ « {{ user.nick_name }} »
{% endif %}
+ {% if user.pronouns %}
+ {{ user.pronouns }}
+ {% endif %}
+ {% if user.date_of_birth %}
+
+ {{ user.date_of_birth|date("d/m/Y") }} ({{ user.get_age() }})
+
+ {% endif %}
+
+
+
+ {% endif %}
+
- {% if user.profile_pict %}
+ {% if user.profile_pict %}
 }})
- {% else %}
+ {% else %}
 }} "{% trans %}Profile{% endtrans %}")
- {% endif %}
+ title="{% trans %}Profile{% endtrans %}" />
+ {% endif %}
-
- {% endif %}
+ title="{% trans %}Profile{% endtrans %}" />
+ {% endif %}
- {% trans %}Account number: {% endtrans %}{{ user.customer.account_id }}
+ {% trans subscription_end=user.subscriptions.order_by('subscription_end').last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}
+ {% trans %}Account number: {% endtrans %}{{ user.customer.account_id }}
{%- endmacro %} {% macro show_slots(user) %} - {% if user.slots.filter(start_date__gte=timezone.now()).exists() %} -
{% trans %}Slot{% endtrans %}
--
- {% for i in user.slots.filter(start_date__gte=timezone.now().replace(tzinfo=None)).all() %}
-
- {{ i.get_type_display() }} - {{i.machine.launderette }}, {{ i.start_date|date("l j") }} : - {{ i.start_date|time(DATETIME_FORMAT) }} | - {% trans %}Delete{% endtrans %} - {% endfor %} -
{% trans %}Slot{% endtrans %}
+-
+ {% for i in user.slots.filter(start_date__gte=timezone.now().replace(tzinfo=None)).all() %}
+
- {{ i.get_type_display() }} - {{i.machine.launderette }}, {{ i.start_date|date("l j") }} : + {{ i.start_date|time(DATETIME_FORMAT) }} | + {% trans %}Delete{% endtrans %} + {% endfor %} +
{% trans %}Tokens{% endtrans %}
--
- {% for i in user.tokens.all() %}
-
- {{ i }} - {% endfor %} -
{% trans %}Tokens{% endtrans %}
+-
+ {% for i in user.tokens.all() %}
+
- {{ i }} + {% endfor %} +
{% trans page_name=page.name %}You're seeing the history of page "{{ page_name }}"{% endtrans %}
--
+
- {% trans %}last{% endtrans %} - - {{ user_profile_link(page.revisions.last().author) }} - - {{ page.revisions.last().date|localtime|date(DATETIME_FORMAT) }} {{ page.revisions.last().date|localtime|time(DATETIME_FORMAT) }} - {% else %} + {{ user_profile_link(page.revisions.last().author) }} - + {{ page.revisions.last().date|localtime|date(DATETIME_FORMAT) }} {{ page.revisions.last().date|localtime|time(DATETIME_FORMAT) }} + {% else %}
- {{ r.revision }} - - {{ user_profile_link(r.author) }} - - {{ r.date|localtime|date(DATETIME_FORMAT) }} {{ r.date|localtime|time(DATETIME_FORMAT) }} - {% endif %} + {{ user_profile_link(r.author) }} - + {{ r.date|localtime|date(DATETIME_FORMAT) }} {{ r.date|localtime|time(DATETIME_FORMAT) }} + {% endif %} {% endfor %} -
{% trans page_name=page.name %}You're seeing the history of page "{{ page_name }}"{% endtrans %}
+-
{% for r in (page.revisions.all()|sort(attribute='date', reverse=True)) %}
- {% if loop.index < 2 %}
+ {% if loop.index < 2 %}
{% trans %}Edit page{% endtrans %}
- + {% endmacro %} diff --git a/core/templates/core/markdown_textarea.jinja b/core/templates/core/markdown_textarea.jinja deleted file mode 100644 index 9f94c4d3..00000000 --- a/core/templates/core/markdown_textarea.jinja +++ /dev/null @@ -1,198 +0,0 @@ -
- {# Depends on this package https://github.com/lonaru/easy-markdown-editor #}
-
-
- {# The easymde script can be included twice, it's safe in the code #}
-
-
-
diff --git a/core/templates/core/new_user_email.jinja b/core/templates/core/new_user_email.jinja
index e23c6b16..6dff5b3c 100644
--- a/core/templates/core/new_user_email.jinja
+++ b/core/templates/core/new_user_email.jinja
@@ -1,17 +1,17 @@
{% autoescape off %}
-{% trans %}You're receiving this email because you subscribed to the UTBM student association.{% endtrans %}
+ {% trans %}You're receiving this email because you subscribed to the UTBM student association.{% endtrans %}
-{% trans %}Please go to the following page and choose a new password:{% endtrans %}
-{% block reset_link %}
-{{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }}
-{% endblock %}
-{% trans %}Your username, in case it was not given to you: {% endtrans %} {{ user.get_username() }}
-{% trans %}You also got a new account that will be useful to purchase products in the living areas and on the Eboutic.{% endtrans %}
-{% trans account=user.customer.account_id %}Here is your account number: {{ account }}{% endtrans %}
+ {% trans %}Please go to the following page and choose a new password:{% endtrans %}
+ {% block reset_link %}
+ {{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }}
+ {% endblock %}
+ {% trans %}Your username, in case it was not given to you: {% endtrans %} {{ user.get_username() }}
+ {% trans %}You also got a new account that will be useful to purchase products in the living areas and on the Eboutic.{% endtrans %}
+ {% trans account=user.customer.account_id %}Here is your account number: {{ account }}{% endtrans %}
-{% trans %}Thanks for subscribing! {% endtrans %}
+ {% trans %}Thanks for subscribing! {% endtrans %}
-{% trans %}The AE team{% endtrans %}
+ {% trans %}The AE team{% endtrans %}
{% endautoescape %}
diff --git a/core/templates/core/new_user_email_subject.jinja b/core/templates/core/new_user_email_subject.jinja
index 103149c4..f992d0a7 100644
--- a/core/templates/core/new_user_email_subject.jinja
+++ b/core/templates/core/new_user_email_subject.jinja
@@ -1,3 +1,3 @@
{% autoescape off %}
-{% trans %}New subscription to the UTBM student association{% endtrans %}
+ {% trans %}New subscription to the UTBM student association{% endtrans %}
{% endautoescape %}
diff --git a/core/templates/core/notification_list.jinja b/core/templates/core/notification_list.jinja
index 412d79f4..3b8f2a6b 100644
--- a/core/templates/core/notification_list.jinja
+++ b/core/templates/core/notification_list.jinja
@@ -1,24 +1,24 @@
{% extends "core/base.jinja" %}
{% block title %}
-{% trans %}Notification list{% endtrans %}
+ {% trans %}Notification list{% endtrans %}
{% endblock %}
{% block content %}
-{% trans %}Notification list{% endtrans %}
--
-{% for n in notification_list %}
- {% if n.viewed %}
-
- - {% else %} -
-
- {% endif %}
-
+
{% trans %}Notification list{% endtrans %}
+-
+ {% for n in notification_list %}
+ {% if n.viewed %}
+
- + {% else %} +
-
+ {% endif %}
+
{{ n.date|localtime|date(DATE_FORMAT) }} {{
- n.date|localtime|time(DATETIME_FORMAT) }}
+ n.date|localtime|time(DATETIME_FORMAT) }}
{{ n }} -
-{% endfor %}
-
+ {% endfor %}
+
-{% if page %} -{% block page %} -{% endblock %} -{% else %} -
{% trans %}Page does not exist{% endtrans %}
-- {% trans %}Create it?{% endtrans %}
-{% endif %} + {% if page %} + {% block page %} + {% endblock %} + {% else %} +{% trans %}Page does not exist{% endtrans %}
++ {% trans %}Create it?{% endtrans %}
+ {% endif %} {% endblock %} diff --git a/core/templates/core/page_detail.jinja b/core/templates/core/page_detail.jinja index afa5d3ca..054ee612 100644 --- a/core/templates/core/page_detail.jinja +++ b/core/templates/core/page_detail.jinja @@ -1,16 +1,16 @@ {% extends "core/page.jinja" %} {% block page %} -{% if rev %} -{% trans rev_id=rev.revision %}This may not be the last update, you are seeing revision {{ rev_id }}!{% endtrans %}
-{{ rev.title }}
-{{ rev.content|markdown }}
-{% else %}
-{% if page.revisions.last() %}
-{{ page.revisions.last().title }}
-{{ page.revisions.last().content|markdown }}
-{% endif %}
-{% endif %}
+ {% if rev %}
+ {% trans rev_id=rev.revision %}This may not be the last update, you are seeing revision {{ rev_id }}!{% endtrans %}
+{{ rev.title }}
+{{ rev.content|markdown }}
+ {% else %}
+ {% if page.revisions.last() %}
+ {{ page.revisions.last().title }}
+{{ page.revisions.last().content|markdown }}
+ {% endif %}
+ {% endif %}
{% endblock %}
diff --git a/core/templates/core/page_hist.jinja b/core/templates/core/page_hist.jinja
index 6f363f7b..4aac13b1 100644
--- a/core/templates/core/page_hist.jinja
+++ b/core/templates/core/page_hist.jinja
@@ -3,8 +3,8 @@
{% from "core/macros_pages.jinja" import page_history %}
{% block page %}
- {% trans %}Page history{% endtrans %}
-{{ page_history(page) }} +{% trans %}Page history{% endtrans %}
+ {{ page_history(page) }} {% endblock %} diff --git a/core/templates/core/page_list.jinja b/core/templates/core/page_list.jinja index 39e9b69f..dfb8ea48 100644 --- a/core/templates/core/page_list.jinja +++ b/core/templates/core/page_list.jinja @@ -1,20 +1,20 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Page list{% endtrans %} + {% trans %}Page list{% endtrans %} {% endblock %} {% block content %} -{% if page_list %} -{% trans %}Page list{% endtrans %}
--
- {% for p in page_list %}
-
- {{ p.get_display_name() }} - {% endfor %} -
{% trans %}Page list{% endtrans %}
+-
+ {% for p in page_list %}
+
- {{ p.get_display_name() }} + {% endfor %} +
{% trans %}Page properties{% endtrans %}
- -{% if page %} -{% trans %}Delete{% endtrans %} -{% endif %} + + {% if page %} + {% trans %}Delete{% endtrans %} + {% endif %} {% endblock %} diff --git a/core/templates/core/pagerev_edit.jinja b/core/templates/core/pagerev_edit.jinja index 9e188d4f..2d1bb6a0 100644 --- a/core/templates/core/pagerev_edit.jinja +++ b/core/templates/core/pagerev_edit.jinja @@ -2,7 +2,7 @@ {% from 'core/macros_pages.jinja' import page_edit_form %} {% block page %} -{{ page_edit_form(page, form, url('core:page_edit', page_name=page.get_full_name()), csrf_token) }} + {{ page_edit_form(page, form, url('core:page_edit', page_name=page.get_full_name()), csrf_token) }} {% endblock %} diff --git a/core/templates/core/password_change.jinja b/core/templates/core/password_change.jinja index a81baf55..7cd27b1e 100644 --- a/core/templates/core/password_change.jinja +++ b/core/templates/core/password_change.jinja @@ -2,12 +2,12 @@ {% block content %} -{% if target %} + {% if target %}{% trans user=target.get_display_name() %}Change password for {{ user }}{% endtrans %}
-{% endif %} - + {% endif %} + {% endblock %} diff --git a/core/templates/core/password_change_done.jinja b/core/templates/core/password_change_done.jinja index fbb570da..86ce1407 100644 --- a/core/templates/core/password_change_done.jinja +++ b/core/templates/core/password_change_done.jinja @@ -1,6 +1,6 @@ {% extends "core/base.jinja" %} {% block content %} -{% trans %}You successfully changed your password!{% endtrans %}
+{% trans %}You successfully changed your password!{% endtrans %}
{% endblock %} diff --git a/core/templates/core/password_reset.jinja b/core/templates/core/password_reset.jinja index b0a63fc3..3f141d71 100644 --- a/core/templates/core/password_reset.jinja +++ b/core/templates/core/password_reset.jinja @@ -1,10 +1,10 @@ {% extends "core/base.jinja" %} {% block content %} - + {% endblock %} diff --git a/core/templates/core/password_reset_complete.jinja b/core/templates/core/password_reset_complete.jinja index fdd79b48..30898d71 100644 --- a/core/templates/core/password_reset_complete.jinja +++ b/core/templates/core/password_reset_complete.jinja @@ -1,8 +1,8 @@ {% extends "core/base.jinja" %} {% block content %} -{% trans %}You successfully reset your password!{% endtrans %}
-{% trans %}Login{% endtrans %} +{% trans %}You successfully reset your password!{% endtrans %}
+ {% trans %}Login{% endtrans %} {% endblock %} diff --git a/core/templates/core/password_reset_confirm.jinja b/core/templates/core/password_reset_confirm.jinja index e90c9f36..fe172f1f 100644 --- a/core/templates/core/password_reset_confirm.jinja +++ b/core/templates/core/password_reset_confirm.jinja @@ -1,14 +1,14 @@ {% extends "core/base.jinja" %} {% block content %} -{% if form %} - -{% else %} -{% trans %}It seems that this link has expired. To generate a new link, you can follow this link: {% endtrans %}{% trans %}lost password{% endtrans %}. -{% endif %} + {% if form %} + + {% else %} + {% trans %}It seems that this link has expired. To generate a new link, you can follow this link: {% endtrans %}{% trans %}lost password{% endtrans %}. + {% endif %} {% endblock %} diff --git a/core/templates/core/password_reset_done.jinja b/core/templates/core/password_reset_done.jinja index 2f56cac1..f2743e8a 100644 --- a/core/templates/core/password_reset_done.jinja +++ b/core/templates/core/password_reset_done.jinja @@ -1,15 +1,15 @@ {% extends "core/base.jinja" %} {% block content %} -{% trans %}Password reset sent{% endtrans %}
+{% trans %}Password reset sent{% endtrans %}
--{% trans %}We've emailed you instructions for setting your password, if an account exists with the email you entered. You should -receive them shortly.{% endtrans %} -
++ {% trans %}We've emailed you instructions for setting your password, if an account exists with the email you entered. You should + receive them shortly.{% endtrans %} +
--{% trans %}If you don't receive an email, please make sure you've entered the address you registered with, and check your spam -folder.{% endtrans %} -
++ {% trans %}If you don't receive an email, please make sure you've entered the address you registered with, and check your spam + folder.{% endtrans %} +
{% endblock %} diff --git a/core/templates/core/password_reset_email.jinja b/core/templates/core/password_reset_email.jinja index 65532865..6e0f6f63 100644 --- a/core/templates/core/password_reset_email.jinja +++ b/core/templates/core/password_reset_email.jinja @@ -1,15 +1,15 @@ {% autoescape off %} -{% trans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endtrans %} + {% trans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endtrans %} -{% trans %}Please go to the following page and choose a new password:{% endtrans %} -{% block reset_link %} -{{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }} -{% endblock %} -{% trans %}Your username, in case you've forgotten: {% endtrans %} {{ user.get_username() }} + {% trans %}Please go to the following page and choose a new password:{% endtrans %} + {% block reset_link %} + {{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }} + {% endblock %} + {% trans %}Your username, in case you've forgotten: {% endtrans %} {{ user.get_username() }} -{% trans %}Thanks for using our site! {% endtrans %} + {% trans %}Thanks for using our site! {% endtrans %} -{% trans %}The {{ site_name }} team{% endtrans %} + {% trans %}The {{ site_name }} team{% endtrans %} {% endautoescape %} diff --git a/core/templates/core/poster_list.jinja b/core/templates/core/poster_list.jinja index 816c8332..fe65658c 100644 --- a/core/templates/core/poster_list.jinja +++ b/core/templates/core/poster_list.jinja @@ -1,53 +1,53 @@ {% extends "core/base.jinja" %} {% block script %} -{{ super() }} - + {{ super() }} + {% endblock %} {% block title %} -{% trans %}Poster{% endtrans %} + {% trans %}Poster{% endtrans %} {% endblock %} {% block content %} -
+
+
{% endblock %}
diff --git a/core/templates/core/register.jinja b/core/templates/core/register.jinja
index c80d2f98..2ad7d4c1 100644
--- a/core/templates/core/register.jinja
+++ b/core/templates/core/register.jinja
@@ -1,7 +1,7 @@
{% extends "core/base.jinja" %}
{%- block additional_css -%}
-
+
{%- endblock -%}
{% block title %}{% trans %}Register{% endtrans %}{% endblock %}
@@ -13,13 +13,12 @@
{% endblock %}
{% block content %}
-
-
{% trans %}Posters{% endtrans %}
-
- {% trans %}Create{% endtrans %}
- {% if app == "com" %}
- {% trans %}Moderation{% endtrans %}
- {% endif %}
-
+ {% trans %}Posters{% endtrans %}
+
+ {% trans %}Create{% endtrans %}
+ {% if app == "com" %}
+ {% trans %}Moderation{% endtrans %}
+ {% endif %}
+
- {% if poster_list.count() == 0 %}
-
{% trans %}No posters{% endtrans %}
- {% else %}
+ {% if poster_list.count() == 0 %}
+ {% trans %}No posters{% endtrans %}
+ {% else %}
- {% for poster in poster_list %}
-
- 
-
- {% endfor %}
+ {% for poster in poster_list %}
+ {{ poster.name }}
-
-
- {% trans %}Edit{% endtrans %}
- {{ poster.date_begin | date("d/M/Y H:m") }}
- {{ poster.date_end | date("d/M/Y H:m") }}
-
+
+
+ {% endfor %}
- {% endif %}
+ {% endif %}
{{ poster.name }}
+
+
+ {% trans %}Edit{% endtrans %}
+ {{ poster.date_begin | date("d/M/Y H:m") }}
+ {{ poster.date_end | date("d/M/Y H:m") }}
+
-
{% trans %}Register{% endtrans %}
+{% trans %}Register{% endtrans %}
- + {% endblock %} - \ No newline at end of file diff --git a/core/templates/core/register_confirm_mail.jinja b/core/templates/core/register_confirm_mail.jinja index 9b313035..2bc321b0 100644 --- a/core/templates/core/register_confirm_mail.jinja +++ b/core/templates/core/register_confirm_mail.jinja @@ -1,17 +1,17 @@ {% autoescape off %} -{% trans %}You're receiving this email because you created an account on the AE website.{% endtrans %} + {% trans %}You're receiving this email because you created an account on the AE website.{% endtrans %} -{% trans %}Your username, in case it was not given to you: {% endtrans %} {{ username }} + {% trans %}Your username, in case it was not given to you: {% endtrans %} {{ username }} -{% trans %} -As this is the website of the students of the AE, by the students of the AE, -for the students of the AE, you won't be able to do many things without subscribing to the AE. -To make a contribution, contact a member of the association's board, either directly or by email at ae@utbm.fr. -{% endtrans %} + {% trans %} + As this is the website of the students of the AE, by the students of the AE, + for the students of the AE, you won't be able to do many things without subscribing to the AE. + To make a contribution, contact a member of the association's board, either directly or by email at ae@utbm.fr. + {% endtrans %} -{% trans %}Wishing you a good experience among us! {% endtrans %} + {% trans %}Wishing you a good experience among us! {% endtrans %} -{% trans %}The AE team{% endtrans %} + {% trans %}The AE team{% endtrans %} {% endautoescape %} diff --git a/core/templates/core/screen_slideshow.jinja b/core/templates/core/screen_slideshow.jinja index 4dd63884..9e386fcf 100644 --- a/core/templates/core/screen_slideshow.jinja +++ b/core/templates/core/screen_slideshow.jinja @@ -1,30 +1,30 @@ - +
-
-
+
diff --git a/core/templates/core/search.jinja b/core/templates/core/search.jinja
index bd38874e..f413debb 100644
--- a/core/templates/core/search.jinja
+++ b/core/templates/core/search.jinja
@@ -3,24 +3,24 @@
{% from "core/macros.jinja" import user_link_with_pict %}
{% block title %}
- {% trans %}Search result{% endtrans %}
+ {% trans %}Search result{% endtrans %}
{% endblock %}
{% block content %}
-
+
-
{% for poster in posters %}
-
+
-
-
+
+
+
{% endfor %}
-
+
-
+
{% for poster in posters %}
-
+
{% endfor %}
-
+ {% trans %}Users{% endtrans %}
--
+
- +
- {{ user_link_with_pict(i) }} - + {% endfor %} -
- +
- {{ i }} - + {% endfor %} -
{% trans %}Users{% endtrans %}
+-
{% for i in result.users %}
-
{% trans %}Clubs{% endtrans %}
--
+
{% trans %}Clubs{% endtrans %}
+-
{% for i in result.clubs %}
-
-
{% trans %}Markdown{% endtrans %}
-{{- text_md -}}
--
{% trans %}Render{% endtrans %}
-
-{{ text_md|markdown }}
-
+
+ +
{% trans %}Markdown{% endtrans %}
+{{- text_md -}}
+ +
{% trans %}Render{% endtrans %}
+
+ {{ text_md|markdown }}
+
{% endblock %}
diff --git a/core/templates/core/user_account.jinja b/core/templates/core/user_account.jinja
index 2f9cfb31..c1a8b742 100644
--- a/core/templates/core/user_account.jinja
+++ b/core/templates/core/user_account.jinja
@@ -1,83 +1,83 @@
{% extends "core/base.jinja" %}
{% macro monthly(obj) %}
-
+
-
-
-
+
{% endmacro %}
{% block title %}
-{% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %}
+ {% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %}
{% endblock %}
{% block content %}
-{% if customer %}
-| {% trans %}Year{% endtrans %} | -{% trans %}Month{% endtrans %} | -{% trans %}Total{% endtrans %} | -
| {% trans %}Year{% endtrans %} | +{% trans %}Month{% endtrans %} | +{% trans %}Total{% endtrans %} | +
| {{ dict['date'].year }} | -{{ dict['date']|date("E") }} | -{{ dict['sum'] }} € | -
| {{ dict['date'].year }} | +{{ dict['date']|date("E") }} | +{{ dict['sum'] }} € | +
{% trans %}User account{% endtrans %}
-{% trans %}Amount: {% endtrans %}{{ customer.amount }} €
-
-{% set bought = customer.buyings.exists() %}
-{% set refilled = customer.refillings.exists() %}
-{% if bought or refilled %}
- {% if bought %}
-
-
-
{% endif %}
{% else %}
-
-
-
+
-
-
-
-
+
+
+
+
-
+
-{% if
- profile.mailing_subscriptions.exists()
- and (profile.id == user.id or user.is_root or user.is_com_admin)
-%}
-
{% trans %}Account purchases{% endtrans %}
- {{ monthly(buyings_month) }} - {% endif %} - {% if refilled %} -{% trans %}Reloads{% endtrans %}
- {{ monthly(refilling_month) }} - {% endif %} -{% endif %} - {% if customer.user.invoices.exists() %} -{% trans %}Eboutic invoices{% endtrans %}
+ {% if customer %} +{% trans %}User account{% endtrans %}
+{% trans %}Amount: {% endtrans %}{{ customer.amount }} €
+
+ {% set bought = customer.buyings.exists() %}
+ {% set refilled = customer.refillings.exists() %}
+ {% if bought or refilled %}
+ {% if bought %}
+
-{% else %}
-{% trans %}Account purchases{% endtrans %}
+ {{ monthly(buyings_month) }} + {% endif %} + {% if refilled %} +{% trans %}Reloads{% endtrans %}
+ {{ monthly(refilling_month) }} + {% endif %} + {% endif %} + {% if customer.user.invoices.exists() %} +{% trans %}Eboutic invoices{% endtrans %}
{{ monthly(invoices_month) }} - {% endif %} - {% if etickets %} -{% trans %}Etickets{% endtrans %}
-
-
- {% endif %}
--
- {% for s in etickets %}
-
- {{ s.quantity }} x {{ s.product.eticket }} - {% endfor %} -
{% trans %}Etickets{% endtrans %}
+
+
+ {% endif %}
-
+ {% for s in etickets %}
+
- {{ s.quantity }} x {{ s.product.eticket }} + {% endfor %} +
{% trans %}User has no account{% endtrans %}
-{% endif %} + {% else %} +{% trans %}User has no account{% endtrans %}
+ {% endif %} {% endblock %} {% block script %} -{{ super() }} - + {% endblock %} diff --git a/core/templates/core/user_account_detail.jinja b/core/templates/core/user_account_detail.jinja index ccb35f38..8c9b3c3c 100644 --- a/core/templates/core/user_account_detail.jinja +++ b/core/templates/core/user_account_detail.jinja @@ -1,19 +1,19 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %} + {% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %} {% endblock %} {% block content %} -{% if customer %} -{% trans %}User account{% endtrans %}
-{% trans %}Amount: {% endtrans %}{{ customer.amount }} €
- -{% if customer.buyings.exists() %} -{% trans %}Account purchases{% endtrans %}
-| {% trans %}Date{% endtrans %} | {% trans %}Counter{% endtrans %} | {% trans %}Barman{% endtrans %} | @@ -21,85 +21,85 @@{% trans %}Quantity{% endtrans %} | {% trans %}Total{% endtrans %} | {% trans %}Payment method{% endtrans %} | +||
| {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }} | +{{ i.counter }} | +{{ i.seller.get_display_name() }} | +{{ i.label }} | +{{ i.quantity }} | +{{ i.quantity * i.unit_price }} € | +{{ i.get_payment_method_display() }} | + {% if i.is_owned_by(user) %} +{% trans %}Delete{% endtrans %} | + {% endif %} +
{% trans %}Reloads{% endtrans %}
+| {% trans %}Date{% endtrans %} | +{% trans %}Counter{% endtrans %} | +{% trans %}Barman{% endtrans %} | +{% trans %}Amount{% endtrans %} | +{% trans %}Payment method{% endtrans %} | |
| {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }} | +{{ i.counter }} | +{{ i.operator.get_display_name() }} | +{{ i.amount }} € | +{{ i.get_payment_method_display() }} | + {% if i.is_owned_by(user) %} +{% trans %}Delete{% endtrans %} | + {% endif %} +
{% trans %}Eboutic invoices{% endtrans %}
+| {% trans %}Date{% endtrans %} | +{% trans %}Items{% endtrans %} | +{% trans %}Amount{% endtrans %} | +|||||
| {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }} | -{{ i.counter }} | -{{ i.seller.get_display_name() }} | -{{ i.label }} | -{{ i.quantity }} | -{{ i.quantity * i.unit_price }} € | -{{ i.get_payment_method_display() }} | - {% if i.is_owned_by(user) %} -{% trans %}Delete{% endtrans %} | - {% endif %} -
{% trans %}Reloads{% endtrans %}
-| {% trans %}Date{% endtrans %} | -{% trans %}Counter{% endtrans %} | -{% trans %}Barman{% endtrans %} | -{% trans %}Amount{% endtrans %} | -{% trans %}Payment method{% endtrans %} | -|
| {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }} | -{{ i.counter }} | -{{ i.operator.get_display_name() }} | -{{ i.amount }} € | -{{ i.get_payment_method_display() }} | - {% if i.is_owned_by(user) %} -{% trans %}Delete{% endtrans %} | - {% endif %} -
{% trans %}Eboutic invoices{% endtrans %}
-| {% trans %}Date{% endtrans %} | -{% trans %}Items{% endtrans %} | -{% trans %}Amount{% endtrans %} | -||
| {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }} | -+ | {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }} | +
|
- {{ i.get_total() }} € | -
{% trans %}User has no account{% endtrans %}
+{% trans %}User has no account{% endtrans %}
{% endif %} {% endblock %} diff --git a/core/templates/core/user_clubs.jinja b/core/templates/core/user_clubs.jinja index f6e96b9a..324f8389 100644 --- a/core/templates/core/user_clubs.jinja +++ b/core/templates/core/user_clubs.jinja @@ -1,80 +1,80 @@ {% extends "core/base.jinja" %} {% block title %} - {% trans user_name=profile.get_display_name() %}{{ user_name }}'s club(s){% endtrans %} + {% trans user_name=profile.get_display_name() %}{{ user_name }}'s club(s){% endtrans %} {% endblock %} {% block content %} -{% trans%}Club(s){% endtrans %}
--
{% trans%}Current club(s) :{% endtrans %}
--
| {% trans %}Club{% endtrans %} | -{% trans %}Role{% endtrans %} | -{% trans %}Description{% endtrans %} | -{% trans %}Since{% endtrans %} | -- | - | |||||
| {% trans %}Club{% endtrans %} | +{% trans %}Role{% endtrans %} | +{% trans %}Description{% endtrans %} | +{% trans %}Since{% endtrans %} | ++ | + | |||||
| {{ m.club }} | -{{ settings.SITH_CLUB_ROLES[m.role] }} | -{{ m.description }} | -{{ m.start_date }} | - {% if m.can_be_edited_by(user) %} +{{ m.club }} | +{{ settings.SITH_CLUB_ROLES[m.role] }} | +{{ m.description }} | +{{ m.start_date }} | + {% if m.can_be_edited_by(user) %}{% trans %}Mark as old{% endtrans %} | - {% endif %} - {% if user.is_root %} -{% trans %}Delete{% endtrans %} | - {% endif %} + {% endif %} + {% if user.is_root %} +{% trans %}Delete{% endtrans %} | + {% endif %}
-
{% trans%}Old club(s) :{% endtrans %}
--
+
{% trans%}Old club(s) :{% endtrans %}
++
| {% trans %}Club{% endtrans %} | -{% trans %}Role{% endtrans %} | -{% trans %}Description{% endtrans %} | -{% trans %}From{% endtrans %} | -{% trans %}To{% endtrans %} | +|||||||
| {% trans %}Club{% endtrans %} | +{% trans %}Role{% endtrans %} | +{% trans %}Description{% endtrans %} | +{% trans %}From{% endtrans %} | +{% trans %}To{% endtrans %} | -|||||||
| {{ m.club }} | -{{ settings.SITH_CLUB_ROLES[m.role] }} | -{{ m.description }} | -{{ m.start_date }} | -{{ m.end_date }} | - {% if user.is_root %} -{% trans %}Delete{% endtrans %} | - {% endif %} +{{ m.club }} | +{{ settings.SITH_CLUB_ROLES[m.role] }} | +{{ m.description }} | +{{ m.start_date }} | +{{ m.end_date }} | + {% if user.is_root %} +{% trans %}Delete{% endtrans %} | + {% endif %}
{% trans %}Subscribed mailing lists{% endtrans %}
- {% for sub in profile.mailing_subscriptions.all() %} -{{ sub.mailing.email }} {% trans %}Unsubscribe{% endtrans %}
- {% endfor %} + {% if + profile.mailing_subscriptions.exists() + and (profile.id == user.id or user.is_root or user.is_com_admin) + %} +{% trans %}Subscribed mailing lists{% endtrans %}
+ {% for sub in profile.mailing_subscriptions.all() %} +{{ sub.mailing.email }} {% trans %}Unsubscribe{% endtrans %}
+ {% endfor %} {% endif %} {% endblock %} diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja index b7651b88..9f5824fc 100644 --- a/core/templates/core/user_detail.jinja +++ b/core/templates/core/user_detail.jinja @@ -2,279 +2,279 @@ {% from "core/macros.jinja" import show_slots, show_tokens, user_subscription %} {%- block additional_css -%} - + {%- endblock -%} {% block title %} -{% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %} + {% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %} {% endblock %} {% block additional_js %} - + {% endblock %} {% block content %} -
+
-
-
{{ profile.get_full_name() }}
- {% if profile.nick_name %} -« {{ profile.nick_name }} »
+
+
+
+ {{ profile.get_full_name() }}
+ {% if profile.nick_name %} +« {{ profile.nick_name }} »
+ {% endif %}
+
+
+ {% if profile.quote %}
+
- {% if profile.is_subscribed %} - {% if user == profile or user.is_root or user.is_board_member %} -
- {% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%} -
+
+ {% if profile.is_subscribed %} + {% if user == profile or user.is_root or user.is_board_member %}
+ {{ profile.quote }}
+
+ {% endif %}
+
+
+ {% if profile.pronouns %}
+
-
+ {% trans %}Pronouns: {% endtrans %}
+ {{ profile.pronouns }}
+
+ {% endif %}
+ {% if profile.date_of_birth %}
+
+ {% trans %}Born: {% endtrans %}
+ {{ profile.date_of_birth|date("d/m/Y") }}
+
{% endif %}
-
-
{% if
- user == profile
- or user.memberships.ongoing().exists()
- or user.is_board_member
- or user.is_in_group(name=settings.SITH_BAR_MANAGER_BOARD_GROUP)
+ user == profile
+ or user.memberships.ongoing().exists()
+ or user.is_board_member
+ or user.is_in_group(name=settings.SITH_BAR_MANAGER_BOARD_GROUP)
%}
{# if the user is member of a club, he can view the subscription state #}
-
- {% if profile.quote %}
-
+
-
- {{ profile.quote }}
+ {% if profile.department != "NA" %}
+
+
+ {% if profile.promo %}
+
+ {% trans %}Department: {% endtrans %}
+ {{ profile.department }}{{ profile.semester
+ }}
+
+ {% endif %}
+
+ {% if profile.dpt_option %}
+
+ {% trans %}Option: {% endtrans %}
+ {{ profile.dpt_option }}
+
+ {% endif %}
+
+ {% if profile.phone %}
+
+ {% trans %}Phone: {% endtrans %}
+ {{ profile.phone }}
+
+ {% endif %}
+
+ {% if profile.address %}
+
+ {% trans %}Address: {% endtrans %}
+ {{ profile.address }}
+
+ {% endif %}
+
+ {% if profile.parent_address %}
+
+ {% trans %}Parents address: {% endtrans %}
+ {{ profile.parent_address }}
+
+ {% endif %}
+ +
+ {% trans %}Promo: {% endtrans %}{{ profile.promo }}
+ {% if profile.promo_has_logo() %}
+  }})
+ {% else %}
+
-
+ {% endif %}
+
+ {% else %}
+
+ ¯\_(ツ)_/¯
- {% endif %}
-
-
- {% if profile.pronouns %}
-
-
- {% if profile.promo %}
-
- {% trans %}Pronouns: {% endtrans %}
- {{ profile.pronouns }}
-
- {% endif %}
- {% if profile.date_of_birth %}
-
- {% trans %}Born: {% endtrans %}
- {{ profile.date_of_birth|date("d/m/Y") }}
-
- {% endif %}
-
- {% if profile.department != "NA" %}
-
- {% trans %}Department: {% endtrans %}
- {{ profile.department }}{{ profile.semester
- }}
-
- {% endif %}
-
- {% if profile.dpt_option %}
-
- {% trans %}Option: {% endtrans %}
- {{ profile.dpt_option }}
-
- {% endif %}
-
- {% if profile.phone %}
-
- {% trans %}Phone: {% endtrans %}
- {{ profile.phone }}
-
- {% endif %}
-
- {% if profile.address %}
-
- {% trans %}Address: {% endtrans %}
- {{ profile.address }}
-
- {% endif %}
-
- {% if profile.parent_address %}
-
- {% trans %}Parents address: {% endtrans %}
- {{ profile.parent_address }}
-
- {% endif %}
- -
- {% trans %}Promo: {% endtrans %}{{ profile.promo }}
- {% if profile.promo_has_logo() %}
-
- {% else %}
-
- {% endif %}
+ {% endif %}
- {% else %}
-
- ¯\_(ツ)_/¯
-
- {% endif %}
-
-
+
- {% if profile.profile_pict %}
-  }} "{% trans %}Profile{% endtrans %}")
- {% else %}
-
- {% endif %}
-
-
- {% endif %}
-
- {% if profile.profile_pict %}
-
- {% else %}
-
- {% endif %}
+  }} "{% trans %}Scrub{% endtrans %}")
+ {% else %}
+
+ {% endif %}
+
- {% endif %}
+
+
+ {% if profile.scrub_pict %}
+
+ {% if profile.profile_pict %}
+
+ {% else %}
+
+ {% endif %}
+
+
+ {% endif %}
+
+ {% if profile.profile_pict %}
+
+ {% else %}
+
+ {% endif %}
- {% if profile.avatar_pict %}
-  }} "{% trans %}Avatar{% endtrans %}")
- {% else %}
-
- {% endif %}
+ {% if profile.avatar_pict %}
+
+ {% else %}
+
+ {% endif %}
- {% if profile.scrub_pict %}
-
- {% else %}
-
- {% endif %}
-
-
+ {% endif %}
- {% if profile.avatar_pict %}
-
- {% endif %}
+ {% if profile.avatar_pict %}
+
+ {% endif %}
- {% if profile.scrub_pict %}
-
- {% endif %}
-
+ {% endif %}
+ - {% if profile.is_subscribed %} - {% if user == profile or user.is_root or user.is_board_member %} -
- {{ user_subscription(profile) }}
-
- {% endif %}
- {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
-
- {# Shows tokens bought by the user #}
- {{ show_tokens(profile) }}
- {# Shows slots took by the user #}
- {{ show_slots(profile) }}
-
- {% endif %}
- {% else %}
-
- {% trans %}Not subscribed{% endtrans %}
- {% if user.is_board_member %}
-
- {% trans %}New subscription{% endtrans %}
-
- {% endif %}
- {% endif %}
-
- {% endif %}
- - {% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%} -
-
- {% endif %}
-
-
-
- {% trans %}Subscription history{% endtrans %}
-
-
-
-
-
-
-
-
- | {% trans %}Subscription start{% endtrans %} | -{% trans %}Subscription end{% endtrans %} | -{% trans %}Subscription type{% endtrans %} | -{% trans %}Payment method{% endtrans %} | -
|---|---|---|---|
| {{ sub.subscription_start }} | -{{ sub.subscription_end }} | -{{ sub.subscription_type }} | -{{ sub.get_payment_method_display() }} | -
+
+ {% if profile.is_subscribed %} + {% if user == profile or user.is_root or user.is_board_member %}
- {% if user.is_root or user.is_board_member %}
-
- {% if profile.gifts.exists() %}
- {% set gifts = profile.gifts.order_by("-date")|list %}
-
-
+{% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%} +
+
-
-
+ {% endif %}
+ {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
+
-
- {% trans %}Last given gift :{% endtrans %} {{ gifts[0] }}
-
-
-
-
-
- {% else %}
- {% trans %}No gift given yet{% endtrans %}
- {% endif %}
+ {{ user_subscription(profile) }}
-
- {% for gift in gifts %}
-
- {{ gift }} - - - - - {% endfor %} -
+ {# Shows tokens bought by the user #}
+ {{ show_tokens(profile) }}
+ {# Shows slots took by the user #}
+ {{ show_slots(profile) }}
+
+ {% endif %}
+ {% else %}
+
+ {% trans %}Not subscribed{% endtrans %}
+ {% if user.is_board_member %}
+
+ {% trans %}New subscription{% endtrans %}
+
+ {% endif %}
{% endif %}
+
+{% endif %}
++{% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%} +
+
+{% endif %}
+
+
+
+ {% trans %}Subscription history{% endtrans %}
+
+
+
+
+
+
+
+
+ | {% trans %}Subscription start{% endtrans %} | +{% trans %}Subscription end{% endtrans %} | +{% trans %}Subscription type{% endtrans %} | +{% trans %}Payment method{% endtrans %} | +
|---|---|---|---|
| {{ sub.subscription_start }} | +{{ sub.subscription_end }} | +{{ sub.subscription_type }} | +{{ sub.get_payment_method_display() }} | +
+
+ {% if user.is_root or user.is_board_member %}
+
+ {% if profile.gifts.exists() %}
+ {% set gifts = profile.gifts.order_by("-date")|list %}
+
+
{% endblock %}
{% block script %}
-{{ super() }}
-
+
{% endblock %}
\ No newline at end of file
diff --git a/core/templates/core/user_edit.jinja b/core/templates/core/user_edit.jinja
index 41b9dfb8..39b355f7 100644
--- a/core/templates/core/user_edit.jinja
+++ b/core/templates/core/user_edit.jinja
@@ -1,166 +1,166 @@
{%- extends "core/base.jinja" -%}
{%- block title -%}
-{%- trans -%}Edit user{%- endtrans -%}
+ {%- trans -%}Edit user{%- endtrans -%}
{%- endblock -%}
{%- block additional_css -%}
-
+
{%- endblock -%}
{%- block content -%}
-+
+
+ {% endif %}
+
+ {% trans %}Last given gift :{% endtrans %} {{ gifts[0] }}
+
+
+
+
+
+ {% else %}
+ {% trans %}No gift given yet{% endtrans %}
+ {% endif %}
+ -
+ {% for gift in gifts %}
+
- {{ gift }} + + + + + {% endfor %} +
{% trans %}Report this comment{% endtrans %}
{% trans %}Report this comment{% endtrans %}
{{ comment.publish_date.strftime('%d/%m/%Y') }}
{{ comment.publish_date.strftime('%d/%m/%Y') }}
{{ user_profile_link(comment.author) }}
{{ user_profile_link(comment.author) }}