ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'more_front' into 'beta' 

More front

See merge request bde/nk20!97
This commit is contained in:
erdnaxe 2020-08-23 14:21:53 +02:00
parent ac0e9b9da2 e14c8734c2
commit bac14521ae
30 changed files with 208 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/member/templates/member/add_members.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "member/base.html" %}
{% load crispy_forms_tags %}
{% load static %}
{% load i18n %}

10
apps/member/templates/member/noteowner_detail.html → apps/member/templates/member/base.html
View File

@ -1,6 +1,8 @@
{% extends "base.html" %}
{% load static i18n pretty_money %}
{% load render_table from django_tables2 %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
{% block contenttitle %}{% endblock %}
{# Use a fluid-width container #}
{% block containertype %}container-fluid{% endblock %}
@ -9,15 +11,15 @@
<div class="row mt-4">
<div class="col-xl-4">
{% block profile_info %}
{% include "member/profile_info.html" %}
{% endblock %}
</div>
<div class="col-xl-8">
{% block profile_content %}
{% include "member/profile_tables.html" %}
{% endblock %}
</div>
</div>
{% block extra_content %}{% endblock %}
{% endblock %}
{% block extrajavascript %}

2
apps/member/templates/member/club_detail.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "member/base.html" %}
{% block profile_info %}
{% include "member/club_info.html" %}

93
apps/member/templates/member/club_info.html
View File

@ -1,11 +1,12 @@
{% load i18n static pretty_money perms %}
<div class="card bg-light shadow">
<div class="card-header text-center">
<h4> Club {{ club.name }} </h4>
</div>
{% load i18n pretty_money perms %}
<div class="card bg-light">
<h4 class="card-header text-center">
Club {{ club.name }}
</h4>
<div class="card-top text-center">
<a href="{% url 'member:club_update_pic' club.pk %}">
<img src="{{ club.note.display_image.url }}" class="img-thumbnail mt-2" >
<a href="{% url 'member:club_update_pic' club.pk %}">
<img src="{{ club.note.display_image.url }}" class="img-thumbnail mt-2">
</a>
</div>
<div class="card-body" id="profile_infos">
@ -14,41 +15,43 @@
<dd class="col-xl-6">{{ club.name }}</dd>
{% if club.parent_club %}
<dt class="col-xl-6"><a href="{% url 'member:club_detail' club.parent_club.pk %}">{% trans 'Club Parent'|capfirst %}</a></dt>
<dd class="col-xl-6"> {{ club.parent_club.name }}</dd>
<dt class="col-xl-6">
<a href="{% url 'member:club_detail' club.parent_club.pk %}">{% trans 'Club Parent'|capfirst %}</a>
</dt>
<dd class="col-xl-6"> {{ club.parent_club.name }}</dd>
{% endif %}
{% if club.require_memberships %}
{% if club.membership_start %}
<dt class="col-xl-6">{% trans 'membership start'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_start }}</dd>
{% endif %}
{% if club.membership_start %}
<dt class="col-xl-6">{% trans 'membership start'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_start }}</dd>
{% endif %}
{% if club.membership_end %}
<dt class="col-xl-6">{% trans 'membership end'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_end }}</dd>
{% endif %}
{% if club.membership_end %}
<dt class="col-xl-6">{% trans 'membership end'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_end }}</dd>
{% endif %}
{% if club.membership_duration %}
<dt class="col-xl-6">{% trans 'membership duration'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_duration }} {% trans "days" %}</dd>
{% endif %}
{% if club.membership_duration %}
<dt class="col-xl-6">{% trans 'membership duration'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_duration }} {% trans "days" %}</dd>
{% endif %}
{% if club.membership_fee_paid == club.membership_fee_unpaid %}
<dt class="col-xl-6">{% trans 'membership fee'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
{% else %}
<dt class="col-xl-6">{% trans 'membership fee (paid students)'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
{% if club.membership_fee_paid == club.membership_fee_unpaid %}
<dt class="col-xl-6">{% trans 'membership fee'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
{% else %}
<dt class="col-xl-6">{% trans 'membership fee (paid students)'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
<dt class="col-xl-6">{% trans 'membership fee (unpaid students)'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_fee_unpaid|pretty_money }}</dd>
{% endif %}
<dt class="col-xl-6">{% trans 'membership fee (unpaid students)'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_fee_unpaid|pretty_money }}</dd>
{% endif %}
{% endif %}
{% if "note.view_note"|has_perm:club.note %}
<dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.note.balance | pretty_money }}</dd>
<dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.note.balance | pretty_money }}</dd>
{% endif %}
<dt class="col-xl-6"><a href="{% url 'member:club_alias' club.pk %}">{% trans 'aliases'|capfirst %}</a></dt>
@ -59,17 +62,19 @@
</dl>
</div>
{% if not club.weiclub %}
<div class="card-footer text-center">
{% if can_add_members %}
<a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_add_member' club_pk=club.pk %}" data-turbolinks="false"> {% trans "Add member" %}</a>
{% endif %}
{% if ".change_"|has_perm:club %}
<a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_update' pk=club.pk %}" data-turbolinks="false"> {% trans "Edit" %}</a>
{% endif %}
{% url 'member:club_detail' club.pk as club_detail_url %}
{%if request.path_info != club_detail_url %}
<a class="btn btn-primary btn-sm my-1" href="{{ club_detail_url }}">{% trans 'View Profile' %}</a>
{% endif %}
</div>
<div class="card-footer text-center">
{% if can_add_members %}
<a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_add_member' club_pk=club.pk %}"
data-turbolinks="false"> {% trans "Add member" %}</a>
{% endif %}
{% if ".change_"|has_perm:club %}
<a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_update' pk=club.pk %}" data-turbolinks="false">
{% trans "Edit" %}</a>
{% endif %}
{% url 'member:club_detail' club.pk as club_detail_url %}
{%if request.path_info != club_detail_url %}
<a class="btn btn-primary btn-sm my-1" href="{{ club_detail_url }}">{% trans 'View Profile' %}</a>
{% endif %}
</div>
{% endif %}
</div>

2
apps/member/templates/member/club_members.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "member/base.html" %}
{% load i18n %}
{% load render_table from django_tables2 %}

1
apps/member/templates/member/club_picture_update.html
View File

@ -1,5 +1,4 @@
{% extends "member/club_detail.html" %}
{% load i18n static pretty_money django_tables2 crispy_forms_tags %}
{% block profile_content%}
{% include "member/picture_update.html" %}

22
apps/member/templates/member/profile_detail.html
View File

@ -1,18 +1,10 @@
{% extends "member/noteowner_detail.html" %}
{% block profile_info %}
{% include "member/profile_info.html" %}
{% endblock %}
{% block profile_content %}
{% include "member/profile_tables.html" %}
{% endblock %}
{% extends "member/base.html" %}
{% block extrajavascript %}
<script>
function refreshHistory() {
$("#history_list").load("{% url 'member:user_detail' pk=user_object.pk %} #history_list");
$("#profile_infos").load("{% url 'member:user_detail' pk=user_object.pk %} #profile_infos");
}
</script>
<script>
function refreshHistory() {
$("#history_list").load("{% url 'member:user_detail' pk=user_object.pk %} #history_list");
$("#profile_infos").load("{% url 'member:user_detail' pk=user_object.pk %} #profile_infos");
}
</script>
{% endblock %}

63
apps/member/templates/member/profile_info.html
View File

@ -1,12 +1,12 @@
{% load i18n static pretty_money perms %}
{% load i18n pretty_money perms %}
<div class="card bg-light shadow">
<div class="card-header text-center" >
<h4> {% trans "Account #" %} {{ user_object.pk }}</h4>
</div>
<div class="card bg-light">
<h4 class="card-header text-center">
{% trans "Account #" %}{{ user_object.pk }}
</h4>
<div class="card-top text-center">
<a href="{% url 'member:user_update_pic' user_object.pk %}">
<img src="{{ user_object.note.display_image.url }}" class="img-thumbnail mt-2" >
<a href="{% url 'member:user_update_pic' user_object.pk %}">
<img src="{{ user_object.note.display_image.url }}" class="img-thumbnail mt-2">
</a>
</div>
<div class="card-body" id="profile_infos">
@ -18,12 +18,12 @@
<dd class="col-xl-6">{{ user_object.username }}</dd>
{% if user_object.pk == user.pk %}
<dt class="col-xl-6">{% trans 'password'|capfirst %}</dt>
<dd class="col-xl-6">
<a class="small" href="{% url 'password_change' %}">
{% trans 'Change password' %}
</a>
</dd>
<dt class="col-xl-6">{% trans 'password'|capfirst %}</dt>
<dd class="col-xl-6">
<a class="small" href="{% url 'password_change' %}">
{% trans 'Change password' %}
</a>
</dd>
{% endif %}
<dt class="col-xl-6">{% trans 'section'|capfirst %}</dt>
@ -33,32 +33,39 @@
<dd class="col-xl-6"><a href="mailto:{{ user_object.email }}">{{ user_object.email }}</a></dd>
<dt class="col-xl-6">{% trans 'phone number'|capfirst %}</dt>
<dd class="col-xl-6"><a href="tel:{{ user_object.profile.phone_number }}">{{ user_object.profile.phone_number }}</a></dd>
<dd class="col-xl-6"><a
href="tel:{{ user_object.profile.phone_number }}">{{ user_object.profile.phone_number }}</a></dd>
<dt class="col-xl-6">{% trans 'address'|capfirst %}</dt>
<dd class="col-xl-6">{{ user_object.profile.address }}</dd>
{% if "note.view_note"|has_perm:user_object.note %}
<dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
<dd class="col-xl-6">{{ user_object.note.balance | pretty_money }}</dd>
<dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
<dd class="col-xl-6">{{ user_object.note.balance | pretty_money }}</dd>
<dt class="col-xl-6">{% trans 'paid'|capfirst %}</dt>
<dd class="col-xl-6">{{ user_object.profile.paid|yesno }}</dd>
<dt class="col-xl-6">{% trans 'paid'|capfirst %}</dt>
<dd class="col-xl-6">{{ user_object.profile.paid|yesno }}</dd>
{% endif %}
<dt class="col-xl-6"> <a href="{% url 'member:user_alias' user_object.pk %}">{% trans 'aliases'|capfirst %}</a></dt>
<dd class="col-xl-6 text-truncate">{{ user_object.note.alias_set.all|join:", " }}</dd>
</dl>
{% if user_object.pk == user_object.pk %}
<a class="small" href="{% url 'member:auth_token' %}">{% trans 'Manage auth token' %}</a>
{% endif %}
<h4><a href="{% url 'member:user_alias' user_object.pk %}">{% trans 'aliases'|capfirst %}</a></h4>
{% for alias in user_object.note.alias_set.all %}
<span class="badge badge-secondary">{{ alias }}</span>
{% endfor %}
</div>
<div class="card-footer text-center">
<a class="btn btn-primary btn-sm" href="{% url 'member:user_update_profile' user_object.pk %}">{% trans 'Update Profile' %}</a>
<div class="card-footer">
<a class="btn btn-sm btn-secondary" href="{% url 'member:user_update_profile' user_object.pk %}">
<i class="fa fa-edit"></i> {% trans 'Update Profile' %}
</a>
{% url 'member:user_detail' user_object.pk as user_profile_url %}
{%if request.path_info != user_profile_url %}
<a class="btn btn-primary btn-sm" href="{{ user_profile_url }}">{% trans 'View Profile' %}</a>
{% if request.path_info != user_profile_url %}
<a class="btn btn-sm btn-primary" href="{{ user_profile_url }}">{% trans 'View Profile' %}</a>
{% endif %}
</div>
</div>
{% if user_object.pk == user_object.pk %}
<a class="small float-right text-decoration-none" href="{% url 'member:auth_token' %}">
{% trans 'Manage auth token' %}
</a>
{% endif %}

1
apps/member/templates/member/profile_picture_update.html
View File

@ -1,5 +1,4 @@
{% extends "member/profile_detail.html" %}
{% load i18n static pretty_money django_tables2 crispy_forms_tags %}
{% block profile_content%}
{% include "member/picture_update.html" %}

24
apps/member/templates/member/profile_update.html
View File

@ -3,14 +3,22 @@
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
{% block contenttitle %}{% endblock %}
{% block content %}
<form method="post">
{% csrf_token %}
{{ form|crispy }}
{{ profile_form|crispy }}
<button class="btn btn-primary" type="submit">
{% trans "Save Changes" %}
</button>
</form>
<div class="card bg-light">
<h3 class="card-header text-center">
{{ title }}
</h3>
<div class="card-body">
<form method="post">
{% csrf_token %}
{{ form | crispy }}
{{ profile_form | crispy }}
<button class="btn btn-primary" type="submit">
{% trans "Save Changes" %}
</button>
</form>
</div>
</div>
{% endblock %}

5
apps/note/templates/note/search_transactions.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "member/base.html" %}
{% load render_table from django_tables2 %}
{% load crispy_forms_tags %}
@ -22,7 +22,8 @@
{% crispy form %}
{% endblock %}
{% block extra_content %}
{% block content %}
{{ block.super }}
<div id="table">
{% render_table table %}
</div>

1
apps/wei/templates/wei/base.html Normal file
View File

@ -0,0 +1 @@
{% extends "member/base.html" %}

2
apps/wei/templates/wei/bus_detail.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% block profile_info %}
{% include "wei/weiclub_info.html" %}

2
apps/wei/templates/wei/bus_form.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% load crispy_forms_tags %}
{% load i18n %}

2
apps/wei/templates/wei/busteam_detail.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% block profile_info %}
{% include "wei/weiclub_info.html" %}

2
apps/wei/templates/wei/busteam_form.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% load crispy_forms_tags %}
{% load i18n %}

2
apps/wei/templates/wei/survey.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}

2
apps/wei/templates/wei/survey_closed.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}

2
apps/wei/templates/wei/survey_end.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}

2
apps/wei/templates/wei/weiclub_detail.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{# Use a fluid-width container #}
{% block containertype %}container-fluid{% endblock %}

2
apps/wei/templates/wei/weiclub_form.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% load crispy_forms_tags %}
{% load i18n %}

2
apps/wei/templates/wei/weimembership_form.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% load crispy_forms_tags %}
{% load i18n %}
{% load pretty_money %}

2
apps/wei/templates/wei/weimembership_list.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% load i18n %}
{% load render_table from django_tables2 %}

2
apps/wei/templates/wei/weiregistration_confirm_delete.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}

2
apps/wei/templates/wei/weiregistration_form.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}

2
apps/wei/templates/wei/weiregistration_list.html
View File

@ -1,4 +1,4 @@
{% extends "member/noteowner_detail.html" %}
{% extends "wei/base.html" %}
{% load i18n %}
{% load render_table from django_tables2 %}

21
note_kfet/templates/400.html
View File

@ -1,8 +1,23 @@
{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
{% load i18n %}
{% block contenttitle %}{% endblock %}
{% block content %}
<h1>{% trans "Bad request" %}</h1>
{% blocktrans %}Sorry, your request was bad. Don't know what could be wrong. An email has been sent to webmasters with the details of the error. You can now drink a coke.{% endblocktrans %}
<div class="card text-white bg-secondary">
<h3 class="card-header text-center">
{% trans "Bad request" %}
</h3>
<div class="card-body">
<p>
{% blocktrans trimmed %}
Sorry, your request was bad. Don't know what could be wrong.
An email has been sent to webmasters with the details of the error.
You can now drink a coke.
{% endblocktrans %}
</p>
</div>
</div>
{% endblock %}

23
note_kfet/templates/403.html
View File

@ -1,13 +1,20 @@
{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
{% load i18n %}
{% block contenttitle %}{% endblock %}
{% block content %}
<h1>{% trans "Permission denied" %}</h1>
{% blocktrans %}You don't have the right to perform this request.{% endblocktrans %}
{% if exception %}
<div>
{% trans "Exception message:" %} {{ exception }}
</div>
{% endif %}
<div class="card text-white bg-secondary">
<h3 class="card-header text-center">
{% trans "Permission denied" %}
</h3>
<div class="card-body">
<p>{% blocktrans %}You don't have the right to perform this request.{% endblocktrans %}</p>
{% if exception %}
<p>{% trans "Exception message:" %} {{ exception }}</p>
{% endif %}
</div>
</div>
{% endblock %}

27
note_kfet/templates/404.html
View File

@ -1,13 +1,24 @@
{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
{% load i18n %}
{% block contenttitle %}{% endblock %}
{% block content %}
<h1>{% trans "Page not found" %}</h1>
{% blocktrans %}The requested path <code>{{ request_path }}</code> was not found on the server.{% endblocktrans %}
{% if exception != "Resolver404" %}
<div>
{% trans "Exception message:" %} {{ exception }}
</div>
{% endif %}
<div class="card text-white bg-secondary">
<h3 class="card-header text-center">
{% trans "Page not found" %}
</h3>
<div class="card-body">
<p>
{% blocktrans trimmed %}
The requested path <code>{{ request_path }}</code> was not found on the server.
{% endblocktrans %}
</p>
{% if exception != "Resolver404" %}
<p>{% trans "Exception message:" %} {{ exception }}</p>
{% endif %}
</div>
</div>
{% endblock %}

21
note_kfet/templates/500.html
View File

@ -1,8 +1,23 @@
{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
{% load i18n %}
{% block contenttitle %}{% endblock %}
{% block content %}
<h1>{% trans "Server error" %}</h1>
{% blocktrans %}Sorry, an error occurred when processing your request. An email has been sent to webmasters with the detail of the error, and this will be fixed soon. You can now drink a beer.{% endblocktrans %}
<div class="card text-white bg-secondary">
<h3 class="card-header text-center">
{% trans "Server error" %}
</h3>
<div class="card-body">
<p>
{% blocktrans trimmed %}
Sorry, an error occurred when processing your request.
An email has been sent to webmasters with the detail of the error,
and this will be fixed soon. You can now drink a beer.
{% endblocktrans %}
</p>
</div>
</div>
{% endblock %}