Merge branch 'more_front' into 'beta'

More front

See merge request bde/nk20!97

apps/member/templates/member/add_members.html

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

apps/member/templates/member/base.html

@@ -1,6 +1,8 @@
 {% extends "base.html" %}
-{% load static i18n pretty_money %}
+{% comment %}
-{% load render_table from django_tables2 %}
+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 %}

apps/member/templates/member/club_detail.html

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

apps/member/templates/member/club_info.html

@@ -1,8 +1,9 @@
-{% load i18n static pretty_money perms %}
+{% load i18n pretty_money perms %}
-<div class="card bg-light shadow">
+
-    <div class="card-header text-center">
+<div class="card bg-light">
-        <h4> Club {{ club.name }} </h4>
+    <h4 class="card-header text-center">
-    </div>
+        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">
@@ -14,7 +15,9 @@
             <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>
+            <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 %}
 
@@ -61,10 +64,12 @@
     {% 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>
+        <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>
+        <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 %}

apps/member/templates/member/club_members.html

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

apps/member/templates/member/club_picture_update.html

@@ -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" %}

apps/member/templates/member/profile_detail.html

@@ -1,12 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "member/base.html" %}
-
-{% block profile_info %}
-{% include "member/profile_info.html" %}
-{% endblock %}
-
-{% block profile_content %}
-{% include "member/profile_tables.html" %}
-{% endblock %}
 
 {% block extrajavascript %}
 <script>

apps/member/templates/member/profile_info.html

@@ -1,9 +1,9 @@
-{% load i18n static pretty_money perms %}
+{% load i18n pretty_money perms %}
 
-<div class="card bg-light shadow">
+<div class="card bg-light">
-    <div class="card-header text-center" >
+    <h4 class="card-header text-center">
-        <h4> {% trans "Account #" %}  {{ user_object.pk }}</h4>
+        {% trans "Account #" %}{{ user_object.pk }}
-    </div>
+    </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">
@@ -33,7 +33,8 @@
             <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>
@@ -45,20 +46,26 @@
             <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 %}
+        <h4><a href="{% url 'member:user_alias' user_object.pk %}">{% trans 'aliases'|capfirst %}</a></h4>
-        <a class="small" href="{% url 'member:auth_token' %}">{% trans 'Manage auth token' %}</a>
+        {% for alias in user_object.note.alias_set.all %}
-        {% endif %}
+        <span class="badge badge-secondary">{{ alias }}</span>
+        {% endfor %}
     </div>
-    <div class="card-footer text-center">
+    <div class="card-footer">
-        <a class="btn btn-primary btn-sm" href="{% url 'member:user_update_profile' user_object.pk %}">{% trans 'Update Profile' %}</a>
+        <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>
+        <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 %}

apps/member/templates/member/profile_picture_update.html

@@ -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" %}

apps/member/templates/member/profile_update.html

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

apps/note/templates/note/search_transactions.html

@@ -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>

apps/wei/templates/wei/base.html

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

apps/wei/templates/wei/bus_detail.html

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

apps/wei/templates/wei/bus_form.html

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

apps/wei/templates/wei/busteam_detail.html

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

apps/wei/templates/wei/busteam_form.html

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

apps/wei/templates/wei/survey.html

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

apps/wei/templates/wei/survey_closed.html

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

apps/wei/templates/wei/survey_end.html

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

apps/wei/templates/wei/weiclub_detail.html

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

apps/wei/templates/wei/weiclub_form.html

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

apps/wei/templates/wei/weimembership_form.html

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

apps/wei/templates/wei/weimembership_list.html

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

apps/wei/templates/wei/weiregistration_confirm_delete.html

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

apps/wei/templates/wei/weiregistration_form.html

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

apps/wei/templates/wei/weiregistration_list.html

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

note_kfet/templates/400.html

@@ -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>
+<div class="card text-white bg-secondary">
-    {% 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 %}
+    <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 %}

note_kfet/templates/403.html

@@ -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>
+<div class="card text-white bg-secondary">
-    {% blocktrans %}You don't have the right to perform this request.{% endblocktrans %}
+    <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 %}
-        <div>
+        <p>{% trans "Exception message:" %} {{ exception }}</p>
-            {% trans "Exception message:" %} {{ exception }}
-        </div>
         {% endif %}
+    </div>
+</div>
 {% endblock %}

note_kfet/templates/404.html

@@ -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>
+<div class="card text-white bg-secondary">
-    {% blocktrans %}The requested path <code>{{ request_path }}</code> was not found on the server.{% endblocktrans %}
+    <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" %}
-        <div>
+        <p>{% trans "Exception message:" %} {{ exception }}</p>
-            {% trans "Exception message:" %} {{ exception }}
-        </div>
         {% endif %}
+    </div>
+</div>
 {% endblock %}

note_kfet/templates/500.html

@@ -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>
+<div class="card text-white bg-secondary">
-    {% 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 %}
+    <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 %}