Self hosted FLOSS fitness/workout, nutrition and weight tracker
Small refactor of 'render_day'
Roland Geiderd45262b54b8b
diff --git a/wger/manager/templates/day/view.html b/wger/manager/templates/day/view.htmlindex 433c67b7d..52a50036e 100644--- a/wger/manager/templates/day/view.html+++ b/wger/manager/templates/day/view.html@@ -1,4 +1,4 @@{% load i18n %}{% load wger_extras %}-{% render_day day flavour %}\ No newline at end of file+{% render_day day %}\ No newline at end of filediff --git a/wger/manager/templates/mobile/tags/render_day.html b/wger/manager/templates/mobile/tags/render_day.htmlindex 14470a395..33545695f 100644--- a/wger/manager/templates/mobile/tags/render_day.html+++ b/wger/manager/templates/mobile/tags/render_day.html@@ -1,7 +1,7 @@{% load i18n %}{% load staticfiles wger_extras thumbnail %}-{% if not compact %}+{% if not editable %}<div class="modal fade" id="editoptions-day-{{ day.obj.id }}"><div class="modal-dialog"><div class="modal-content">@@ -55,7 +55,7 @@{% endif %}-{% if not compact %}+{% if not editable %}{% for set in day.set_list %}<div class="modal fade" id="editoptions-set-{{ set.obj.id }}"><div class="modal-dialog">@@ -111,7 +111,7 @@{# Day #}{# #}<a href="#editoptions-day-{{ day.obj.id }}" class="list-group-item active" data-toggle="modal">- {% if not compact %}+ {% if not editable %}<span class="glyphicon glyphicon-cog pull-right"></span>{% endif %}@@ -135,7 +135,7 @@class="list-group-item wger-modal-dialog">{% endif %}- {% if not compact %}+ {% if not editable %}<span class="glyphicon glyphicon-cog pull-right"></span>{% endif %}@@ -173,7 +173,7 @@</p>{% endif %}- {% if not compact %}+ {% if not editable %}{% if exercise.comment_list %}<p class="text-muted">{% for comment in exercise.comment_list %}@@ -188,7 +188,7 @@{% endfor %} <!--for exercise in set--></a>{% empty %}- {% if not compact %}+ {% if not editable %}<a href="{% url 'manager:set:add' day.obj.id %}"class="list-group-item list-group-item-success wger-modal-dialog">{% trans "No exercises selected for this day." %}<br>@@ -198,7 +198,7 @@{% endfor %} <!--for set in day-->{% if day.set_list %}- {% if not compact %}+ {% if not editable %}<a href="{% url 'manager:set:add' day.obj.id %}" class="list-group-item list-group-item-success wger-modal-dialog"><span class="glyphicon glyphicon-plus"></span>{% trans "Add exercises to this workout day" %}diff --git a/wger/manager/templates/tags/render_day.html b/wger/manager/templates/tags/render_day.htmlindex ce0fd9048..301ecf2ae 100644--- a/wger/manager/templates/tags/render_day.html+++ b/wger/manager/templates/tags/render_day.html@@ -20,7 +20,7 @@ $(document).ready(function() {<th colspan="2" style="background: none repeat scroll 0% 0% #F5F5F5;">{{ day.days_of_week.text }} – {{ day.obj.description }}- {% if not compact %}+ {% if editable %}<span class="editoptions" style="float: right;"><a href="{% url 'manager:day:delete' day.obj.id %}"title="{% trans 'Delete' %}">@@ -52,7 +52,7 @@ $(document).ready(function() {<td style="width: 15%;border-right-width: 0px;"><h5><strong>{{ forloop.counter }}</strong></h5>- {% if not compact %}+ {% if editable %}<span class="editoptions">{% if day.set_list|length > 1 %}<img src="{% static 'images/icons/move.svg' %}"@@ -115,7 +115,7 @@ $(document).ready(function() {</h4><p>{{exercise.setting_text}}</p>- {% if not compact %}+ {% if editable %}{% if not exercise.setting_list %}<p>{% trans "This exercise has no repetitions." %}<br>@@ -141,7 +141,7 @@ $(document).ready(function() {</td></tr>{% empty %}- {% if not compact %}+ {% if editable %}<tr><td colspan="2"><a href="{% url 'manager:set:add' day.obj.id %}"@@ -153,7 +153,7 @@ $(document).ready(function() {</tr>{% endif %}{% endfor %} <!--for set in day-->- {% if not compact %}+ {% if editable %}<tr><td colspan="2"><a href="{% url 'manager:set:add' day.obj.id %}"diff --git a/wger/manager/templatetags/wger_extras.py b/wger/manager/templatetags/wger_extras.pyindex 1f4bc42f0..0fdaaa0ac 100644--- a/wger/manager/templatetags/wger_extras.py+++ b/wger/manager/templatetags/wger_extras.py@@ -38,14 +38,13 @@ def get_current_settings(exercise, set_id):@register.inclusion_tag('tags/render_day.html')-def render_day(day, flavour, compact=False):+def render_day(day, editable=True):'''Renders a day as it will be displayed in the workout overview'''return {'day': day.canonical_representation,'workout': day.training,- 'flavour': flavour,- 'compact': compact}+ 'editable': editable}@register.inclusion_tag('tags/pagination.html')