Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix workout detail page option dropdown

Rolande6f5a2eaafd2
diff --git a/setup.py b/setup.py
index 08b404715..c18522647 100644
--- a/setup.py
+++ b/setup.py
@@ -49,38 +49,7 @@ setup(
'Programming Language :: Python :: 3.8',
],
- # Copy-pasting here the requirement since the git+git:// syntax is not
- # supported here. After the release, django-user-agent will be removed
- # and this can be replaced again with: install_requires=install_requires,
- install_requires=[
- "wheel",
- "bleach>=3.1,<3.2",
- "django-bootstrap-breadcrumbs==0.9.1",
- "django-bower==5.2.0",
- "django-formtools>=2.0,<3.0",
- "django-recaptcha==2.0.6",
- "Django>=3.0,<3.1",
- "django_compressor>=2.4,<2.5",
- "django_extensions>=2.1",
- "django-sortedm2m>=3.0,<3.1",
- "django-storages>=1.7",
- "easy-thumbnails>=2.7,<2.8",
- "icalendar==4.0.3",
- "invoke==0.17",
- "pillow>=6.2,<6.3",
- "python-mimeparse",
- "reportlab==3.5.21",
- "matplotlib>=3.1",
- "requests",
- "setuptools>=18.5",
- "sphinx",
-
- "django-cors-headers>=3.0",
- "django-filter==2.1.0",
- "django-tastypie>=0.14,<.0.15",
- "djangorestframework>=3.11,<3.12",
- "django-user_agents"
- ],
+ nstall_requires=install_requires,
entry_points={
'console_scripts': [
'wger = wger.__main__:main',
diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html
index 549d0a2e8..d28acfa49 100644
--- a/wger/manager/templates/workout/view.html
+++ b/wger/manager/templates/workout/view.html
@@ -213,53 +213,42 @@ an appointment for each training day with the appropriate exercises.{% endblockt
{# Options #}
{# #}
{% block options %}
-<div class="btn-group">
- <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- <span class="{% fa_class 'cog' %}"></span>
- {% trans "Options" %}
- </button>
- <ul class="dropdown-menu">
- <li>
- <a data-toggle="modal" data-target="#download-pdf-popup">
+<div class="btn-group" role="group" >
+ <div class="btn-group" role="group">
+ <button id="btnGroupWorkout" type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <span class="{% fa_class 'cog' %}"></span>
+ {% trans "Options" %}
+ </button>
+ <div class="dropdown-menu" aria-labelledby="btnGroupWorkout">
+ <a class="dropdown-item" data-toggle="modal" data-target="#download-pdf-popup">
<span class="{% fa_class 'download' %}"></span>
{% trans "Download as PDF" %}
</a>
- </li>
- <li>
- <a href="{% url 'manager:log:log' workout.id %}">
- <span class="{% fa_class 'line-chart' %}"></span>
- {% trans "View weight log" %}
- </a>
- </li>
- {% if is_owner %}
- <li>
- <a href="{% url 'manager:workout:edit' workout.id %}" class="wger-modal-dialog">
- <span class="{% fa_class 'pencil-square-o' %}"></span>
- {% trans "Edit workout" %}
+ <a class="dropdown-item" data-toggle="modal" data-target="#download-pdf-popup">
+ <span class="{% fa_class 'download' %}"></span>
+ {% trans "Download as PDF" %}
</a>
- </li>
- {% endif %}
- <li>
- <a data-toggle="modal" data-target="#export-ical-popup">
+ {% if is_owner %}
+ <a href="{% url 'manager:workout:edit' workout.id %}" class="dropdown-item wger-modal-dialog">
+ <span class="{% fa_class 'pencil-square-o' %}"></span>
+ {% trans "Edit workout" %}
+ </a>
+ {% endif %}
+ <a class="dropdown-item" data-toggle="modal" data-target="#export-ical-popup">
<span class="{% fa_class 'calendar' %}"></span>
{% trans "Export calendar file" %}
</a>
- </li>
- <li>
- <a href="{% url 'manager:workout:copy' workout.id %}" class="wger-modal-dialog">
+ <a href="{% url 'manager:workout:copy' workout.id %}" class="dropdown-item wger-modal-dialog">
<span class="{% fa_class 'clone' %}"></span>
{% trans "Make a copy of this workout" %}
</a>
- </li>
- {% if is_owner %}
- <li role="separator" class="divider"></li>
- <li>
- <a href="{% url 'manager:workout:delete' workout.id %}" class="wger-modal-dialog">
- <span class="{% fa_class 'trash' %}"></span>
- {% trans "Delete this workout" %}
- </a>
- </li>
- </ul>
+ {% if is_owner %}
+ <a href="{% url 'manager:workout:delete' workout.id %}" class="dropdown-item wger-modal-dialog">
+ <span class="{% fa_class 'trash' %}"></span>
+ {% trans "Delete this workout" %}
+ </a>
+ {% endif %}
+ </div>
+ </div>
</div>
-{% endif %}
{% endblock %}