Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add new block in base template for options

Roland Geider912124560889
diff --git a/wger/core/templates/base.html b/wger/core/templates/base.html
index 9d5f484e7..28054aa0f 100644
--- a/wger/core/templates/base.html
+++ b/wger/core/templates/base.html
@@ -16,20 +16,32 @@ browsing the site as the user "{{current_user}}", all actions are performed on h
</div>
{% endif %}
-{% if show_shariff %}
- <button type="button"
- class="btn btn-default btn-xs pull-right"
- data-toggle="modal"
- data-target="#shariffModal"
- style="margin-top: 0.5em;">
- <span class="glyphicon glyphicon-retweet"></span>
- {% trans "Share" %}
- </button>
-{% endif %}
<h2 id="page-title" class="page-header">
{% block title %}{% endblock %}
+ <div class="btn-group navbar-right">
+ <div class="btn-group">
+ <button type="button" class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <span class="glyphicon glyphicon-cog"></span> {% trans "Options" %}
+ </button>
+ <ul class="dropdown-menu">
+ {% block options %}
+ {% endblock %}
+ </ul>
+ </div>
+
+ {% if show_shariff %}
+ <button type="button"
+ class="btn btn-default btn-xs"
+ data-toggle="modal"
+ data-target="#shariffModal">
+ <span class="glyphicon glyphicon-retweet"></span>
+ {% trans "Share" %}
+ </button>
+ {% endif %}
+</div>
+
</h2>
<div class="row">
diff --git a/wger/core/templates/tags/render_day.html b/wger/core/templates/tags/render_day.html
index 486b2b72f..1d6a5df1a 100644
--- a/wger/core/templates/tags/render_day.html
+++ b/wger/core/templates/tags/render_day.html
@@ -43,20 +43,20 @@ $(document).ready(function() {
<h5><strong>{{ forloop.counter }}</strong></h5>
{% if editable %}
- <span class="editoptions">
- {% if day.set_list|length > 1 %}
- <span class="fa fa-bars fa-lg fa-fw dragndrop-handle"></span>
- <br>
- {% endif %}
- <a href="{% url 'manager:set:edit' set.obj.id %}"
- title="{% trans 'Edit' %}"
- class="wger-modal-dialog">
- <span class="{% fa_class 'pencil-square-o' %}"></span></a>
- <br>
- <a href="{% url 'manager:set:delete' set.obj.id %}"
- title="{% trans 'Delete' %}">
- <span class="{% fa_class 'trash' %}"></span></a>
- </span>
+ <span class="editoptions">
+ {% if day.set_list|length > 1 %}
+ <span class="{% fa_class 'bars' %} dragndrop-handle"></span>
+ <br>
+ {% endif %}
+ <a href="{% url 'manager:set:edit' set.obj.id %}"
+ title="{% trans 'Edit' %}"
+ class="wger-modal-dialog">
+ <span class="{% fa_class 'pencil-square-o' %}"></span></a>
+ <br>
+ <a href="{% url 'manager:set:delete' set.obj.id %}"
+ title="{% trans 'Delete' %}">
+ <span class="{% fa_class 'trash' %}"></span></a>
+ </span>
{% endif %}
</td>
<td style="border-left-width: 0px;">
diff --git a/wger/core/templatetags/wger_extras.py b/wger/core/templatetags/wger_extras.py
index 39d7d09f8..aa55d7b26 100644
--- a/wger/core/templatetags/wger_extras.py
+++ b/wger/core/templatetags/wger_extras.py
@@ -146,7 +146,7 @@ def auto_link_css(flavour='full', css=''):
@register.simple_tag
-def fa_class(class_name='', size='lg', fixed_width=True):
+def fa_class(class_name='', size='', fixed_width=True):
'''
Helper function to help add font awesome classes to elements
diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html
index 6bed988b8..3f879483b 100644
--- a/wger/manager/templates/workout/view.html
+++ b/wger/manager/templates/workout/view.html
@@ -119,53 +119,6 @@ $(document).ready(function() {
</div>
-<h4>{% trans "Options" %}</h4>
-<p>
- <a data-toggle="modal" data-target="#download-pdf-popup">
- <span class="{% fa_class 'download' %}"></span>
- {% trans "Download as PDF" %}
- </a>
-</p>
-
-<p>
- <a href="{% url 'manager:log:log' workout.id %}">
- <span class="{% fa_class 'line-chart' %}"></span>
- {% trans "View weight log" %}
- </a>
-</p>
-
-{% if is_owner %}
-<p>
-<a href="{% url 'manager:workout:edit' workout.id %}" class="wger-modal-dialog">
- <span class="{% fa_class 'pencil-square-o' %}"></span>
- {% trans "Edit workout" %}
-</a>
-</p>
-{% endif %}
-
-<p>
-<a data-toggle="modal" data-target="#export-ical-popup">
- <span class="{% fa_class 'calendar' %}"></span>
- {% trans "Export calendar file" %}
-</a>
-</p>
-
-<p>
-<a href="{% url 'manager:workout:copy' workout.id %}" class="wger-modal-dialog">
- <span class="{% fa_class 'clone' %}"></span>
- {% trans "Make a copy of this workout" %}
-</a>
-</p>
-
-{% if is_owner %}
-<p>
-<a href="{% url 'manager:workout:delete' workout.id %}" class="wger-modal-dialog">
- <span class="{% fa_class 'trash' %}"></span>
- {% trans "Delete this workout" %}
-</a>
-</p>
-{% endif %}
-
<div class="modal fade" id="export-ical-popup">
<div class="modal-dialog">
<div class="modal-content">
@@ -180,11 +133,6 @@ application for example google calendar, outlook or iCal. This will create
an appointment for each training day with the appropriate exercises.{% endblocktrans %}</p>
<p>
<a href="{% url 'manager:workout:ical' workout.id uid token %}" class="btn btn-block btn-default">
- <img src="{% static 'images/icons/calendar.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Export calendar file' %}"
- title="{% trans 'Export calendar file' %}">
{% trans "Export calendar file" %}
</a>
</p>
@@ -244,11 +192,6 @@ an appointment for each training day with the appropriate exercises.{% endblockt
<p>
<a href="" class="btn btn-block btn-default" id="download-pdf-button">
- <img src="{% static 'images/icons/save.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Download' %}"
- title="{% trans 'Download' %}">
{% trans "Download" %}
</a>
</p>
@@ -257,3 +200,52 @@ an appointment for each training day with the appropriate exercises.{% endblockt
</div>
</div>
{% endblock %}
+
+
+
+{# #}
+{# Options #}
+{# #}
+{% block options %}
+<li>
+ <a 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>
+</li>
+{% endif %}
+<li>
+ <a 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">
+ <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>
+{% endif %}
+{% endblock %}
\ No newline at end of file