Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Some work on list groups

Roland Geider1368dace464c
diff --git a/wger/core/templates/base.html b/wger/core/templates/base.html
index 7cdaa1d7e..ffb6b3bb0 100644
--- a/wger/core/templates/base.html
+++ b/wger/core/templates/base.html
@@ -36,7 +36,7 @@
</div>
{% if show_shariff %}
<button type="button"
- class="btn btn-link btn-sm float-right"
+ class="btn btn-link btn-sm float-end"
data-bs-toggle="modal"
data-bs-target="#shariffModal"
title="{% trans 'Share' %}">
diff --git a/wger/core/templates/language/overview.html b/wger/core/templates/language/overview.html
index 18ff75d2c..4eeb973df 100644
--- a/wger/core/templates/language/overview.html
+++ b/wger/core/templates/language/overview.html
@@ -7,8 +7,8 @@
{% block content %}
<div class="list-group">
{% for language in language_list %}
- <a href="{% url 'core:language:view' language.id %}" class="list-group-item">
- <span class="glyphicon glyphicon-chevron-right float-right"></span>
+ <a href="{% url 'core:language:view' language.id %}" class="list-group-item list-group-item-action">
+ <span class="glyphicon glyphicon-chevron-right float-end"></span>
{% with 'images/icons/flag-'|add:language.short_name|add:'.svg' as flagname %}
<img src="{% static flagname %}"
width="18"
diff --git a/wger/core/templates/license/list.html b/wger/core/templates/license/list.html
index 3741261df..1cc0c8847 100644
--- a/wger/core/templates/license/list.html
+++ b/wger/core/templates/license/list.html
@@ -7,9 +7,9 @@
{% block content %}
<ul class="list-group">
{% for license in license_list %}
- <li class="list-group-item ">
- <div class="btn-group float-right">
- <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+ <li class="list-group-item list-group-item-action">
+ <div class="btn-group float-end">
+ <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu" role="menu">
diff --git a/wger/core/templates/misc/license/list.html b/wger/core/templates/misc/license/list.html
index cde6934c4..0840c99ee 100644
--- a/wger/core/templates/misc/license/list.html
+++ b/wger/core/templates/misc/license/list.html
@@ -8,7 +8,7 @@
<ul class="list-group">
{% for license in license_list %}
<li class="list-group-item ">
- <div class="btn-group float-right">
+ <div class="btn-group float-end">
<button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
diff --git a/wger/core/templates/repetition_unit/list.html b/wger/core/templates/repetition_unit/list.html
index 020530a5b..484ceb1df 100644
--- a/wger/core/templates/repetition_unit/list.html
+++ b/wger/core/templates/repetition_unit/list.html
@@ -7,10 +7,10 @@
{% block content %}
<ul class="list-group">
{% for unit in object_list %}
- <li class="list-group-item ">
+ <li class="list-group-item list-group-item-action">
{% if unit.id != 1 and unit.id != 2 %}
- <div class="btn-group float-right">
- <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+ <div class="btn-group float-end">
+ <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/core/templates/rest_framework/api.html b/wger/core/templates/rest_framework/api.html
index a03ec7a7f..9bc9c5010 100644
--- a/wger/core/templates/rest_framework/api.html
+++ b/wger/core/templates/rest_framework/api.html
@@ -33,7 +33,7 @@
{# GET button #}
{# #}
{% if 'GET' in allowed_methods %}
- <form id="get-form" class="float-right">
+ <form id="get-form" class="float-end">
<fieldset>
<div class="btn-group format-selection">
<a class="btn btn-primary js-tooltip" href='{{ request.get_full_path }}' rel="nofollow"
@@ -63,7 +63,7 @@
{# OPTIONS button #}
{# #}
{% if options_form %}
- <form class="float-right" action="{{ request.get_full_path }}" method="POST" style="margin-right: 1em;">
+ <form class="float-end" action="{{ request.get_full_path }}" method="POST" style="margin-right: 1em;">
{% csrf_token %}
<input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="OPTIONS"/>
<button class="btn btn-primary js-tooltip" title="Make an OPTIONS request on the {{ name }} resource">OPTIONS
@@ -75,7 +75,7 @@
{# DELETE button #}
{# #}
{% if delete_form %}
- <form class="float-right" action="{{ request.get_full_path }}" method="POST" style="margin-right: 1em;">
+ <form class="float-end" action="{{ request.get_full_path }}" method="POST" style="margin-right: 1em;">
{% csrf_token %}
<input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="DELETE"/>
<button class="btn btn-danger js-tooltip" title="Make a DELETE request on the {{ name }} resource">DELETE
diff --git a/wger/core/templates/tags/render_day.html b/wger/core/templates/tags/render_day.html
index 37c4e19a8..5b18c0961 100644
--- a/wger/core/templates/tags/render_day.html
+++ b/wger/core/templates/tags/render_day.html
@@ -20,7 +20,7 @@
<tr id="day-{{ day.id }}">
<th colspan="2">
{% if editable %}
- <div class="float-right">
+ <div class="float-end">
<div class="dropdown">
<button class="btn btn-sm dropdown-toggle " type="button"
id="dropdownMenuDay{{ day.id }}" data-bs-toggle="dropdown"
@@ -62,7 +62,7 @@
<span>#{{ forloop.counter }}</span>
{% if editable %}
- <div class="dropdown float-right">
+ <div class="dropdown float-end">
<button class="btn btn-link btn-sm btn-block dropdown-toggle " type="button"
id="dropdownMenuSet{{ set.id }}" data-bs-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 9da63dcab..95d931c1b 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -197,7 +197,7 @@
{% block sidebar %}
{% if perms.gym.manage_gyms or perms.gym.manage_gym %}
-<div class="btn-group float-right">
+<div class="btn-group float-end">
<button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
{% translate "Actions" %} <span class="caret"></span>
</button>
@@ -318,7 +318,7 @@
{# Contract #}
{# #}
{% if perms.gym.add_contract %}
-<div class="btn-group float-right">
+<div class="btn-group float-end">
<button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
{% translate "Actions" %} <span class="caret"></span>
</button>
@@ -357,7 +357,7 @@
{# Admin notes #}
{# #}
{% if perms.gym.add_adminusernote %}
-<div class="btn-group float-right">
+<div class="btn-group float-end">
<button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
{% translate "Actions" %} <span class="caret"></span>
</button>
@@ -393,7 +393,7 @@
{# Documents #}
{# #}
{% if perms.gym.add_userdocument %}
-<div class="btn-group float-right">
+<div class="btn-group float-end">
<button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
{% translate "Actions" %} <span class="caret"></span>
</button>
@@ -438,7 +438,7 @@
{# Gym configuration #}
{# #}
{% if perms.gym.change_gymuserconfig and current_user.gymuserconfig %}
-<div class="btn-group float-right">
+<div class="btn-group float-end">
<button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
{% translate "Actions" %} <span class="caret"></span>
</button>
diff --git a/wger/core/templates/weight_unit/list.html b/wger/core/templates/weight_unit/list.html
index 953a6b86a..55347a618 100644
--- a/wger/core/templates/weight_unit/list.html
+++ b/wger/core/templates/weight_unit/list.html
@@ -7,10 +7,10 @@
{% block content %}
<ul class="list-group">
{% for unit in object_list %}
- <li class="list-group-item ">
+ <li class="list-group-item list-group-item-action">
{% if unit.id != 1 and unit.id != 2 %}
- <div class="btn-group float-right">
- <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+ <div class="btn-group float-end">
+ <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu" role="menu">
diff --git a/wger/exercises/templates/categories/admin-overview.html b/wger/exercises/templates/categories/admin-overview.html
index 9f5af3e2e..e253d8bee 100644
--- a/wger/exercises/templates/categories/admin-overview.html
+++ b/wger/exercises/templates/categories/admin-overview.html
@@ -7,9 +7,9 @@
{% block content %}
<ul class="list-group">
{% for category in exercisecategory_list %}
- <li class="list-group-item ">
- <div class="btn-group float-right">
- <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+ <li class="list-group-item list-group-item-action">
+ <div class="btn-group float-end">
+ <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu dropdown-menu-right" role="menu">
diff --git a/wger/exercises/templates/equipment/admin-overview.html b/wger/exercises/templates/equipment/admin-overview.html
index 73268f1dc..b107b7fb4 100644
--- a/wger/exercises/templates/equipment/admin-overview.html
+++ b/wger/exercises/templates/equipment/admin-overview.html
@@ -7,9 +7,9 @@
{% block content %}
<ul class="list-group">
{% for equipment in equipment_list %}
- <li class="list-group-item ">
- <div class="btn-group float-right">
- <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+ <li class="list-group-item list-group-item-action">
+ <div class="btn-group float-end">
+ <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu dropdown-menu-right" role="menu">
diff --git a/wger/exercises/templates/muscles/admin-overview.html b/wger/exercises/templates/muscles/admin-overview.html
index 9228e5322..b84370747 100644
--- a/wger/exercises/templates/muscles/admin-overview.html
+++ b/wger/exercises/templates/muscles/admin-overview.html
@@ -7,9 +7,9 @@
{% block content %}
<ul class="list-group">
{% for muscle in muscle_list %}
- <li class="list-group-item ">
- <div class="btn-group float-right">
- <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+ <li class="list-group-item list-group-item-action">
+ <div class="btn-group float-end">
+ <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu dropdown-menu-right" role="menu">
diff --git a/wger/gym/templates/admin_notes/list.html b/wger/gym/templates/admin_notes/list.html
index 33eb37696..cd8f86b10 100644
--- a/wger/gym/templates/admin_notes/list.html
+++ b/wger/gym/templates/admin_notes/list.html
@@ -21,7 +21,7 @@
<ul class="list-group">
{% for note in adminusernote_list %}
<li class="list-group-item ">
- <div class="btn-group float-right">
+ <div class="btn-group float-end">
<button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
diff --git a/wger/gym/templates/contract/list.html b/wger/gym/templates/contract/list.html
index 02fcb8044..caeee2299 100644
--- a/wger/gym/templates/contract/list.html
+++ b/wger/gym/templates/contract/list.html
@@ -19,9 +19,9 @@
{% block content %}
<div class="list-group">
{% for contract in contract_list %}
- <li class="list-group-item ">
- <div class="btn-group float-right">
- <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+ <li class="list-group-item list-group-item-action">
+ <div class="btn-group float-end">
+ <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/gym/templates/contract_option/list.html b/wger/gym/templates/contract_option/list.html
index 84132fcea..e916fc5cc 100644
--- a/wger/gym/templates/contract_option/list.html
+++ b/wger/gym/templates/contract_option/list.html
@@ -19,15 +19,16 @@
<ul class="list-group">
{% for option in contractoption_list %}
- <li class="list-group-item ">
- <div class="btn-group float-right">
- <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+ <li class="list-group-item list-group-item-action">
+ <div class="btn-group float-end">
+ <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
{% if perms.gym.change_contracttype %}
<li>
- <a href="{% url 'gym:contract-option:edit' option.pk %}" class="wger-modal-dialog">
+ <a href="{% url 'gym:contract-option:edit' option.pk %}"
+ class="wger-modal-dialog dropdown-item">
{% translate 'Edit' %}
</a>
</li>
@@ -35,7 +36,8 @@
{% if perms.gym.delete_contracttype %}
<li>
- <a href="{% url 'gym:contract-option:delete' option.pk %}" class="wger-modal-dialog">
+ <a href="{% url 'gym:contract-option:delete' option.pk %}"
+ class="wger-modal-dialog dropdown-item">
{% translate 'Delete' %}
</a>
</li>
diff --git a/wger/gym/templates/contract_type/list.html b/wger/gym/templates/contract_type/list.html
index b391bdcf5..c23481e57 100644
--- a/wger/gym/templates/contract_type/list.html
+++ b/wger/gym/templates/contract_type/list.html
@@ -19,15 +19,16 @@
<ul class="list-group">
{% for contract_type in contracttype_list %}
- <li class="list-group-item ">
- <div class="btn-group float-right">
- <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+ <li class="list-group-item list-group-item-action">
+ <div class="btn-group float-end">
+ <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
{% if perms.gym.change_contracttype %}
<li>
- <a href="{% url 'gym:contract_type:edit' contract_type.pk %}" class="wger-modal-dialog">
+ <a href="{% url 'gym:contract_type:edit' contract_type.pk %}"
+ class="wger-modal-dialog dropdown-item">
{% translate 'Edit' %}
</a>
</li>
@@ -36,7 +37,7 @@
{% if perms.gym.delete_contracttype %}
<li>
<a href="{% url 'gym:contract_type:delete' contract_type.pk %}"
- class="wger-modal-dialog">
+ class="wger-modal-dialog dropdown-item">
{% translate 'Delete' %}
</a>
</li>
diff --git a/wger/gym/templates/document/list.html b/wger/gym/templates/document/list.html
index 05aa37b65..6a8ee80a3 100644
--- a/wger/gym/templates/document/list.html
+++ b/wger/gym/templates/document/list.html
@@ -21,7 +21,7 @@
<ul class="list-group">
{% for document in userdocument_list %}
<li class="list-group-item ">
- <div class="btn-group float-right">
+ <div class="btn-group float-end">
<button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
diff --git a/wger/gym/templates/gym/list.html b/wger/gym/templates/gym/list.html
index 1fda996f6..36fad3c14 100644
--- a/wger/gym/templates/gym/list.html
+++ b/wger/gym/templates/gym/list.html
@@ -8,49 +8,52 @@
{% block content %}
-<ul class="list-group">
- {% for gym in gym_list %}
- <li class="list-group-item ">
- <div class="btn-group float-right">
- <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
- <span class="{% fa_class 'cog' %}"></span>
- </button>
- <div class="dropdown-menu dropdown-menu-right" role="menu">
- <a href="{% url 'gym:gym:edit' gym.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>
- <a href="{% url 'gym:gym:delete' gym.id %}" class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a>
- </div>
- </div>
- <a href="{% url 'gym:gym:user-list' gym.pk %}">{{gym}}</a>
- </li>
- {% empty %}
- <li class="list-group-item">
- {% translate "Nothing found" %}
- </li>
- {% endfor %}
-</ul>
+ <ul class="list-group">
+ {% for gym in gym_list %}
+ <li class="list-group-item list-group-item-action">
+ <div class="btn-group float-end">
+ <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+ <span class="{% fa_class 'cog' %}"></span>
+ </button>
+ <div class="dropdown-menu dropdown-menu-right" role="menu">
+ <a href="{% url 'gym:gym:edit' gym.id %}"
+ class="wger-modal-dialog dropdown-item">{% translate 'Edit' %}</a>
+ <a href="{% url 'gym:gym:delete' gym.id %}"
+ class="wger-modal-dialog dropdown-item">{% translate 'Delete' %}</a>
+ </div>
+ </div>
+ <a href="{% url 'gym:gym:user-list' gym.pk %}">{{ gym }}</a>
+ </li>
+ {% empty %}
+ <li class="list-group-item">
+ {% translate "Nothing found" %}
+ </li>
+ {% endfor %}
+ </ul>
{% endblock %}
{% block sidebar %}
-{% if perms.config.change_gymconfig %}
-<div class="btn-group float-right">
- <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
- {% translate "Actions" %} <span class="caret"></span>
- </button>
- <div class="dropdown-menu" role="menu">
- <a href="{% url 'config:gym_config:edit' %}" class="wger-modal-dialog dropdown-item">{% translate "Edit"%}</a>
- </div>
-</div>
-{% endif %}
-<h4>{% translate "Global gym configuration" %}</h4>
-<table class="table">
- <tr>
- <th>{% translate "Default gym" %}</th>
- <td>{{ global_gym_config.default_gym|default:"-/-" }}</td>
- </tr>
-</table>
+ {% if perms.config.change_gymconfig %}
+ <div class="btn-group float-end">
+ <button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
+ {% translate "Actions" %} <span class="caret"></span>
+ </button>
+ <div class="dropdown-menu" role="menu">
+ <a href="{% url 'config:gym_config:edit' %}"
+ class="wger-modal-dialog dropdown-item">{% translate "Edit" %}</a>
+ </div>
+ </div>
+ {% endif %}
+ <h4>{% translate "Global gym configuration" %}</h4>
+ <table class="table">
+ <tr>
+ <th>{% translate "Default gym" %}</th>
+ <td>{{ global_gym_config.default_gym|default:"-/-" }}</td>
+ </tr>
+ </table>
{% endblock %}
@@ -59,9 +62,9 @@
{# Options #}
{# #}
{% block options %}
-{% if perms.gym.add_gym %}
- <a href="{% url 'gym:gym:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
- {% translate "Add new gym" %}
- </a>
-{% endif %}
+ {% if perms.gym.add_gym %}
+ <a href="{% url 'gym:gym:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
+ {% translate "Add new gym" %}
+ </a>
+ {% endif %}
{% endblock %}
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index fb6fcd66d..f1472df5f 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -79,7 +79,7 @@
{# Gym details #}
{# #}
{% if perms.gym.change_gym %}
-<div class="dropdown float-right">
+<div class="dropdown float-end">
<a type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
{% translate "Actions" %} <span class="caret"></span>
</a>
@@ -132,7 +132,7 @@
{# Gym configuration #}
{# #}
{% if perms.gym.change_gymconfig %}
-<div class="dropdown float-right">
+<div class="dropdown float-end">
<a role="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
{% translate "Actions" %} <span class="caret"></span>
</a>
@@ -167,7 +167,7 @@
{# Admin configuration #}
{# #}
{% if user.gymadminconfig and user.userprofile.gym_id == gym.id %}
-<div class="dropdown float-right">
+<div class="dropdown float-end">
<div class="btn-group ">
<a role="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
{% translate "Actions" %} <span class="caret"></span>
@@ -202,7 +202,7 @@
<h4>{% translate "Contracts" %}</h4>
{% endif %}
{% if perms.gym.change_contracttype %}
-<div class="dropdown float-right">
+<div class="dropdown float-end">
<a role="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
{% translate "Actions" %} <span class="caret"></span>
</a>
@@ -235,7 +235,7 @@
{% if perms.gym.change_contractoption %}
-<div class="dropdown float-right">
+<div class="dropdown float-end">
<button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
{% translate "Actions" %} <span class="caret"></span>
</button>
@@ -272,7 +272,7 @@
{# Email lists #}
{# #}
{% if perms.mailer.change_log %}
-<div class="dropdown float-right">
+<div class="dropdown float-end">
<a role="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
{% translate "Actions" %} <span class="caret"></span>
</a>
diff --git a/wger/mailer/templates/mailer/gym/overview.html b/wger/mailer/templates/mailer/gym/overview.html
index 41f7c77e9..079aa17b3 100644
--- a/wger/mailer/templates/mailer/gym/overview.html
+++ b/wger/mailer/templates/mailer/gym/overview.html
@@ -15,22 +15,22 @@
{% block content %}
-<ul class="list-group">
- {% for email in email_list %}
- <li class="list-group-item ">
- <h4 class="list-group-item-heading">
- {{ email.subject }}
- <small>{{ email.date }}</small>
- </h4>
-
- <p class="list-group-item-text" style="white-space: pre-line;">{{ email.body }}</p>
- </li>
- {% empty %}
- <li class="list-group-item">
- {% translate "Nothing found" %}
- </li>
- {% endfor %}
-</ul>
+ <ul class="list-group">
+ {% for email in email_list %}
+ <li class="list-group-item">
+ <h4 class="list-group-item-heading">
+ {{ email.subject }}
+ <small>{{ email.date }}</small>
+ </h4>
+
+ <p class="list-group-item-text" style="white-space: pre-line;">{{ email.body }}</p>
+ </li>
+ {% empty %}
+ <li class="list-group-item">
+ {% translate "Nothing found" %}
+ </li>
+ {% endfor %}
+ </ul>
{% endblock %}
diff --git a/wger/mailer/urls.py b/wger/mailer/urls.py
index 9b4c9fd83..01907dd3a 100644
--- a/wger/mailer/urls.py
+++ b/wger/mailer/urls.py
@@ -22,7 +22,6 @@ from django.urls import path
from wger.mailer.forms import EmailListForm
from wger.mailer.views import gym
-
# sub patterns for email lists
patterns_email = [
path(
@@ -38,5 +37,5 @@ patterns_email = [
]
urlpatterns = [
- path('email', include((patterns_email, 'email'), namespace="email")),
+ path('', include((patterns_email, 'email'), namespace="email")),
]
diff --git a/wger/manager/templates/calendar/day.html b/wger/manager/templates/calendar/day.html
index 643dbc8f3..3eec9011e 100644
--- a/wger/manager/templates/calendar/day.html
+++ b/wger/manager/templates/calendar/day.html
@@ -58,7 +58,7 @@
{% if is_owner %}
<span class="dropdown">
- <div class="float-right">
+ <div class="float-end">
<button type="button" class="btn btn-link dropdown-toggle btn-sm" data-bs-toggle="dropdown">
</button>
<div class="dropdown-menu">
diff --git a/wger/manager/templates/calendar/month.html b/wger/manager/templates/calendar/month.html
index 50c63154c..8dd10c5d6 100644
--- a/wger/manager/templates/calendar/month.html
+++ b/wger/manager/templates/calendar/month.html
@@ -77,7 +77,7 @@ $(document).ready(function() {
{{log.weight}} {% translate log.weight_unit.name %}
{% if is_owner %}
- <div class="dropdown float-right">
+ <div class="dropdown float-end">
<button type="button" class="btn btn-link dropdown-toggle btn-sm" data-bs-toggle="dropdown">
</button>
<div class="dropdown-menu dropdown-menu-right" role="menu">
diff --git a/wger/manager/templates/schedule/overview.html b/wger/manager/templates/schedule/overview.html
index 10bddb9d5..db38c93e5 100644
--- a/wger/manager/templates/schedule/overview.html
+++ b/wger/manager/templates/schedule/overview.html
@@ -11,11 +11,11 @@
{% block content %}
<div class="list-group">
{% for schedule in schedules %}
- <a href="{% url 'manager:schedule:view' schedule.id %}" class="list-group-item">
- <span class="glyphicon glyphicon-chevron-right float-right"></span>
+ <a href="{% url 'manager:schedule:view' schedule.id %}" class="list-group-item list-group-item-action">
+ <span class="glyphicon glyphicon-chevron-right float-end"></span>
{% if schedule.is_active %}
- <span class="badge badge-pill badge-primary float-right">
+ <span class="badge badge-pill badge-primary float-end">
{% translate "active" %}
</span>
{% endif %}
@@ -23,9 +23,9 @@
<p class="list-group-item-heading h5">{{ schedule }}</p>
<p class="list-group-item-text">{{ schedule.start_date }}</p>
</a>
- {% empty %}
- <a href="{% url 'manager:schedule:add' %}" class="list-group-item wger-modal-dialog">
- {% translate "No schedules found." %}<br>{% translate "Add one now." %}
+ {% empty %}
+ <a href="{% url 'manager:schedule:add' %}" class="list-group-item list-group-item-action wger-modal-dialog">
+ {% translate "No schedules found." %}<br>{% translate "Add one now." %}
</a>
{% endfor %}
</div>
@@ -33,16 +33,16 @@
{% block sidebar %}
-<p>{% blocktranslate %}Schedules are collections of workouts that you do in
-succession.{% endblocktranslate %}</p>
+ <p>{% blocktranslate %}Schedules are collections of workouts that you do in
+ succession.{% endblocktranslate %}</p>
-<p>{% blocktranslate %}You can indicate how long you want to do each workout
-before jumping to the next. It is also possible to create a loop, so you
-always do the same workouts in succession, e.g. A > B > C > A > B > C and so on.{% endblocktranslate %}</p>
+ <p>{% blocktranslate %}You can indicate how long you want to do each workout
+ before jumping to the next. It is also possible to create a loop, so you
+ always do the same workouts in succession, e.g. A > B > C > A > B > C and so on.{% endblocktranslate %}</p>
-<p>{% blocktranslate %}The currently active schedule will remain active (and be
-shown e.g. in your dashboard) till it reaches the last workout or till you
-deactivate it, if it is a loop.{% endblocktranslate %}</p>
+ <p>{% blocktranslate %}The currently active schedule will remain active (and be
+ shown e.g. in your dashboard) till it reaches the last workout or till you
+ deactivate it, if it is a loop.{% endblocktranslate %}</p>
{% endblock %}
diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.html
index ba1fd838f..b47063467 100644
--- a/wger/manager/templates/schedule/view.html
+++ b/wger/manager/templates/schedule/view.html
@@ -197,7 +197,7 @@
<a href="{{ step.workout.get_absolute_url }}"
class="btn btn-light btn-block btn-sm"
style="white-space: normal;">
- <span class="glyphicon glyphicon-chevron-right float-right"></span>
+ <span class="glyphicon glyphicon-chevron-right float-end"></span>
{{ step.workout }}
</a>
</div>
diff --git a/wger/manager/templates/workout/overview.html b/wger/manager/templates/workout/overview.html
index 7b3790824..11075aa44 100644
--- a/wger/manager/templates/workout/overview.html
+++ b/wger/manager/templates/workout/overview.html
@@ -8,11 +8,11 @@
{% block content %}
<div class="list-group">
{% for workout in workouts %}
- <a href="{{ workout.get_absolute_url }}" class="list-group-item">
- <span class="glyphicon glyphicon-chevron-right float-right"></span>
+ <a href="{{ workout.get_absolute_url }}" class="list-group-item list-group-item-action">
+ <span class="glyphicon glyphicon-chevron-right float-end"></span>
{% if workout == current_workout %}
- <span class="badge badge-primary float-right">
+ <span class="badge bg-secondary float-end">
<em>{% translate "active" %}</em>
</span>
{% endif %}
@@ -20,12 +20,12 @@
<p class="list-group-item-heading h5">{{ workout }}</p>
<p class="list-group-item-text">{{ workout.creation_date }}</p>
</a>
- {% empty %}
+ {% empty %}
{% if template_overview %}
{% translate "No templates found." %}
{% else %}
- <a href="{% url 'manager:workout:add' %}" class="list-group-item">
- {% translate "No workouts found." %}<br>{% translate "Add one now." %}
+ <a href="{% url 'manager:workout:add' %}" class="list-group-item list-group-item-action">
+ {% translate "No workouts found." %}<br>{% translate "Add one now." %}
</a>
{% endif %}
{% endfor %}
@@ -34,9 +34,9 @@
{% block options %}
-{% if not template_overview %}
-<a href="{% url 'manager:workout:add' %}" class="btn btn-success btn-sm">
- {% translate "Add workout" %}
-</a>
-{% endif %}
+ {% if not template_overview %}
+ <a href="{% url 'manager:workout:add' %}" class="btn btn-success btn-sm">
+ {% translate "Add workout" %}
+ </a>
+ {% endif %}
{% endblock %}
diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html
index 61183c9d0..7b7718227 100644
--- a/wger/manager/templates/workout/view.html
+++ b/wger/manager/templates/workout/view.html
@@ -141,7 +141,7 @@
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">{% translate "Download as PDF" %}</h4>
- <button type="button" class="close float-right" data-bs-dismiss="modal" aria-hidden="true">&times;
+ <button type="button" class="close float-end" data-bs-dismiss="modal" aria-hidden="true">&times;
</button>
</div>
<div class="modal-body">
diff --git a/wger/nutrition/templates/ingredient/view.html b/wger/nutrition/templates/ingredient/view.html
index 31908ae19..e98461ead 100644
--- a/wger/nutrition/templates/ingredient/view.html
+++ b/wger/nutrition/templates/ingredient/view.html
@@ -190,7 +190,7 @@ the search.{% endblocktranslate %}
<tr>
<td>
{{unit.amount}} {{unit.unit.name}} = {{unit.gram}}g
- <div class="dropdown float-right">
+ <div class="dropdown float-end">
<button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
diff --git a/wger/nutrition/templates/plan/overview.html b/wger/nutrition/templates/plan/overview.html
index 6685aa1ba..96c5cb08c 100644
--- a/wger/nutrition/templates/plan/overview.html
+++ b/wger/nutrition/templates/plan/overview.html
@@ -6,24 +6,24 @@
{% block content %}
-<div class="list-group">
- {% for plan in plans %}
- <a href="{{ plan.get_absolute_url }}" class="list-group-item">
- <span class="glyphicon glyphicon-chevron-right float-right"></span>
+ <div class="list-group">
+ {% for plan in plans %}
+ <a href="{{ plan.get_absolute_url }}" class="list-group-item list-group-item-action">
+ <span class="glyphicon glyphicon-chevron-right float-end"></span>
- <p class="list-group-item-heading h5">{{plan}}</p>
- <p class="list-group-item-text">
- {{ plan.creation_date }} –
- {{ plan.get_nutritional_values.total.energy|floatformat }} {% translate "kcal" %}
- </p>
- </a>
- {% empty %}
- <a href="{% url 'nutrition:plan:add' %}" class="list-group-item">
- {% translate "No nutrition plans." %}<br>
- {% translate "Add one now." %}
- </a>
- {% endfor %}
-</div>
+ <p class="list-group-item-heading h5">{{ plan }}</p>
+ <p class="list-group-item-text">
+ {{ plan.creation_date }} –
+ {{ plan.get_nutritional_values.total.energy|floatformat }} {% translate "kcal" %}
+ </p>
+ </a>
+ {% empty %}
+ <a href="{% url 'nutrition:plan:add' %}" class="list-group-item list-group-item-action">
+ {% translate "No nutrition plans." %}<br>
+ {% translate "Add one now." %}
+ </a>
+ {% endfor %}
+ </div>
{% endblock %}
diff --git a/wger/nutrition/templates/plan/view.html b/wger/nutrition/templates/plan/view.html
index ef4a2c76a..540142cb9 100644
--- a/wger/nutrition/templates/plan/view.html
+++ b/wger/nutrition/templates/plan/view.html
@@ -68,7 +68,7 @@
<tr>
<td colspan="6">
{% if is_owner %}
- <div class="dropdown float-right">
+ <div class="dropdown float-end">
<button type="button"
class="btn btn-link btn-block dropdown-toggle btn-xs"
data-bs-toggle="dropdown"></button>
@@ -115,7 +115,7 @@
{{ item.ingredient.name }}
{% if is_owner %}
- <div class="dropdown float-right">
+ <div class="dropdown float-end">
<button type="button"
class="btn btn-link dropdown-toggle btn-xs"
data-bs-toggle="dropdown"></button>
@@ -133,7 +133,7 @@
</a>
</div>
</div>
- <span class="editoptions float-right"></span>
+ <span class="editoptions float-end"></span>
{% endif %}
</td>
<td class="align-right">{{ item.get_nutritional_values.energy|floatformat:1 }}
diff --git a/wger/nutrition/templates/units/list.html b/wger/nutrition/templates/units/list.html
index 98857ecf9..475518856 100644
--- a/wger/nutrition/templates/units/list.html
+++ b/wger/nutrition/templates/units/list.html
@@ -10,7 +10,7 @@
<ul class="list-group">
{% for unit in unit_list %}
<li class="list-group-item ">
- <div class="btn-group float-right">
+ <div class="btn-group float-end">
<button type="button" class="btn btn-light dropdown-toggle btn-sm" data-bs-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
diff --git a/wger/urls.py b/wger/urls.py
index f5a391c60..1d72892c0 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -48,7 +48,6 @@ from wger.nutrition.sitemap import NutritionSitemap
from wger.utils.generic_views import TextTemplateView
from wger.weight.api import views as weight_api_views
-
# admin.autodiscover()
#
@@ -219,7 +218,7 @@ urlpatterns = i18n_patterns(
path('config/', include(('wger.config.urls', 'config'), namespace='config')),
path('gym/', include(('wger.gym.urls', 'gym'), namespace='gym')),
path('gallery/', include(('wger.gallery.urls', 'gallery'), namespace='gallery')),
- path('email', include(('wger.mailer.urls', 'email'), namespace='email')),
+ path('email/', include(('wger.mailer.urls', 'email'), namespace='email')),
path('sitemap.xml', index, {'sitemaps': sitemaps}, name='sitemap'),
path(
'sitemap-<section>.xml',