Self hosted FLOSS fitness/workout, nutrition and weight tracker
Use nested namespaces for manager URLs
Roland Geiderbd30410d5580
diff --git a/wger/core/static/js/workout-manager.js b/wger/core/static/js/workout-manager.jsindex 3e6bb27e8..ca2979fe2 100644--- a/wger/core/static/js/workout-manager.js+++ b/wger/core/static/js/workout-manager.js@@ -398,7 +398,7 @@ function get_exercise_formset(exercise_id) {var set_value = $('#id_sets').val();if (set_value && parseInt(set_value, 10) && exercise_id && parseInt(exercise_id, 10)) {var formset_url = '/' + get_current_language() +- '/workout/get-formset/' + exercise_id ++ '/workout/set/get-formset/' + exercise_id +'/' + set_value + '/';$.get(formset_url, function (data) {@@ -418,7 +418,7 @@ function update_all_exercise_formset() {var exercise_id = value.value;if (exercise_id && parseInt(exercise_id, 10)) {var formset_url = '/' + get_current_language() +- '/workout/get-formset/' + exercise_id ++ '/workout/set/get-formset/' + exercise_id +'/' + set_value + '/';$.get(formset_url, function (data) {$('#formset-exercise-' + exercise_id).remove();diff --git a/wger/core/templates/index.html b/wger/core/templates/index.htmlindex 355240fc0..0e0dc5dab 100644--- a/wger/core/templates/index.html+++ b/wger/core/templates/index.html@@ -24,13 +24,13 @@day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</strong></p>{% for day in current_workout.day_set.all %}- <a href="{% url 'day-log' day.pk %}" class="btn btn-block btn-default">{{day.description}}</a>+ <a href="{% url 'manager:day:log' day.pk %}" class="btn btn-block btn-default">{{day.description}}</a>{% endfor %}{% else %}<p><em>{% trans "No workouts found." %}</em></p><p>- <a href="{% url 'workout-add' %}" class="btn btn-block btn-default">+ <a href="{% url 'manager:workout:add' %}" class="btn btn-block btn-default"><img src="{% static 'images/icons/add.svg' %}"width="22"height="22"@@ -51,7 +51,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str{% if current_workout %}<p>- <a href="{% url 'workout-view' current_workout.id %}">+ <a href="{% url 'manager:workout:view' current_workout.id %}">{% if current_workout.comment %}{{ current_workout.comment }}{% else %}@@ -86,7 +86,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str{% endif %}{% else %} {# no workout #}- <a href="{% url 'workout-add' %}" class="btn btn-block btn-default">+ <a href="{% url 'manager:workout:add' %}" class="btn btn-block btn-default">{% trans "No workouts found." %} {% trans "Add one now." %}</a>{% endif %}@@ -139,7 +139,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str<div class="row"><div class="col-sm-6"><p>- <a href="{% url 'workout-add' %}">+ <a href="{% url 'manager:workout:add' %}"><img src="{% static 'images/icons/new.svg' %}"width="32"height="32"diff --git a/wger/core/templates/mobile/index.html b/wger/core/templates/mobile/index.htmlindex 3b62aec6c..09268ecba 100644--- a/wger/core/templates/mobile/index.html+++ b/wger/core/templates/mobile/index.html@@ -13,7 +13,7 @@<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button><h4 class="modal-title">{% trans "Current workout" %}</h4>{% if current_workout %}- <h5><a href="{% url 'workout-view' current_workout.id %}">{{ current_workout }}</a></h5>+ <h5><a href="{% url 'manager:workout:view' current_workout.id %}">{{ current_workout }}</a></h5>{% endif %}</div><div class="modal-body">@@ -104,7 +104,7 @@ its default duration in your settings.{% endblocktrans %}{% if current_workout %}{% for day in current_workout.canonical_representation.day_list %}{% if day.set_list|length > 0 %}- <a href="{% url 'workout-timer' day.obj.pk %}" class="list-group-item wger-list-group-item">+ <a href="{% url 'manager:workout:timer' day.obj.pk %}" class="list-group-item wger-list-group-item"><span class="glyphicon glyphicon-chevron-right pull-right"></span>{{day.obj.description}}</a>@@ -112,14 +112,14 @@ its default duration in your settings.{% endblocktrans %}<span class="list-group-item">{{day.obj.description}}</span>{% endif %}{% empty %}- <a href="{% url 'day-add' current_workout.id %}" class="list-group-item">+ <a href="{% url 'manager:day:add' current_workout.id %}" class="list-group-item"><span class="glyphicon glyphicon-chevron-right pull-right"></span>{% trans "No days for this workout." %}<br>{% trans "Add training day." %}</a>{% endfor %}{% else %}- <a href="{% url 'workout-add' %}" class="list-group-item">+ <a href="{% url 'manager:workout:add' %}" class="list-group-item"><span class="glyphicon glyphicon-chevron-right pull-right"></span>{% trans "No workouts found." %}<br>{% trans "Add one now." %}@@ -164,7 +164,7 @@ its default duration in your settings.{% endblocktrans %}{{current_workout}}</a>{% else %}- <a href="{% url 'workout-add' %}" class="btn btn-default btn-block">+ <a href="{% url 'manager:workout:add' %}" class="btn btn-default btn-block"><img src="{% static 'images/icons/add.svg' %}"width="32"height="32"@@ -176,7 +176,7 @@ its default duration in your settings.{% endblocktrans %}{% endif %}</div><div class="col-xs-6" style="padding-left: 7px;">- <a href="{% url 'workout-calendar' %}"+ <a href="{% url 'manager:workout:calendar' %}"class="btn btn-default btn-block"style="white-space: normal;"><img src="{% static 'images/icons/calendar.svg' %}"diff --git a/wger/core/templates/mobile/navigation.html b/wger/core/templates/mobile/navigation.htmlindex 876f4fe7c..ec7c7dda4 100644--- a/wger/core/templates/mobile/navigation.html+++ b/wger/core/templates/mobile/navigation.html@@ -22,7 +22,7 @@{# Workout tab #}{# #}<li class="dropdown">- <a href="{% url 'workout-overview' %}"+ <a href="{% url 'manager:workout:overview' %}"rel="nofollow"class="dropdown-toggle"data-toggle="dropdown">@@ -31,9 +31,9 @@{% if active_tab == 'workout' %}</strong>{% endif %}</a><ul class="dropdown-menu">- <li><a href="{% url 'workout-overview' %}" rel="nofollow">{% trans "Workouts" %}</a></li>- <li><a href="{% url 'workout-calendar' %}" rel="nofollow">{% trans "Calendar" %}</a></li>- <li><a href="{% url 'schedule-overview' %}" rel="nofollow">{% trans "Workouts schedules" %}</a></li>+ <li><a href="{% url 'manager:workout:overview' %}" rel="nofollow">{% trans "Workouts" %}</a></li>+ <li><a href="{% url 'manager:workout:calendar' %}" rel="nofollow">{% trans "Calendar" %}</a></li>+ <li><a href="{% url 'manager:schedule:overview' %}" rel="nofollow">{% trans "Workouts schedules" %}</a></li></ul></li>diff --git a/wger/core/templates/mobile/template.html b/wger/core/templates/mobile/template.htmlindex 0eed9e690..e204616f2 100644--- a/wger/core/templates/mobile/template.html+++ b/wger/core/templates/mobile/template.html@@ -154,7 +154,7 @@<a href="{% url 'core:index' %}" {% auto_link_css flavour %}>{% trans "Dashboard" %}</a></div><div class="btn-group">- <a href="{% url 'workout-overview' %}" {% auto_link_css flavour %}>{% trans "Workouts" %}</a>+ <a href="{% url 'manager:workout:overview' %}" {% auto_link_css flavour %}>{% trans "Workouts" %}</a></div><div class="btn-group"><a href="{% url 'nutrition:plan:overview' %}" {% auto_link_css flavour %}>{% trans "Nutrition" %}</a>diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.htmlindex 753accb43..ff4e1825e 100644--- a/wger/core/templates/navigation.html+++ b/wger/core/templates/navigation.html@@ -22,14 +22,14 @@{# Workout tab #}{# #}<li class="dropdown {% if active_tab == 'workout' %}active{% endif %}">- <a href="{% url 'workout-overview' %}"+ <a href="{% url 'manager:workout:overview' %}"rel="nofollow"class="dropdown-toggle"data-toggle="dropdown">{% trans "Workouts" %} <b class="caret"></b></a><ul class="dropdown-menu">- <li><a href="{% url 'workout-overview' %}" rel="nofollow">{% trans "Workouts" %}</a></li>- <li><a href="{% url 'workout-calendar' %}" rel="nofollow">{% trans "Calendar" %}</a></li>- <li><a href="{% url 'schedule-overview' %}" rel="nofollow">{% trans "Workouts schedules" %}</a></li>+ <li><a href="{% url 'manager:workout:overview' %}" rel="nofollow">{% trans "Workouts" %}</a></li>+ <li><a href="{% url 'manager:workout:calendar' %}" rel="nofollow">{% trans "Calendar" %}</a></li>+ <li><a href="{% url 'manager:schedule:overview' %}" rel="nofollow">{% trans "Workouts schedules" %}</a></li></ul></li>diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.htmlindex 771e3f31a..bd7d11ec9 100644--- a/wger/core/templates/user/overview.html+++ b/wger/core/templates/user/overview.html@@ -36,7 +36,7 @@{{workout.workout.creation_date}}</td><td>- <a href="{{trainer_login}}?next={% url 'workout-view' workout.workout.pk %}">{{workout.workout}}</a>+ <a href="{{trainer_login}}?next={% url 'manager:workout:view' workout.workout.pk %}">{{workout.workout}}</a></td><td>{{workout.logs|default:'-/-'}}@@ -54,8 +54,8 @@</table>{% if perms.gym.gym_trainer %}<a href="{{trainer_login}}" class="btn btn-success btn-sm">{% trans "Log in as this user" %}</a>-<a href="{{trainer_login}}?next={% url 'workout-calendar' %}" class="btn btn-default btn-sm">{% trans "Calendar" %}</a>-<a href="{{trainer_login}}?next={% url 'workout-add' %}" class="btn btn-default btn-sm">{% trans "Add workout" %}</a>+<a href="{{trainer_login}}?next={% url 'manager:workout:calendar' %}" class="btn btn-default btn-sm">{% trans "Calendar" %}</a>+<a href="{{trainer_login}}?next={% url 'manager:workout:add' %}" class="btn btn-default btn-sm">{% trans "Add workout" %}</a>{% endif %}diff --git a/wger/core/tests/test_index.py b/wger/core/tests/test_index.pyindex 4b8ce28bb..9ff179070 100644--- a/wger/core/tests/test_index.py+++ b/wger/core/tests/test_index.py@@ -53,7 +53,7 @@ class DashboardTestCase(WorkoutManagerTestCase):## 1. Add a workout#- self.client.get(reverse('workout-add'))+ self.client.get(reverse('manager:workout:add'))response = self.client.get(reverse('core:dashboard'))self.assertEqual(response.status_code, 200)diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.pyindex ebbb3f203..4ca190552 100644--- a/wger/core/tests/test_temporary_users.py+++ b/wger/core/tests/test_temporary_users.py@@ -126,7 +126,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):# Try some other pagesself.user_logout()- self.client.get(reverse('workout-overview'))+ self.client.get(reverse('manager:workout:overview'))self.assertEqual(self.count_temp_users(), 3)self.user_logout()@@ -144,7 +144,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):demo_notice_text = 'You are using a guest account'self.user_login('demo')self.assertContains(self.client.get(reverse('core:dashboard')), demo_notice_text)- self.assertContains(self.client.get(reverse('workout-overview')),+ self.assertContains(self.client.get(reverse('manager:workout:overview')),demo_notice_text)self.assertContains(self.client.get(reverse('exercise:exercise:overview')),demo_notice_text)diff --git a/wger/manager/models.py b/wger/manager/models.pyindex 8bb79b286..185dc9395 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -64,7 +64,7 @@ class Workout(models.Model):'''Returns the canonical URL to view a workout'''- return reverse('workout-view', kwargs={'id': self.id})+ return reverse('manager:workout:view', kwargs={'id': self.id})def __unicode__(self):'''@@ -223,7 +223,7 @@ class Schedule(models.Model):'''A flag indicating whether the schedule should act as a loop'''def get_absolute_url(self):- return reverse('schedule-view', kwargs={'pk': self.id})+ return reverse('manager:schedule:view', kwargs={'pk': self.id})def get_owner_object(self):'''diff --git a/wger/manager/pdf.py b/wger/manager/pdf.pyindex 5e8712c9f..862f81df0 100644--- a/wger/manager/pdf.py+++ b/wger/manager/pdf.py@@ -254,7 +254,7 @@ def workout_log(request, id, uidb64=None, token=None):# Footer, date and infoelements.append(Spacer(10*cm, 0.5*cm))created = datetime.date.today().strftime("%d.%m.%Y")- url = reverse('workout-view', kwargs={'id': workout.id})+ url = reverse('manager:workout:view', kwargs={'id': workout.id})P = Paragraph('''<para align="left">%(date)s -<a href="%(url)s">%(url)s</a> -@@ -458,7 +458,7 @@ def workout_view(request, id, uidb64=None, token=None):# Footer, date and infoelements.append(Spacer(10*cm, 0.5*cm))created = datetime.date.today().strftime("%d.%m.%Y")- url = reverse('workout-view', kwargs={'id': workout.id})+ url = reverse('manager:workout:view', kwargs={'id': workout.id})p = Paragraph('''<para align="left">%(date)s -<a href="%(url)s">%(url)s</a> -diff --git a/wger/manager/templates/day/log.html b/wger/manager/templates/day/log.htmlindex c7d0b04b4..9bf8893cf 100644--- a/wger/manager/templates/day/log.html+++ b/wger/manager/templates/day/log.html@@ -63,7 +63,7 @@ $(document).ready(function () {{% empty %}{% trans "Add exercises to this training day before adding a log." %}<br>- <a href="{% url 'workout-view' day.training.id %}">{% trans "Back to workout" %}</a>+ <a href="{% url 'manager:workout:view' day.training.id %}">{% trans "Back to workout" %}</a>{% endfor %}</div>@@ -82,7 +82,7 @@ will simply be edited. Weight entries are always added.{% endblocktrans %}</p><h3>{% trans "Options" %}</h3><p>-<a href="{% url 'workout-view' day.training.id %}" {% auto_link_css flavour %}>+<a href="{% url 'manager:workout:view' day.training.id %}" {% auto_link_css flavour %}><img src="{% static 'images/icons/list.svg' %}"width="32"height="32"diff --git a/wger/manager/templates/mobile/schedule/overview.html b/wger/manager/templates/mobile/schedule/overview.htmlindex f9036cd85..f04513aea 100644--- a/wger/manager/templates/mobile/schedule/overview.html+++ b/wger/manager/templates/mobile/schedule/overview.html@@ -12,7 +12,7 @@<div class="list-group">{% for schedule in schedules %}- <a href="{% url 'schedule-view' schedule.id %}" class="list-group-item wger-list-group-item">+ <a href="{% url 'manager:schedule:view' schedule.id %}" class="list-group-item wger-list-group-item"><span class="glyphicon glyphicon-chevron-right pull-right"></span>{% if schedule.is_active %}@@ -22,7 +22,7 @@<p class="list-group-item-text">{{ schedule.start_date }}</p></a>{% empty %}- <a href="{% url 'schedule-add' %}" class="list-group-item">+ <a href="{% url 'manager:schedule:add' %}" class="list-group-item">{% trans "No schedules found." %}<br>{% trans "Add one now." %}</a>@@ -46,7 +46,7 @@ deactivate it, if it is a loop.{% endblocktrans %}</p><h3>{% trans "Add schedule" %}</h3><p>- <a href="{% url 'schedule-add' %}"+ <a href="{% url 'manager:schedule:add' %}"class="btn btn-default btn-block"><img src="{% static 'images/icons/new.svg' %}"width="32"diff --git a/wger/manager/templates/mobile/schedule/view.html b/wger/manager/templates/mobile/schedule/view.htmlindex 59f274bf2..fed34dd2b 100644--- a/wger/manager/templates/mobile/schedule/view.html+++ b/wger/manager/templates/mobile/schedule/view.html@@ -16,19 +16,19 @@<h4 class="modal-title">{%trans "Options" %}</h4></div><div class="modal-body">- <a href="{% url 'workout-view' step.workout.id %}"+ <a href="{% url 'manager:workout:view' step.workout.id %}"title="{% trans 'Workout' %}"class="btn btn-default btn-block">{% trans 'Workout' %}</a>- <a href="{% url 'step-edit' step.id %}"+ <a href="{% url 'manager:step:edit' step.id %}"title="{% trans 'Edit' %}"class="btn btn-default btn-block wger-modal-dialog"><img src="{% static 'images/icons/edit.svg' %}"width="22"height="22"alt="{% trans 'Edit' %}">{% trans 'Edit' %}</a>- <a href="{% url 'step-delete' step.id %}"+ <a href="{% url 'manager:step:delete' step.id %}"title="{% trans 'Delete' %}"class="btn btn-default btn-block"><img src="{% static 'images/icons/trash.svg' %}"@@ -58,11 +58,11 @@</div></a>{% empty %}- <a href="{% url 'step-add' schedule.id %}" class="list-group-item wger-list-group-item wger-modal-dialog">+ <a href="{% url 'manager:step:add' schedule.id %}" class="list-group-item wger-list-group-item wger-modal-dialog">{% trans "No workouts found." %}<br>{% trans "Add one now." %}</a>{% endfor %}- <a href="{% url 'step-add' schedule.id %}" class="list-group-item list-group-item-success wger-modal-dialog">+ <a href="{% url 'manager:step:add' schedule.id %}" class="list-group-item list-group-item-success wger-modal-dialog"><span class="glyphicon glyphicon-plus"></span>{% trans "Add workout" %}</a>@@ -98,7 +98,7 @@ than once.{% endblocktrans %}</p></p><p>-<a href="{% url 'schedule-edit' schedule.id %}"+<a href="{% url 'manager:schedule:edit' schedule.id %}"class="btn btn-default btn-block wger-modal-dialog"><img src="{% static 'images/icons/edit.svg' %}"width="32"@@ -109,7 +109,7 @@ than once.{% endblocktrans %}</p></p><p>-<a href="{% url 'schedule-delete' schedule.id %}"+<a href="{% url 'manager:schedule:delete' schedule.id %}"class="btn btn-default btn-block wger-modal-dialog"><img src="{% static 'images/icons/trash.svg' %}"width="32"@@ -132,7 +132,7 @@ than once.{% endblocktrans %}</p>application for example google calendar, outlook or iCal. This will createan appointment for each training day with the appropriate exercises.{% endblocktrans %}</p><p>- <a href="{% url 'schedule-ical' schedule.id uid token %}" {% auto_link_css flavour %}>+ <a href="{% url 'manager:schedule:ical' schedule.id uid token %}" {% auto_link_css flavour %}><img src="{% static 'images/icons/calendar.svg' %}"width="32"height="32"diff --git a/wger/manager/templates/mobile/tags/render_day.html b/wger/manager/templates/mobile/tags/render_day.htmlindex b3a1fe115..fd35758d2 100644--- a/wger/manager/templates/mobile/tags/render_day.html+++ b/wger/manager/templates/mobile/tags/render_day.html@@ -10,7 +10,7 @@<h4 class="modal-title">{{day.obj.description}}</h4></div><div class="modal-body">- <a href="{% url 'day-log' day.obj.id %}"+ <a href="{% url 'manager:day:log' day.obj.id %}"title="{% trans 'Add weight log to this day' %}"{% auto_link_css flavour %}><img src="{% static 'images/icons/statistics.svg' %}"@@ -20,7 +20,7 @@{% trans 'Add weight log to this day' %}</a>{% if day.set_list|length > 0 %}- <a href="{% url 'workout-timer' day.obj.id %}"+ <a href="{% url 'manager:workout:timer' day.obj.id %}"title="{% trans 'Start gym mode' %}"{% auto_link_css flavour %}><img src="{% static 'images/icons/play.svg' %}"@@ -30,7 +30,7 @@{% trans "Start gym mode" %}</a>{% endif %}- <a href="{% url 'day-edit' day.obj.id %}"+ <a href="{% url 'manager:day:edit' day.obj.id %}"title="{% trans 'Edit' %}"{% auto_link_css flavour "wger-modal-dialog" %}><img src="{% static 'images/icons/edit.svg' %}"@@ -39,7 +39,7 @@alt="{% trans 'Edit' %}">{% trans 'Edit' %}</a>- <a href="{% url 'day-delete' day.obj.id %}"+ <a href="{% url 'manager:day:delete' day.obj.id %}"title="{% trans 'Delete' %}"{% auto_link_css flavour %}><img src="{% static 'images/icons/trash.svg' %}"@@ -68,7 +68,7 @@</h4></div><div class="modal-body">- <a href="{% url 'wger.manager.views.set.edit' set.obj.id %}"+ <a href="{% url 'manager:set:edit' set.obj.id %}"title="{% trans 'Edit' %}"{% auto_link_css flavour "wger-modal-dialog" %}><img src="{% static 'images/icons/edit.svg' %}"@@ -77,7 +77,7 @@alt="{% trans 'Edit' %}">{% trans "Edit" %}</a>- <a href="{% url 'wger.manager.views.set.delete' set.obj.id %}"+ <a href="{% url 'manager:set:delete' set.obj.id %}"title="{% trans 'Delete' %}"{% auto_link_css flavour %}><img src="{% static 'images/icons/trash.svg' %}"@@ -127,7 +127,7 @@data-toggle="modal"id="set-{{ set.obj.id }}">{% else %}- <a href="{% url 'set-edit' set.obj.id %}"+ <a href="{% url 'manager:set:edit' set.obj.id %}"id="set-{{ set.obj.id }}"class="list-group-item wger-list-group-item">{% endif %}@@ -136,7 +136,7 @@{% for exercise in set.exercise_list %}- <div id="exercise-{{ exercise.obj.id }}" class="ajax-set-edit-target">+ <div id="exercise-{{ exercise.obj.id }}" class="ajax-manager:set:edit-target"><div class="media"><span class="pull-left" style="width:64px;height:64px;">{% if exercise.obj.main_image %}@@ -175,7 +175,7 @@{% endfor %} <!--for exercise in set--></a>{% empty %}- <a href="{% url 'set-add' day.obj.id %}"+ <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>{% trans "Add one now." %}@@ -183,7 +183,7 @@{% endfor %} <!--for set in day-->{% if day.set_list %}- <a href="{% url 'set-add' day.obj.id %}" class="list-group-item list-group-item-success wger-modal-dialog">+ <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" %}</a>diff --git a/wger/manager/templates/mobile/workout/calendar.html b/wger/manager/templates/mobile/workout/calendar.htmlindex 37b54fdd2..9b8c401b7 100644--- a/wger/manager/templates/mobile/workout/calendar.html+++ b/wger/manager/templates/mobile/workout/calendar.html@@ -39,7 +39,7 @@ $(document).ready(function() {<h4 class="modal-title">{% trans "Options" %} - {{log.reps}} × {{log.weight}}</h4></div><div class="modal-body">- <a href="{% url 'workout-log-delete' log.pk %}"+ <a href="{% url 'manager:log:delete' log.pk %}"title="{% trans 'Delete' %}"class="btn btn-default btn-block"><img src="{% static 'images/icons/trash.svg' %}"@@ -48,7 +48,7 @@ $(document).ready(function() {alt="{% trans 'Delete' %}">{% trans 'Delete' %}</a>- <a href="{% url 'workout-log-edit' log.pk %}"+ <a href="{% url 'manager:log:edit' log.pk %}"title="{% trans 'Edit' %}"class="btn btn-default btn-block"><img src="{% static 'images/icons/edit.svg' %}"@@ -76,14 +76,14 @@ $(document).ready(function() {<a href="{{first_log.workout.get_absolute_url}}"class="btn btn-default btn-block">{{ first_log.workout }}</a>- <a href="{% url 'workout-log' first_log.workout.id %}"+ <a href="{% url 'manager:log:log' first_log.workout.id %}"class="btn btn-default btn-block">{% trans "Log overview" %}</a>{% if session %}- <a href="{% url 'workout-session-edit' session.pk %}"+ <a href="{% url 'manager:session:edit' session.pk %}"class="btn btn-default btn-block wger-modal-dialog">{% trans "Edit workout session" %}</a>{% else %}- <a href="{% url 'workout-session-add' first_log.workout_id date|date:'Y' date|date:'m' date|date:'d' %}"+ <a href="{% url 'manager:session:add' first_log.workout_id date|date:'Y' date|date:'m' date|date:'d' %}"class="btn btn-default btn-block wger-modal-dialog">{% trans "Add workout impression" %}</a>{% endif %}@@ -145,7 +145,7 @@ day in your current workout:{% endblocktrans %} {{current_workout}}</p><div class="list-group">{% for day in current_workout.day_set.all %}- <a href="{% url 'day-log' day.pk %}" class="list-group-item wger-list-group-item">+ <a href="{% url 'manager:day:log' day.pk %}" class="list-group-item wger-list-group-item"><span class="glyphicon glyphicon-chevron-right pull-right"></span>{{day.description}}</a>@@ -153,7 +153,7 @@ day in your current workout:{% endblocktrans %} {{current_workout}}</p></div>{% else %}<p><em>{% trans "No workouts found." %}</em></p>- <a href="{% url 'workout-add' %}" class="btn btn-default btn-block">+ <a href="{% url 'manager:workout:add' %}" class="btn btn-default btn-block"><img src="{% static 'images/icons/add.svg' %}"width="22"height="22"@@ -172,7 +172,7 @@ day in your current workout:{% endblocktrans %} {{current_workout}}</p>you can click on them to see the details.{% endblocktrans %}</p><h3>{% trans 'Log' %}</h3>- <a href="{% url 'workout-calendar' %}" class="btn btn-default btn-block">+ <a href="{% url 'manager:workout:calendar' %}" class="btn btn-default btn-block"><img src="{% static 'images/icons/calendar.svg' %}"width="32"height="32"@@ -196,11 +196,11 @@ you can click on them to see the details.{% endblocktrans %}</p></a>{% endifchanged %}{% if current_month = date.month and current_year = date.year %}- <a href="{% url 'workout-calendar' date.year date.month %}" class="list-group-item wger-list-group-item">+ <a href="{% url 'manager:workout:calendar' date.year date.month %}" class="list-group-item wger-list-group-item"><em>{{date|date:"F"}}</em></a>{% else %}- <a href="{% url 'workout-calendar' date.year date.month %}" class="list-group-item wger-list-group-item">+ <a href="{% url 'manager:workout:calendar' date.year date.month %}" class="list-group-item wger-list-group-item"><span class="glyphicon glyphicon-chevron-right pull-right"></span>{{date|date:"F"}}</a>diff --git a/wger/manager/templates/mobile/workout/overview.html b/wger/manager/templates/mobile/workout/overview.htmlindex a1bb01aa2..773919aad 100644--- a/wger/manager/templates/mobile/workout/overview.html+++ b/wger/manager/templates/mobile/workout/overview.html@@ -9,7 +9,7 @@{% block content %}<div class="list-group">{% for workout in workouts %}- <a href="{% url 'workout-view' workout.id %}" class="list-group-item wger-list-group-item">+ <a href="{% url 'manager:workout:view' workout.id %}" class="list-group-item wger-list-group-item"><span class="glyphicon glyphicon-chevron-right pull-right"></span>{% if workout == current_workout %}@@ -20,7 +20,7 @@<p class="list-group-item-text">{{ workout.creation_date }}</p></a>{% empty %}- <a href="{% url 'workout-add' %}" class="list-group-item">+ <a href="{% url 'manager:workout:add' %}" class="list-group-item">{% trans "No workouts found." %}<br>{% trans "Add one now." %}</a>{% endfor %}@@ -31,7 +31,7 @@{% block sidebar %}<h3>{% trans "Options" %}</h3><p>- <a href="{% url 'workout-add' %}" {% auto_link_css flavour %}>+ <a href="{% url 'manager:workout:add' %}" {% auto_link_css flavour %}><img src="{% static 'images/icons/new.svg' %}"width="32"height="32"diff --git a/wger/manager/templates/mobile/workout/view.html b/wger/manager/templates/mobile/workout/view.htmlindex 4e74daaf1..e9c8f631e 100644--- a/wger/manager/templates/mobile/workout/view.html+++ b/wger/manager/templates/mobile/workout/view.html@@ -46,7 +46,7 @@ $(document).ready(function() {{% empty %}<div class="list-group">- <a href="{% url 'day-add' workout.id %}" class="list-group-item list-group-item-success wger-modal-dialog">+ <a href="{% url 'manager:day:add' workout.id %}" class="list-group-item list-group-item-success wger-modal-dialog">{% trans "No days for this workout." %}<br>{% trans "Add training day." %}</a>@@ -55,7 +55,7 @@ $(document).ready(function() {<p style="margin-top:2em;">- <a href="{% url 'day-add' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}>+ <a href="{% url 'manager:day:add' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}>{% trans "Add training day" %}</a>@@ -119,7 +119,7 @@ $(document).ready(function() {{% trans "Download as PDF" %}</a>-<a href="{% url 'workout-log' workout.id %}" {% auto_link_css flavour %}>+<a href="{% url 'manager:log:log' workout.id %}" {% auto_link_css flavour %}><img src="{% static 'images/icons/statistics.svg' %}"width="32"height="32"@@ -128,7 +128,7 @@ $(document).ready(function() {{% trans "View weight log" %}</a>-<a href="{% url 'workout-edit' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}>+<a href="{% url 'manager:workout:edit' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}><img src="{% static 'images/icons/edit.svg' %}"width="32"height="32"@@ -146,7 +146,7 @@ $(document).ready(function() {{% trans "Export calendar file" %}</a>-<a href="{% url 'workout-copy' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}>+<a href="{% url 'manager:workout:copy' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}><img src="{% static 'images/icons/copy.svg' %}"width="32"height="32"@@ -155,7 +155,7 @@ $(document).ready(function() {{% trans "Make a copy of this workout" %}</a>-<a href="{% url 'workout-delete' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}>+<a href="{% url 'manager:workout:delete' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}><img src="{% static 'images/icons/trash.svg' %}"width="32"height="32"@@ -178,7 +178,7 @@ $(document).ready(function() {application for example google calendar, outlook or iCal. This will createan appointment for each training day with the appropriate exercises.{% endblocktrans %}</p><p>- <a href="{% url 'workout-ical' workout.id uid token %}" {% auto_link_css flavour %}>+ <a href="{% url 'manager:workout:ical' workout.id uid token %}" {% auto_link_css flavour %}><img src="{% static 'images/icons/calendar.svg' %}"width="32"height="32"@@ -202,11 +202,11 @@ an appointment for each training day with the appropriate exercises.{% endblockt<h4 class="modal-title">{% trans "Download as PDF" %}</h4></div><div class="modal-body">- <a href="{% url 'workout-pdf-log' workout.id uid token %}" {% auto_link_css flavour %}>+ <a href="{% url 'manager:workout:pdf-log' workout.id uid token %}" {% auto_link_css flavour %}>{% trans "Log" %}</a>- <a href="{% url 'workout-pdf-table' workout.id uid token %}" {% auto_link_css flavour %}>+ <a href="{% url 'manager:workout:pdf-table' workout.id uid token %}" {% auto_link_css flavour %}>{% trans "Table" %}</a></div>diff --git a/wger/manager/templates/schedule/overview.html b/wger/manager/templates/schedule/overview.htmlindex a9892c622..3546accf2 100644--- a/wger/manager/templates/schedule/overview.html+++ b/wger/manager/templates/schedule/overview.html@@ -20,7 +20,7 @@{% for schedule in schedules %}<tr><td>- <a href="{% url 'schedule-view' schedule.id %}">+ <a href="{% url 'manager:schedule:view' schedule.id %}">{{ schedule.name }}</a>{% if schedule.is_active %}@@ -34,7 +34,7 @@{% empty %}<tr><td colspan="3">- <a href="{% url 'schedule-add' %}" class="wger-modal-dialog btn btn-block btn-default">+ <a href="{% url 'manager:schedule:add' %}" class="wger-modal-dialog btn btn-block btn-default">{% trans "No schedules found." %} {% trans "Add one now." %}</a></td>@@ -61,7 +61,7 @@ deactivate it, if it is a loop.{% endblocktrans %}</p><h3>{% trans "Add schedule" %}</h3><p>-<a href="{% url 'schedule-add' %}"+<a href="{% url 'manager:schedule:add' %}"class="wger-modal-dialog"><img src="{% static 'images/icons/new.svg' %}"width="32"diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.htmlindex d734c5e7e..90f85ea3d 100644--- a/wger/manager/templates/schedule/view.html+++ b/wger/manager/templates/schedule/view.html@@ -76,7 +76,7 @@ $(function() {alt="{% trans 'Move me' %}"title="{% trans 'Move me' %}"class="dragndrop-handle">- <a href="{% url 'step-edit' step.id %}"+ <a href="{% url 'manager:step:edit' step.id %}"title="{% trans 'Edit' %}"class="wger-modal-dialog"><img src="{% static 'images/icons/edit.svg' %}"@@ -84,7 +84,7 @@ $(function() {height="22"alt="{% trans 'Edit' %}"></a>- <a href="{% url 'step-delete' step.id %}"+ <a href="{% url 'manager:step:delete' step.id %}"title="{% trans 'Delete' %}"class="wger-modal-dialog"><img src="{% static 'images/icons/trash.svg' %}"@@ -95,7 +95,7 @@ $(function() {</span></td><td>- <a href="{% url 'workout-view' step.workout.id %}">{{ step.workout }}</a>+ <a href="{% url 'manager:workout:view' step.workout.id %}">{{ step.workout }}</a>{% if active_workout == step %}<span class="label label-info">{% trans "active" %}</span>{% endif %}@@ -107,7 +107,7 @@ $(function() {{% empty %}<tr><td colspan="4">- <a href="{% url 'step-add' schedule.id %}" class="wger-modal-dialog btn btn-block btn-default">+ <a href="{% url 'manager:step:add' schedule.id %}" class="wger-modal-dialog btn btn-block btn-default">{% trans "No workouts found." %} {% trans "Add one now." %}</a></td>@@ -127,7 +127,7 @@ $(function() {</div><p>-<a href="{% url 'step-add' schedule.id %}"+<a href="{% url 'manager:step:add' schedule.id %}"class="wger-modal-dialog"><img src="{% static 'images/icons/new.svg' %}"width="32"@@ -159,7 +159,7 @@ than once.{% endblocktrans %}</p></p><p>-<a href="{% url 'schedule-edit' schedule.id %}"+<a href="{% url 'manager:schedule:edit' schedule.id %}"class="wger-modal-dialog"><img src="{% static 'images/icons/edit.svg' %}"width="32"@@ -170,7 +170,7 @@ than once.{% endblocktrans %}</p></p><p>-<a href="{% url 'schedule-delete' schedule.id %}"+<a href="{% url 'manager:schedule:delete' schedule.id %}"class="wger-modal-dialog"><img src="{% static 'images/icons/trash.svg' %}"width="32"@@ -193,7 +193,7 @@ than once.{% endblocktrans %}</p>application for example google calendar, outlook or iCal. This will createan appointment for each training day with the appropriate exercises.{% endblocktrans %}</p><p>- <a href="{% url 'schedule-ical' schedule.id uid token %}" class="btn btn-block btn-default">+ <a href="{% url 'manager:schedule:ical' schedule.id uid token %}" class="btn btn-block btn-default"><img src="{% static 'images/icons/calendar.svg' %}"width="32"height="32"diff --git a/wger/manager/templates/tags/render_day.html b/wger/manager/templates/tags/render_day.htmlindex 9e2d45ebb..a0b6ee319 100644--- a/wger/manager/templates/tags/render_day.html+++ b/wger/manager/templates/tags/render_day.html@@ -22,14 +22,14 @@ $(document).ready(function() {{{ day.days_of_week.text }} – {{ day.obj.description }}<span class="editoptions" style="float: right;">- <a href="{% url 'day-delete' day.obj.id %}"+ <a href="{% url 'manager:day:delete' day.obj.id %}"title="{% trans 'Delete' %}"><img src="{% static 'images/icons/trash.svg' %}"width="22"height="22"alt="{% trans 'Delete' %}"></a>- <a href="{% url 'day-edit' day.obj.id %}"+ <a href="{% url 'manager:day:edit' day.obj.id %}"title="{% trans 'Edit' %}"class="wger-modal-dialog"><img src="{% static 'images/icons/edit.svg' %}"@@ -37,7 +37,7 @@ $(document).ready(function() {height="22"alt="{% trans 'Edit' %}"></a>- <a href="{% url 'day-log' day.obj.id %}"+ <a href="{% url 'manager:day:log' day.obj.id %}"title="{% trans 'Add weight log to this day' %}"><img src="{% static 'images/icons/statistics.svg' %}"width="22"@@ -63,7 +63,7 @@ $(document).ready(function() {class="dragndrop-handle"><br>{% endif %}- <a href="{% url 'set-edit' set.obj.id %}"+ <a href="{% url 'manager:set:edit' set.obj.id %}"title="{% trans 'Edit' %}"class="wger-modal-dialog"><img src="{% static 'images/icons/edit.svg' %}"@@ -72,7 +72,7 @@ $(document).ready(function() {alt="{% trans 'Edit' %}"></a><br>- <a href="{% url 'wger.manager.views.set.delete' set.obj.id %}"+ <a href="{% url 'manager:set:delete' set.obj.id %}"title="{% trans 'Delete' %}"><img src="{% static 'images/icons/trash.svg' %}"width="16"@@ -110,7 +110,7 @@ $(document).ready(function() {{% if not exercise.setting_list %}<p>{% trans "This exercise has no repetitions." %}<br>- <a href="{% url 'set-edit' set.obj.id %}" class="wger-modal-dialog">+ <a href="{% url 'manager:set:edit' set.obj.id %}" class="wger-modal-dialog">{% trans "Edit them now."%}</a></p>@@ -133,7 +133,7 @@ $(document).ready(function() {{% empty %}<tr><td colspan="2">- <a href="{% url 'set-add' day.obj.id %}"+ <a href="{% url 'manager:set:add' day.obj.id %}"class="wger-modal-dialog btn btn-default btn-block wger-modal-dialog">{% trans "No exercises selected for this day." %}{% trans "Add one now." %}@@ -143,7 +143,7 @@ $(document).ready(function() {{% endfor %} <!--for set in day--><tr><td colspan="2">- <a href="{% url 'set-add' day.obj.id %}"+ <a href="{% url 'manager:set:add' day.obj.id %}"class="wger-modal-dialog">{% trans "Add exercises to this workout day" %}</a></td></tr>diff --git a/wger/manager/templates/workout/calendar.html b/wger/manager/templates/workout/calendar.htmlindex 459a4fa86..bc68556ca 100644--- a/wger/manager/templates/workout/calendar.html+++ b/wger/manager/templates/workout/calendar.html@@ -37,14 +37,14 @@ $(document).ready(function() {</div><div class="col-md-4">- <a href="{% url 'workout-log' first_log.workout.id %}" class="btn btn-default btn-block">{% trans "Log overview" %}</a>+ <a href="{% url 'manager:log:log' first_log.workout.id %}" class="btn btn-default btn-block">{% trans "Log overview" %}</a></div><div class="col-md-4">{% if session %}- <a href="{% url 'workout-session-edit' session.pk %}" class="btn btn-default btn-block wger-modal-dialog">{% trans "Edit workout session" %}</a>+ <a href="{% url 'manager:session:edit' session.pk %}" class="btn btn-default btn-block wger-modal-dialog">{% trans "Edit workout session" %}</a>{% else %}- <a href="{% url 'workout-session-add' first_log.workout_id date|date:'Y' date|date:'m' date|date:'d' %}" class="btn btn-default btn-block wger-modal-dialog">{% trans "Add workout impression" %}</a>+ <a href="{% url 'manager:session:add' first_log.workout_id date|date:'Y' date|date:'m' date|date:'d' %}" class="btn btn-default btn-block wger-modal-dialog">{% trans "Add workout impression" %}</a>{% endif %}</div></div>@@ -72,7 +72,7 @@ $(document).ready(function() {<li>{{log.reps}} × {{log.weight}}<span class="editoptions">- <a href="{% url 'workout-log-delete' log.pk %}"+ <a href="{% url 'manager:log:delete' log.pk %}"title="{% trans 'Delete' %}"class="wger-modal-dialog"><img src="{% static 'images/icons/trash.svg' %}"@@ -80,7 +80,7 @@ $(document).ready(function() {height="16"alt="{% trans 'Delete' %}"></a>- <a href="{% url 'workout-log-edit' log.pk %}"+ <a href="{% url 'manager:log:edit' log.pk %}"title="{% trans 'Edit' %}"class="wger-modal-dialog"><img src="{% static 'images/icons/edit.svg' %}"@@ -115,13 +115,13 @@ $(document).ready(function() {day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</strong></p>{% for day in current_workout.day_set.all %}- <a href="{% url 'day-log' day.pk %}" class="btn btn-block btn-default">{{day.description}}</a>+ <a href="{% url 'manager:day:log' day.pk %}" class="btn btn-block btn-default">{{day.description}}</a>{% endfor %}{% else %}<p><em>{% trans "No workouts found." %}</em></p><p>- <a href="{% url 'workout-add' %}" class="btn btn-block btn-default">+ <a href="{% url 'manager:workout:add' %}" class="btn btn-block btn-default"><img src="{% static 'images/icons/add.svg' %}"width="22"height="22"@@ -141,7 +141,7 @@ you can click on them to see the details.{% endblocktrans %}</p><h3>{% trans 'Log' %}</h3><p>- <a href="{% url 'workout-calendar' %}">+ <a href="{% url 'manager:workout:calendar' %}"><img src="{% static 'images/icons/calendar.svg' %}"width="32"height="32"@@ -164,7 +164,7 @@ you can click on them to see the details.{% endblocktrans %}</p>{% if current_month = date.month and current_year = date.year %}<span>{{date|date:"F"}}</span><br>{% else %}- <span><a href="{% url 'workout-calendar' date.year date.month %}">{{date|date:"F"}}</a></span><br>+ <span><a href="{% url 'manager:workout:calendar' date.year date.month %}">{{date|date:"F"}}</a></span><br>{% endif %}{% endfor %}</div>diff --git a/wger/manager/templates/workout/email_reminder.html b/wger/manager/templates/workout/email_reminder.htmlindex d7008db68..6712c2089 100644--- a/wger/manager/templates/workout/email_reminder.html+++ b/wger/manager/templates/workout/email_reminder.html@@ -15,5 +15,5 @@ reminders, deactivate the option in your settings.{% endblocktrans %}* http://{{site}}{{workout.get_absolute_url}}-* http://{{site}}{% url 'workout-add' %}+* http://{{site}}{% url 'manager:workout:add' %}* http://{{site}}{% url 'core:user:preferences' %}\ No newline at end of filediff --git a/wger/manager/templates/workout/log.html b/wger/manager/templates/workout/log.htmlindex 12c1b7d1a..a91c66410 100644--- a/wger/manager/templates/workout/log.html+++ b/wger/manager/templates/workout/log.html@@ -24,7 +24,7 @@ $(document).ready(function() {<h3>{{ day.obj.description }}</h3><p>- <a href="{% url 'day-log' day.obj.id %}"+ <a href="{% url 'manager:day:log' day.obj.id %}"title="{% trans 'Add weight log to this day' %}"{% auto_link_css flavour %}><img src="{% static 'images/icons/statistics.svg' %}"@@ -82,7 +82,7 @@ $(document).ready(function() {{% block sidebar %}<h3>{% trans "Options" %}</h3><p>-<a href="{% url 'workout-view' workout.id %}" {% auto_link_css flavour %}>+<a href="{% url 'manager:workout:view' workout.id %}" {% auto_link_css flavour %}><img src="{% static 'images/icons/list.svg' %}"width="32"height="32"diff --git a/wger/manager/templates/workout/overview.html b/wger/manager/templates/workout/overview.htmlindex 8b3f9c202..0a1d3757b 100644--- a/wger/manager/templates/workout/overview.html+++ b/wger/manager/templates/workout/overview.html@@ -18,7 +18,7 @@{% for workout in workouts %}<tr><td>- <a href="{% url 'workout-view' workout.id %}">+ <a href="{% url 'manager:workout:view' workout.id %}">{{ workout }}</a>{% if workout == current_workout %}@@ -34,7 +34,7 @@</table>{% else %}<p>- <a href="{% url 'workout-add' %}" class="btn btn-block btn-default">+ <a href="{% url 'manager:workout:add' %}" class="btn btn-block btn-default">{% trans "No workouts found." %} {% trans "Add one now." %}</a></p>@@ -47,7 +47,7 @@{% block sidebar %}<h3>{% trans "Options" %}</h3><p>- <a href="{% url 'workout-add' %}">+ <a href="{% url 'manager:workout:add' %}"><img src="{% static 'images/icons/new.svg' %}"width="32"height="32"diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.htmlindex 24296b965..8b44b61a1 100644--- a/wger/manager/templates/workout/timer.html+++ b/wger/manager/templates/workout/timer.html@@ -281,7 +281,7 @@ $(document).ready(function() {data-step="{{step.current_step}}"data-number="{{step.step_nr}}"><h2>{{step.exercise}}</h2>- <form action="{% url 'workout-log-add' workout.pk %}"+ <form action="{% url 'manager:log:add' workout.pk %}"method="POST"id="form-{{step.current_step}}">{% csrf_token %}diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.htmlindex 13409fd5b..b3b69929f 100644--- a/wger/manager/templates/workout/view.html+++ b/wger/manager/templates/workout/view.html@@ -45,7 +45,7 @@ $(document).ready(function() {</div>{% empty %}<p>- <a href="{% url 'day-add' workout.id %}" class="wger-modal-dialog btn btn-default btn-block">+ <a href="{% url 'manager:day:add' workout.id %}" class="wger-modal-dialog btn btn-default btn-block">{% trans "No days for this workout." %}{% trans "Add training day" %}</a>@@ -54,7 +54,7 @@ $(document).ready(function() {<p>- <a href="{% url 'day-add' workout.id %}" class="wger-modal-dialog">{% trans "Add training day" %}</a>+ <a href="{% url 'manager:day:add' workout.id %}" class="wger-modal-dialog">{% trans "Add training day" %}</a>|<a id="exercise-comments-toggle" href="{% url 'core:user:preferences' %}">{% trans "Show/Hide exercise comments" %}</a></p>@@ -108,13 +108,13 @@ $(document).ready(function() {alt="{% trans 'Download as PDF' %}"title="{% trans 'Download as PDF' %}">{% trans "Download as PDF" %}:- <a href="{% url 'workout-pdf-log' workout.id uid token %}">{% trans "Log" %}</a>+ <a href="{% url 'manager:workout:pdf-log' workout.id uid token %}">{% trans "Log" %}</a>|- <a href="{% url 'workout-pdf-table' workout.id uid token %}">{% trans "Table" %}</a>+ <a href="{% url 'manager:workout:pdf-table' workout.id uid token %}">{% trans "Table" %}</a></p><p>-<a href="{% url 'workout-log' workout.id %}">+<a href="{% url 'manager:log:log' workout.id %}"><img src="{% static 'images/icons/statistics.svg' %}"width="32"height="32"@@ -125,7 +125,7 @@ $(document).ready(function() {</p><p>-<a href="{% url 'workout-edit' workout.id %}"+<a href="{% url 'manager:workout:edit' workout.id %}"class="wger-modal-dialog"><img src="{% static 'images/icons/edit.svg' %}"width="32"@@ -148,7 +148,7 @@ $(document).ready(function() {</p><p>-<a href="{% url 'workout-copy' workout.id %}"+<a href="{% url 'manager:workout:copy' workout.id %}"class="wger-modal-dialog"><img src="{% static 'images/icons/copy.svg' %}"width="32"@@ -160,7 +160,7 @@ $(document).ready(function() {</p><p>-<a href="{% url 'workout-delete' workout.id %}"+<a href="{% url 'manager:workout:delete' workout.id %}"class="wger-modal-dialog"><img src="{% static 'images/icons/trash.svg' %}"width="32"@@ -184,7 +184,7 @@ $(document).ready(function() {application for example google calendar, outlook or iCal. This will createan appointment for each training day with the appropriate exercises.{% endblocktrans %}</p><p>- <a href="{% url 'workout-ical' workout.id uid token %}" class="btn btn-block btn-default">+ <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"diff --git a/wger/manager/tests/test_copy_workout.py b/wger/manager/tests/test_copy_workout.pyindex 4cbecbac3..c77435078 100644--- a/wger/manager/tests/test_copy_workout.py+++ b/wger/manager/tests/test_copy_workout.py@@ -33,7 +33,7 @@ class CopyWorkoutTestCase(WorkoutManagerTestCase):'''# Open the copy workout form- response = self.client.get(reverse('workout-copy', kwargs={'pk': '3'}))+ response = self.client.get(reverse('manager:workout:copy', kwargs={'pk': '3'}))if not owner:self.assertEqual(response.status_code, 404)else:@@ -41,7 +41,7 @@ class CopyWorkoutTestCase(WorkoutManagerTestCase):# Copy the workoutcount_before = Workout.objects.count()- response = self.client.post(reverse('workout-copy', kwargs={'pk': '3'}),+ response = self.client.post(reverse('manager:workout:copy', kwargs={'pk': '3'}),{'comment': 'A copied workout'})count_after = Workout.objects.count()@@ -54,7 +54,7 @@ class CopyWorkoutTestCase(WorkoutManagerTestCase):self.assertTemplateUsed('workout/view.html')# Test accessing the copied workout- response = self.client.get(reverse('workout-view', kwargs={'id': 4}))+ response = self.client.get(reverse('manager:workout:view', kwargs={'id': 4}))if not owner:self.assertEqual(response.status_code, 404)diff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.pyindex 0febd01cd..9abae40b8 100644--- a/wger/manager/tests/test_day.py+++ b/wger/manager/tests/test_day.py@@ -29,7 +29,7 @@ class AddWorkoutDayTestCase(WorkoutManagerAddTestCase):'''object_class = Day- url = reverse('day-add', kwargs={'workout_pk': 3})+ url = reverse('manager:day:add', kwargs={'workout_pk': 3})user_success = 'test'user_fail = 'admin'data = {'description': 'a new day',@@ -48,7 +48,7 @@ class DeleteWorkoutDayTestCase(WorkoutManagerTestCase):# Fetch the day edit pagecount_before = Day.objects.count()- response = self.client.get(reverse('day-delete', kwargs={'pk': 5}))+ response = self.client.get(reverse('manager:day:delete', kwargs={'pk': 5}))count_after = Day.objects.count()if fail:@@ -91,7 +91,7 @@ class EditWorkoutDayTestCase(WorkoutManagerEditTestCase):'''object_class = Day- url = 'day-edit'+ url = 'manager:day:edit'pk = 5user_success = 'test'user_fail = 'admin'@@ -110,7 +110,7 @@ class RenderWorkoutDayTestCase(WorkoutManagerTestCase):'''# Fetch the day edit page- response = self.client.get(reverse('wger.manager.views.day.view', kwargs={'id': 5}))+ response = self.client.get(reverse('manager:day:view', kwargs={'id': 5}))if fail:self.assertEqual(response.status_code, 404)diff --git a/wger/manager/tests/test_ical.py b/wger/manager/tests/test_ical.pyindex cd2d4be81..724262f17 100644--- a/wger/manager/tests/test_ical.py+++ b/wger/manager/tests/test_ical.py@@ -57,9 +57,9 @@ class WorkoutICalExportTestCase(WorkoutManagerTestCase):user = User.objects.get(username='test')uid, token = make_token(user)- response = self.client.get(reverse('workout-ical', kwargs={'pk': 3,- 'uidb64': uid,- 'token': token}))+ response = self.client.get(reverse('manager:workout:ical', kwargs={'pk': 3,+ 'uidb64': uid,+ 'token': token}))self.assertEqual(response.status_code, 200)self.assertEqual(response['Content-Type'], 'text/calendar')@@ -75,7 +75,7 @@ class WorkoutICalExportTestCase(WorkoutManagerTestCase):Helper function'''- response = self.client.get(reverse('workout-ical', kwargs={'pk': 3}))+ response = self.client.get(reverse('manager:workout:ical', kwargs={'pk': 3}))if fail:self.assertIn(response.status_code, (404, 302))@@ -128,9 +128,9 @@ class ScheduleICalExportTestCase(WorkoutManagerTestCase):user = User.objects.get(username='test')uid, token = make_token(user)- response = self.client.get(reverse('schedule-ical', kwargs={'pk': 2,- 'uidb64': uid,- 'token': token}))+ response = self.client.get(reverse('manager:schedule:ical', kwargs={'pk': 2,+ 'uidb64': uid,+ 'token': token}))self.assertEqual(response.status_code, 200)self.assertEqual(response['Content-Type'], 'text/calendar')@@ -146,7 +146,7 @@ class ScheduleICalExportTestCase(WorkoutManagerTestCase):Helper function'''- response = self.client.get(reverse('schedule-ical', kwargs={'pk': 2}))+ response = self.client.get(reverse('manager:schedule:ical', kwargs={'pk': 2}))if fail:self.assertIn(response.status_code, (404, 302))diff --git a/wger/manager/tests/test_pdf.py b/wger/manager/tests/test_pdf.pyindex 1af4320bf..b2b9e97e2 100644--- a/wger/manager/tests/test_pdf.py+++ b/wger/manager/tests/test_pdf.py@@ -31,9 +31,9 @@ class WorkoutPdfLogExportTestCase(WorkoutManagerTestCase):user = User.objects.get(username='test')uid, token = make_token(user)- response = self.client.get(reverse('workout-pdf-log', kwargs={'id': 3,- 'uidb64': uid,- 'token': token}))+ response = self.client.get(reverse('manager:workout:pdf-log', kwargs={'id': 3,+ 'uidb64': uid,+ 'token': token}))self.assertEqual(response.status_code, 200)self.assertEqual(response['Content-Type'], 'application/pdf')@@ -49,7 +49,7 @@ class WorkoutPdfLogExportTestCase(WorkoutManagerTestCase):Helper function to test exporting a workout as a pdf'''- response = self.client.get(reverse('workout-pdf-log', kwargs={'id': 3}))+ response = self.client.get(reverse('manager:workout:pdf-log', kwargs={'id': 3}))if fail:self.assertIn(response.status_code, (404, 302))@@ -102,9 +102,9 @@ class WorkoutPdfTableExportTestCase(WorkoutManagerTestCase):user = User.objects.get(username='test')uid, token = make_token(user)- response = self.client.get(reverse('workout-pdf-table', kwargs={'id': 3,- 'uidb64': uid,- 'token': token}))+ response = self.client.get(reverse('manager:workout:pdf-table', kwargs={'id': 3,+ 'uidb64': uid,+ 'token': token}))self.assertEqual(response.status_code, 200)self.assertEqual(response['Content-Type'], 'application/pdf')@@ -121,7 +121,7 @@ class WorkoutPdfTableExportTestCase(WorkoutManagerTestCase):'''# Create a workout- response = self.client.get(reverse('workout-pdf-table', kwargs={'id': 3}))+ response = self.client.get(reverse('manager:workout:pdf-table', kwargs={'id': 3}))if fail:self.assertIn(response.status_code, (404, 302))diff --git a/wger/manager/tests/test_schedule.py b/wger/manager/tests/test_schedule.pyindex 67420335b..7524bf1f3 100644--- a/wger/manager/tests/test_schedule.py+++ b/wger/manager/tests/test_schedule.py@@ -39,7 +39,7 @@ class CreateScheduleTestCase(WorkoutManagerAddTestCase):'''object_class = Schedule- url = 'schedule-add'+ url = 'manager:schedule:add'user_success = 'test'user_fail = Falsedata = {'name': 'My cool schedule',@@ -54,7 +54,7 @@ class DeleteScheduleTestCase(WorkoutManagerDeleteTestCase):'''object_class = Schedule- url = 'schedule-delete'+ url = 'manager:schedule:delete'pk = 1user_success = 'test'user_fail = 'admin'@@ -66,7 +66,7 @@ class EditScheduleTestCase(WorkoutManagerEditTestCase):'''object_class = Schedule- url = 'schedule-edit'+ url = 'manager:schedule:edit'pk = 3data = {'name': 'An updated name','start_date': datetime.date.today(),@@ -84,7 +84,7 @@ class ScheduleTestCase(WorkoutManagerTestCase):Helper function'''- response = self.client.get(reverse('schedule-view', kwargs={'pk': 2}))+ response = self.client.get(reverse('manager:schedule:view', kwargs={'pk': 2}))if fail:self.assertIn(response.status_code, STATUS_CODES_FAIL)else:@@ -95,7 +95,7 @@ class ScheduleTestCase(WorkoutManagerTestCase):schedule.is_loop = Falseschedule.save()- response = self.client.get(reverse('schedule-view', kwargs={'pk': 2}))+ response = self.client.get(reverse('manager:schedule:view', kwargs={'pk': 2}))self.assertEqual(response.status_code, 200)self.assertNotContains(response, 'This schedule is a loop')@@ -121,7 +121,7 @@ class ScheduleTestCase(WorkoutManagerTestCase):'''self.user_login()- response = self.client.get(reverse('schedule-overview'))+ response = self.client.get(reverse('manager:schedule:overview'))self.assertEqual(response.status_code, 200)self.assertEqual(len(response.context['schedules']), 3)if self.is_mobile:@@ -134,7 +134,7 @@ class ScheduleTestCase(WorkoutManagerTestCase):schedule.is_active = Falseschedule.save()- response = self.client.get(reverse('schedule-overview'))+ response = self.client.get(reverse('manager:schedule:overview'))self.assertEqual(response.status_code, 200)self.assertEqual(len(response.context['schedules']), 3)if self.is_mobile:diff --git a/wger/manager/tests/test_schedule_step.py b/wger/manager/tests/test_schedule_step.pyindex f72da2153..a279b898d 100644--- a/wger/manager/tests/test_schedule_step.py+++ b/wger/manager/tests/test_schedule_step.py@@ -27,7 +27,7 @@ class CreateScheduleStepTestCase(WorkoutManagerAddTestCase):'''object_class = ScheduleStep- url = reverse_lazy('step-add', kwargs={'schedule_pk': 1})+ url = reverse_lazy('manager:step:add', kwargs={'schedule_pk': 1})user_success = 'test'user_fail = Falsedata = {'workout': 3,@@ -40,7 +40,7 @@ class EditScheduleStepTestCase(WorkoutManagerEditTestCase):'''object_class = ScheduleStep- url = 'step-edit'+ url = 'manager:step:edit'pk = 2data = {'workout': 1,'duration': 8}@@ -52,7 +52,7 @@ class DeleteScheduleStepTestCase(WorkoutManagerDeleteTestCase):'''object_class = ScheduleStep- url = 'step-delete'+ url = 'manager:step:delete'pk = 2diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.pyindex 19e88de41..d0efd4601 100644--- a/wger/manager/tests/test_set.py+++ b/wger/manager/tests/test_set.py@@ -38,7 +38,7 @@ class SetAddTestCase(WorkoutManagerAddTestCase):'''object_class = Set- url = reverse_lazy('set-add', kwargs={'day_pk': 5})+ url = reverse_lazy('manager:set:add', kwargs={'day_pk': 5})user_success = 'test'user_fail = 'admin'data = {'exercises': [1, ],@@ -74,7 +74,7 @@ class SetAddTestCase(WorkoutManagerAddTestCase):'exercise2-INITIAL_FORMS': 0,'exercise2-MAX_NUM_FORMS': 1000,'exercise2-0-reps': 8}- response = self.client.post(reverse('set-add', kwargs={'day_pk': 5}), post_data)+ response = self.client.post(reverse('manager:set:add', kwargs={'day_pk': 5}), post_data)self.assertEqual(response.status_code, 302)set_obj = Set.objects.get(pk=4)@@ -104,7 +104,7 @@ class SetDeleteTestCase(WorkoutManagerTestCase):# Fetch the overview pagecount_before = Set.objects.count()- response = self.client.get(reverse('wger.manager.views.set.delete', kwargs={'pk': 3}))+ response = self.client.get(reverse('manager:set:delete', kwargs={'pk': 3}))count_after = Set.objects.count()if fail:@@ -158,7 +158,7 @@ class TestSetOrderTestCase(WorkoutManagerTestCase):post_data['exercise{0}-INITIAL_FORMS'.format(exercise_id)] = 0post_data['exercise{0}-MAX_NUM_FORMS'.format(exercise_id)] = 1000- response = self.client.post(reverse('set-add', kwargs={'day_pk': 5}),+ response = self.client.post(reverse('manager:set:add', kwargs={'day_pk': 5}),post_data)return response@@ -203,7 +203,7 @@ class TestSetAddFormset(WorkoutManagerTestCase):Helper function'''exercise = Exercise.objects.get(pk=1)- response = self.client.get(reverse('set-get-formset',+ response = self.client.get(reverse('manager:set:get-formset',kwargs={'exercise_pk': 1, 'reps': 4}))self.assertEqual(response.status_code, 200)@@ -230,7 +230,7 @@ class SetEditEditTestCase(WorkoutManagerTestCase):'''# Fetch the edit page- response = self.client.get(reverse('set-edit', kwargs={'pk': 3}))+ response = self.client.get(reverse('manager:set:edit', kwargs={'pk': 3}))entry_before = Set.objects.get(pk=3)if fail:@@ -239,7 +239,7 @@ class SetEditEditTestCase(WorkoutManagerTestCase):self.assertEqual(response.status_code, 200)# Try to edit the object- response = self.client.post(reverse('set-edit', kwargs={'pk': 3}),+ response = self.client.post(reverse('manager:set:edit', kwargs={'pk': 3}),{'exercise2-TOTAL_FORMS': 4,'exercise2-INITIAL_FORMS': 1,'exercise2-MAX_NUM_FORMS': 1000,diff --git a/wger/manager/tests/test_timer.py b/wger/manager/tests/test_timer.pyindex abcb088db..d5b987d54 100644--- a/wger/manager/tests/test_timer.py+++ b/wger/manager/tests/test_timer.py@@ -38,7 +38,7 @@ class WorkoutTimerTestCase(WorkoutManagerTestCase):'''# Fetch the timer page- response = self.client.get(reverse('workout-timer', kwargs={'day_pk': 2}))+ response = self.client.get(reverse('manager:workout:timer', kwargs={'day_pk': 2}))if fail:self.assertEqual(response.status_code, 404)@@ -149,9 +149,9 @@ class WorkoutTimerWorkoutSessionTestCase(WorkoutManagerTestCase):self.user_login('test')today = datetime.date.today()- response = self.client.get(reverse('workout-timer', kwargs={'day_pk': 5}))+ response = self.client.get(reverse('manager:workout:timer', kwargs={'day_pk': 5}))self.assertEqual(response.context['form_action'],- reverse('workout-session-add', kwargs={'workout_pk': 3,+ reverse('manager:session:add', kwargs={'workout_pk': 3,'year': today.year,'month': today.month,'day': today.day}))@@ -166,6 +166,6 @@ class WorkoutTimerWorkoutSessionTestCase(WorkoutManagerTestCase):session.time_end = datetime.time(13, 00)session.save()- response = self.client.get(reverse('workout-timer', kwargs={'day_pk': 5}))+ response = self.client.get(reverse('manager:workout:timer', kwargs={'day_pk': 5}))self.assertEqual(response.context['form_action'],- reverse('workout-session-edit', kwargs={'pk': session.pk}))+ reverse('manager:session:edit', kwargs={'pk': session.pk}))diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex bd8122584..140367401 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -42,7 +42,7 @@ class WeightLogOverviewAddTestCase(WorkoutManagerTestCase):'''# Fetch the overview page- response = self.client.get(reverse('workout-log', kwargs={'pk': 1}))+ response = self.client.get(reverse('manager:log:log', kwargs={'pk': 1}))if fail:# Logged out users get a 302 redirect to login page@@ -54,7 +54,7 @@ class WeightLogOverviewAddTestCase(WorkoutManagerTestCase):self.assertEqual(response.context['workout'].id, 1)# Open the log entry page- response = self.client.get(reverse('day-log', kwargs={'pk': 1}))+ response = self.client.get(reverse('manager:day:log', kwargs={'pk': 1}))if fail:self.assertTrue(response.status_code in (302, 403))else:@@ -62,7 +62,7 @@ class WeightLogOverviewAddTestCase(WorkoutManagerTestCase):# Add new log entriescount_before = WorkoutLog.objects.count()- response = self.client.post(reverse('day-log', kwargs={'pk': 1}),+ response = self.client.post(reverse('manager:day:log', kwargs={'pk': 1}),{'date': '2012-01-01','notes': 'My cool impression','impression': '3',@@ -168,7 +168,7 @@ class WeightLogAddTestCase(WorkoutManagerAddTestCase):'''object_class = WorkoutLog- url = reverse_lazy('workout-log-add', kwargs={'workout_pk': 1})+ url = reverse_lazy('manager:log:add', kwargs={'workout_pk': 1})data = {'reps': 10,'weight': 120.5,'date': datetime.date.today(),@@ -181,7 +181,7 @@ class WeightLogDeleteTestCase(WorkoutManagerDeleteTestCase):'''object_class = WorkoutLog- url = reverse_lazy('workout-log-delete', kwargs={'pk': 1})+ url = reverse_lazy('manager:log:delete', kwargs={'pk': 1})pk = 1@@ -195,7 +195,7 @@ class WeightLogEntryEditTestCase(WorkoutManagerTestCase):Helper function to test edit log entries'''- response = self.client.get(reverse('workout-log-edit', kwargs={'pk': 1}))+ response = self.client.get(reverse('manager:log:edit', kwargs={'pk': 1}))if fail:self.assertTrue(response.status_code in (302, 403))@@ -203,7 +203,7 @@ class WeightLogEntryEditTestCase(WorkoutManagerTestCase):self.assertEqual(response.status_code, 200)date_before = WorkoutLog.objects.get(pk=1).date- response = self.client.post(reverse('workout-log-edit', kwargs={'pk': 1}),+ response = self.client.post(reverse('manager:log:edit', kwargs={'pk': 1}),{'date': '2012-01-01','reps': 10,'weight': 10,diff --git a/wger/manager/tests/test_workout.py b/wger/manager/tests/test_workout.pyindex 54e0f74ec..27c17c54c 100644--- a/wger/manager/tests/test_workout.py+++ b/wger/manager/tests/test_workout.py@@ -35,7 +35,7 @@ class AddWorkoutTestCase(WorkoutManagerTestCase):# Create a workoutcount_before = Workout.objects.count()- response = self.client.get(reverse('workout-add'))+ response = self.client.get(reverse('manager:workout:add'))count_after = Workout.objects.count()# There is always a redirect@@ -45,7 +45,7 @@ class AddWorkoutTestCase(WorkoutManagerTestCase):self.assertGreater(count_after, count_before)# Test accessing workout- response = self.client.get(reverse('workout-view', kwargs={'id': 1}))+ response = self.client.get(reverse('manager:workout:view', kwargs={'id': 1}))workout = Workout.objects.get(pk=1)self.assertEqual(response.context['workout'], workout)@@ -67,7 +67,7 @@ class DeleteTestWorkoutTestCase(WorkoutManagerDeleteTestCase):'''object_class = Workout- url = 'workout-delete'+ url = 'manager:workout:delete'pk = 3user_success = 'test'user_fail = 'admin'@@ -79,7 +79,7 @@ class EditWorkoutTestCase(WorkoutManagerEditTestCase):'''object_class = Workout- url = 'workout-edit'+ url = 'manager:workout:edit'pk = 3user_success = 'test'user_fail = 'admin'@@ -96,7 +96,7 @@ class WorkoutOverviewTestCase(WorkoutManagerTestCase):Helper function to test the workout overview'''- response = self.client.get(reverse('workout-overview'))+ response = self.client.get(reverse('manager:workout:overview'))# Page existsself.assertEqual(response.status_code, 200)diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.pyindex cc0e93c6a..5e6059e65 100644--- a/wger/manager/tests/test_workout_session.py+++ b/wger/manager/tests/test_workout_session.py@@ -36,7 +36,7 @@ class AddWorkoutSessionTestCase(WorkoutManagerAddTestCase):'''object_class = WorkoutSession- url = reverse_lazy('workout-session-add', kwargs={'workout_pk': 1,+ url = reverse_lazy('manager:session:add', kwargs={'workout_pk': 1,'year': datetime.date.today().year,'month': datetime.date.today().month,'day': datetime.date.today().day})@@ -57,7 +57,7 @@ class EditWorkoutSessionTestCase(WorkoutManagerEditTestCase):'''object_class = WorkoutSession- url = 'workout-session-edit'+ url = 'manager:session:edit'pk = 3data = {'user': 1,diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex 1f10076f7..c0735173f 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -15,7 +15,7 @@# You should have received a copy of the GNU Affero General Public License# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.-from django.conf.urls import patterns, url+from django.conf.urls import patterns, url, includefrom django.contrib.auth.decorators import login_requiredfrom wger.manager.views import schedule@@ -28,139 +28,169 @@ from wger.manager.views import dayfrom wger.manager.views import workout_sessionfrom wger.manager import pdf+# sub patterns for workout logs+patterns_log = patterns('',+ url(r'^(?P<pk>\d+)/log/$',+ log.WorkoutLogDetailView.as_view(),+ name='log'),+ url(r'^edit-entry/(?P<pk>\d+)$',+ log.WorkoutLogUpdateView.as_view(),+ name='edit'),+ url(r'^delete-entry/(?P<pk>\d+)$',+ log.WorkoutLogDeleteView.as_view(),+ name='delete'),+ url(r'^(?P<workout_pk>\d+)/log/add$',+ log.WorkoutLogAddView.as_view(),+ name='add'),+)-urlpatterns = patterns('',- # Workout- url(r'^workout/overview$',+# sub patterns for workouts+patterns_workout = patterns('',+ url(r'^overview$',workout.overview,- name='workout-overview'),- url(r'^workout/add$',+ name='overview'),+ url(r'^add$',workout.add,- name='workout-add'),- url(r'^workout/(?P<pk>\d+)/copy/$',+ name='add'),+ url(r'^(?P<pk>\d+)/copy/$',workout.copy_workout,- name='workout-copy'),- url(r'^workout/(?P<pk>\d+)/edit/$',+ name='copy'),+ url(r'^(?P<pk>\d+)/edit/$',workout.WorkoutEditView.as_view(),- name='workout-edit'),- url(r'^workout/(?P<pk>\d+)/delete/$',+ name='edit'),+ url(r'^(?P<pk>\d+)/delete/$',workout.WorkoutDeleteView.as_view(),- name='workout-delete'),- url(r'^workout/(?P<id>\d+)/view/$',+ name='delete'),+ url(r'^(?P<id>\d+)/view/$',workout.view,- name='workout-view'),- url(r'^workout/(?P<pk>\d+)/log/$',- log.WorkoutLogDetailView.as_view(),- name='workout-log'),- url(r'^workout/log/edit-entry/(?P<pk>\d+)$',- log.WorkoutLogUpdateView.as_view(),- name='workout-log-edit'),- url(r'^workout/log/delete-entry/(?P<pk>\d+)$',- log.WorkoutLogDeleteView.as_view(),- name='workout-log-delete'),- url(r'^workout/(?P<workout_pk>\d+)/log/add$',- log.WorkoutLogAddView.as_view(),- name='workout-log-add'),- url(r'^workout/calendar$',+ name='view'),+ url(r'^calendar$',log.calendar,- name='workout-calendar'),- url(r'^workout/calendar/(?P<year>\d{4})-(?P<month>\d{1,2})$',+ name='calendar'),+ url(r'^calendar/(?P<year>\d{4})-(?P<month>\d{1,2})$',log.calendar,- name='workout-calendar'),- url(r'^workout/(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',+ name='calendar'),+ url(r'^(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',ical.export,- name='workout-ical'),- url(r'^workout/(?P<pk>\d+)/ical$',+ name='ical'),+ url(r'^(?P<pk>\d+)/ical$',ical.export,- name='workout-ical'),- url(r'^workout/(?P<id>\d+)/pdf/log/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',+ name='ical'),+ url(r'^(?P<id>\d+)/pdf/log/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',pdf.workout_log,- name='workout-pdf-log'),- url(r'^workout/(?P<id>\d+)/pdf/log$',- pdf.workout_log,- name='workout-pdf-log'),- url(r'^workout/(?P<id>\d+)/pdf/table/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',+ name='pdf-log'),+ url(r'^(?P<id>\d+)/pdf/log$',+ pdf.workout_log,+ name='pdf-log'),+ url(r'^(?P<id>\d+)/pdf/table/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',+ pdf.workout_view,+ name='pdf-table'),+ url(r'^(?P<id>\d+)/pdf/table$',pdf.workout_view,- name='workout-pdf-table'),- url(r'^workout/(?P<id>\d+)/pdf/table$',- pdf.workout_view,- name='workout-pdf-table'),+ name='pdf-table'),+ url(r'^(?P<day_pk>\d+)/timer$',+ workout.timer,+ name='timer'),+)- # Workout session- url(r'^workout/session/(?P<workout_pk>\d+)/add/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',++# sub patterns for workout sessions+patterns_session = patterns('',+ url(r'^(?P<workout_pk>\d+)/add/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',workout_session.WorkoutSessionAddView.as_view(),- name='workout-session-add'),- url(r'^workout/session/(?P<pk>\d+)/edit$',+ name='add'),+ url(r'^(?P<pk>\d+)/edit$',workout_session.WorkoutSessionUpdateView.as_view(),- name='workout-session-edit'),+ name='edit'),+)- # Timer- url(r'^workout/(?P<day_pk>\d+)/timer$',- workout.timer,- name='workout-timer'),- # Schedules- url(r'^workout/schedule/overview$',+# sub patterns for workout days+patterns_day = patterns('',+ url(r'^(?P<pk>\d+)/edit/$',+ login_required(day.DayEditView.as_view()),+ name='edit'),+ url(r'(?P<workout_pk>\d+)/day/add/$',+ login_required(day.DayCreateView.as_view()),+ name='add'),+ url(r'(?P<pk>\d+)/delete/$',+ day.delete,+ name='delete'),+ url(r'^(?P<id>\d+)/view/$',+ day.view,+ name='view'),+ url(r'^(?P<pk>\d+)/log/add/$',+ log.add,+ name='log'),+)++# sub patterns for workout sets+patterns_set = patterns('',+ # Sets and Settings+ url(r'^day/(?P<day_pk>\d+)/set/add/$',+ set.create,+ name='add'),+ url(r'^get-formset/(?P<exercise_pk>\d+)/(?P<reps>\d+)/',+ set.get_formset,+ name='get-formset'), # Used by JS+ url(r'^(?P<pk>\d+)/delete$',+ set.delete,+ name='delete'),+ url(r'^(?P<pk>\d+)/edit/$',+ set.edit,+ name='edit'),+)+++# sub patterns for schedules+patterns_schedule = patterns('',+ url(r'^overview$',schedule.overview,- name='schedule-overview'),- url(r'^workout/schedule/add$',+ name='overview'),+ url(r'^add$',schedule.ScheduleCreateView.as_view(),- name='schedule-add'),- url(r'^workout/schedule/(?P<pk>\d+)/view/$',+ name='add'),+ url(r'^(?P<pk>\d+)/view/$',schedule.view,- name='schedule-view'),- url(r'^workout/schedule/(?P<pk>\d+)/edit/$',+ name='view'),+ url(r'^(?P<pk>\d+)/edit/$',schedule.ScheduleEditView.as_view(),- name='schedule-edit'),- url(r'^workout/schedule/(?P<pk>\d+)/delete/$',+ name='edit'),+ url(r'^(?P<pk>\d+)/delete/$',schedule.ScheduleDeleteView.as_view(),- name='schedule-delete'),- url(r'^workout/schedule/(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',+ name='delete'),+ url(r'^(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',ical.export_schedule,- name='schedule-ical'),- url(r'^workout/schedule/(?P<pk>\d+)/ical$',+ name='ical'),+ url(r'^(?P<pk>\d+)/ical$',ical.export_schedule,- name='schedule-ical'),+ name='ical'),+)+- # Schedule steps- url(r'^workout/schedule/(?P<schedule_pk>\d+)/step/add$',++# sub patterns for schedule steps+patterns_step = patterns('',+ url(r'^(?P<schedule_pk>\d+)/step/add$',schedule_step.StepCreateView.as_view(),- name='step-add'),- url(r'^workout/schedule/step/(?P<pk>\d+)/edit$',+ name='add'),+ url(r'^(?P<pk>\d+)/edit$',schedule_step.StepEditView.as_view(),- name='step-edit'),- url(r'^workout/schedule/step/(?P<pk>\d+)/delete$',+ name='edit'),+ url(r'^(?P<pk>\d+)/delete$',schedule_step.StepDeleteView.as_view(),- name='step-delete'),+ name='delete'),+)- # Days- url(r'^workout/day/(?P<pk>\d+)/edit/$',- login_required(day.DayEditView.as_view()),- name='day-edit'),- url(r'^workout/(?P<workout_pk>\d+)/day/add/$',- login_required(day.DayCreateView.as_view()),- name='day-add'),- url(r'^workout/day/(?P<pk>\d+)/delete/$',- day.delete,- name='day-delete'),- url(r'^workout/day/(?P<id>\d+)/view/$',- day.view),- url(r'^workout/day/(?P<pk>\d+)/log/add/$',- log.add,- name='day-log'),- # Sets and Settings- url(r'^workout/day/(?P<day_pk>\d+)/set/add/$',- set.create,- name='set-add'),- url(r'^workout/get-formset/(?P<exercise_pk>\d+)/(?P<reps>\d+)/',- set.get_formset,- name='set-get-formset'), # Used by JS- url(r'^workout/set/(?P<pk>\d+)/delete$',- set.delete),- url(r'^workout/set/(?P<pk>\d+)/edit/$',- set.edit,- name='set-edit'),++urlpatterns = patterns('',+ url(r'^', include(patterns_workout, namespace="workout")),+ url(r'^log/', include(patterns_log, namespace="log")),+ url(r'^day/', include(patterns_day, namespace="day")),+ url(r'^set/', include(patterns_set, namespace="set")),+ url(r'^session/', include(patterns_session, namespace="session")),+ url(r'^schedule/', include(patterns_schedule, namespace="schedule")),+ url(r'^schedule/step/', include(patterns_step, namespace="step")),)\ No newline at end of filediff --git a/wger/manager/views/day.py b/wger/manager/views/day.pyindex 4e372f855..a26228349 100644--- a/wger/manager/views/day.py+++ b/wger/manager/views/day.py@@ -48,7 +48,7 @@ class DayView(WgerFormMixin):form_class = DayFormdef get_success_url(self):- return reverse('workout-view', kwargs={'id': self.object.training_id})+ return reverse('manager:workout:view', kwargs={'id': self.object.training_id})def get_form(self, form_class):'''@@ -83,7 +83,7 @@ class DayEditView(DayView, UpdateView):'''title = ugettext_lazy('Edit workout day')- form_action_urlname = 'day-edit'+ form_action_urlname = 'manager:day:edit'class DayCreateView(DayView, CreateView):@@ -104,7 +104,7 @@ class DayCreateView(DayView, CreateView):# Send some additional data to the templatedef get_context_data(self, **kwargs):context = super(DayCreateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('day-add',+ context['form_action'] = reverse('manager:day:add',kwargs={'workout_pk': self.kwargs['workout_pk']})return context@@ -117,7 +117,7 @@ def delete(request, pk):day = get_object_or_404(Day, pk=pk)if day.get_owner_object().user == request.user:day.delete()- return HttpResponseRedirect(reverse('workout-view', kwargs={'id': day.training_id}))+ return HttpResponseRedirect(reverse('manager:workout:view', kwargs={'id': day.training_id}))else:return HttpResponseForbidden()diff --git a/wger/manager/views/log.py b/wger/manager/views/log.pyindex e96bff19c..2a73282e4 100644--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@ -62,12 +62,12 @@ class WorkoutLogUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):'''model = WorkoutLogform_class = WorkoutLogForm- success_url = reverse_lazy('workout-calendar')+ success_url = reverse_lazy('manager:workout:calendar')login_required = Truedef get_context_data(self, **kwargs):context = super(WorkoutLogUpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('workout-log-edit', kwargs={'pk': self.object.id})+ context['form_action'] = reverse('manager:log:edit', kwargs={'pk': self.object.id})context['title'] = _(u'Edit log entry for %s') % self.object.exercise.namereturn context@@ -93,14 +93,14 @@ class WorkoutLogAddView(WgerFormMixin, CreateView, WgerPermissionMixin):def get_context_data(self, **kwargs):context = super(WorkoutLogAddView, self).get_context_data(**kwargs)- context['form_action'] = reverse('workout-log-add',+ context['form_action'] = reverse('manager:log:add',kwargs={'workout_pk': self.kwargs['workout_pk']})context['title'] = _('New log entry')return contextdef get_success_url(self):- return reverse('workout-log', kwargs={'pk': self.kwargs['workout_pk']})+ return reverse('manager:log:log', kwargs={'pk': self.kwargs['workout_pk']})def form_valid(self, form):'''@@ -119,9 +119,9 @@ class WorkoutLogDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):'''model = WorkoutLog- success_url = reverse_lazy('workout-calendar')+ success_url = reverse_lazy('manager:workout:calendar')title = ugettext_lazy('Delete workout log')- form_action_urlname = 'workout-log-delete'+ form_action_urlname = 'manager:log:delete'login_required = True@@ -215,7 +215,7 @@ def add(request, pk):instance.date = log_dateinstance.save()- return HttpResponseRedirect(reverse('workout-log', kwargs={'pk': day.training_id}))+ return HttpResponseRedirect(reverse('manager:log:log', kwargs={'pk': day.training_id}))else:# Initialise the formset with a queryset that won't return any objects# (we only add new logs here and that seems to be the fastest way)@@ -245,7 +245,7 @@ def add(request, pk):template_data['formset'] = formsettemplate_data['dateform'] = dateformtemplate_data['session_form'] = session_form- template_data['form_action'] = reverse('day-log', kwargs={'pk': pk})+ template_data['form_action'] = reverse('manager:day:log', kwargs={'pk': pk})return render(request, 'day/log.html', template_data)@@ -327,7 +327,7 @@ class WorkoutCalendar(HTMLCalendar):body = []for log in self.workout_logs[day]:- url = reverse('workout-log', kwargs={'pk': log.workout_id})+ url = reverse('manager:log:log', kwargs={'pk': log.workout_id})formatted_date = date_obj.strftime('%Y-%m-%d')body.append('<a href="{0}" data-log="log-{1}">'.format(url, formatted_date))body.append(repr(day))diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.pyindex 9e5072281..042d228f7 100644--- a/wger/manager/views/schedule.py+++ b/wger/manager/views/schedule.py@@ -78,9 +78,9 @@ class ScheduleCreateView(WgerFormMixin, CreateView, WgerPermissionMixin):'''model = Schedule- success_url = reverse_lazy('schedule-overview')+ success_url = reverse_lazy('manager:schedule:overview')title = ugettext_lazy('Create schedule')- form_action = reverse_lazy('schedule-add')+ form_action = reverse_lazy('manager:schedule:add')login_required = Truedef form_valid(self, form):@@ -89,7 +89,7 @@ class ScheduleCreateView(WgerFormMixin, CreateView, WgerPermissionMixin):return super(ScheduleCreateView, self).form_valid(form)def get_success_url(self):- return reverse_lazy('schedule-view', kwargs={'pk': self.object.id})+ return reverse_lazy('manager:schedule:view', kwargs={'pk': self.object.id})class ScheduleDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):@@ -98,9 +98,9 @@ class ScheduleDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):'''model = Schedule- success_url = reverse_lazy('schedule-overview')+ success_url = reverse_lazy('manager:schedule:overview')title = ugettext_lazy('Delete schedule')- form_action_urlname = 'schedule-delete'+ form_action_urlname = 'manager:schedule:delete'messages = ugettext_lazy('Schedule was successfully deleted')login_required = True@@ -112,5 +112,5 @@ class ScheduleEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):model = Scheduletitle = ugettext_lazy('Edit schedule')- form_action_urlname = 'schedule-edit'+ form_action_urlname = 'manager:schedule:edit'login_required = Truediff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.pyindex b231ad4a7..976a12151 100644--- a/wger/manager/views/schedule_step.py+++ b/wger/manager/views/schedule_step.py@@ -66,12 +66,12 @@ class StepCreateView(WgerFormMixin, CreateView, WgerPermissionMixin):def get_context_data(self, **kwargs):context = super(StepCreateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('step-add',+ context['form_action'] = reverse('manager:step:add',kwargs={'schedule_pk': self.kwargs['schedule_pk']})return contextdef get_success_url(self):- return reverse('schedule-view', kwargs={'pk': self.kwargs['schedule_pk']})+ return reverse('manager:schedule:view', kwargs={'pk': self.kwargs['schedule_pk']})def form_valid(self, form):'''Set the schedule and the order'''@@ -91,7 +91,7 @@ class StepEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):model = ScheduleSteptitle = ugettext_lazy('Edit workout')- form_action_urlname = 'step-edit'+ form_action_urlname = 'manager:step:edit'login_required = Truedef get_form_class(self):@@ -112,7 +112,7 @@ class StepEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):return StepFormdef get_success_url(self):- return reverse('schedule-view', kwargs={'pk': self.object.schedule_id})+ return reverse('manager:schedule:view', kwargs={'pk': self.object.schedule_id})class StepDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):@@ -122,9 +122,9 @@ class StepDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):model = ScheduleSteptitle = ugettext_lazy('Delete workout')- form_action_urlname = 'step-delete'+ form_action_urlname = 'manager:step:delete'messages = ugettext_lazy('Workout was successfully deleted')login_required = Truedef get_success_url(self):- return reverse('schedule-view', kwargs={'pk': self.object.schedule.id})+ return reverse('manager:schedule:view', kwargs={'pk': self.object.schedule.id})diff --git a/wger/manager/views/set.py b/wger/manager/views/set.pyindex 83473ba0e..3283d618e 100644--- a/wger/manager/views/set.py+++ b/wger/manager/views/set.py@@ -110,7 +110,7 @@ def create(request, day_pk):instance.exercise = formset['exercise']instance.save()- return HttpResponseRedirect(reverse('workout-view',+ return HttpResponseRedirect(reverse('manager:workout:view',kwargs={'id': day.get_owner_object().id}))else:logger.debug(form.errors)@@ -120,7 +120,7 @@ def create(request, day_pk):context['day'] = daycontext['max_sets'] = Set.MAX_SETScontext['formsets'] = formsets- context['form_action'] = reverse('set-add', kwargs={'day_pk': day_pk})+ context['form_action'] = reverse('manager:set:add', kwargs={'day_pk': day_pk})context['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'return render(request, 'set/add.html', context)@@ -157,7 +157,7 @@ def delete(request, pk):# Check if the user is the owner of the objectif set_obj.get_owner_object().user == request.user:set_obj.delete()- return HttpResponseRedirect(reverse('workout-view',+ return HttpResponseRedirect(reverse('manager:workout:view',kwargs={'id': set_obj.get_owner_object().id}))else:return HttpResponseForbidden()@@ -212,11 +212,11 @@ def edit(request, pk):instance.exercise = formset['exercise']instance.save()- return HttpResponseRedirect(reverse('workout-view',+ return HttpResponseRedirect(reverse('manager:workout:view',kwargs={'id': set_obj.get_owner_object().id}))# Other context we needcontext = {}context['formsets'] = formsets- context['form_action'] = reverse('set-edit', kwargs={'pk': pk})+ context['form_action'] = reverse('manager:set:edit', kwargs={'pk': pk})return render(request, 'set/edit.html', context)diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex ba8f712c2..eea29a037 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -160,7 +160,7 @@ def copy_workout(request, pk):setting_copy.set = current_set_copysetting_copy.save()- return HttpResponseRedirect(reverse('workout-view',+ return HttpResponseRedirect(reverse('manager:workout:view',kwargs={'id': workout.id}))else:workout_form = WorkoutCopyForm({'comment': workout.comment})@@ -169,7 +169,7 @@ def copy_workout(request, pk):template_data.update(csrf(request))template_data['title'] = _('Copy workout')template_data['form'] = workout_form- template_data['form_action'] = reverse('workout-copy', kwargs={'pk': workout.id})+ template_data['form_action'] = reverse('manager:workout:copy', kwargs={'pk': workout.id})template_data['form_fields'] = [workout_form['comment']]template_data['submit_text'] = _('Copy')template_data['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'@@ -186,7 +186,7 @@ def add(request):workout.user = request.userworkout.save()- return HttpResponseRedirect(reverse('workout-view', kwargs={'id': workout.id}))+ return HttpResponseRedirect(reverse('manager:workout:view', kwargs={'id': workout.id}))class WorkoutDeleteView(WgerDeleteMixin, DeleteView):@@ -195,14 +195,14 @@ class WorkoutDeleteView(WgerDeleteMixin, DeleteView):'''model = Workout- success_url = reverse_lazy('workout-overview')+ success_url = reverse_lazy('manager:workout:overview')title = ugettext_lazy('Delete workout')messages = ugettext_lazy('Workout was successfully deleted')login_required = Truedef get_context_data(self, **kwargs):context = super(WorkoutDeleteView, self).get_context_data(**kwargs)- context['form_action'] = reverse('workout-delete', kwargs={'pk': self.object.id})+ context['form_action'] = reverse('manager:workout:delete', kwargs={'pk': self.object.id})return context@@ -215,7 +215,7 @@ class WorkoutEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):model = Workoutform_class = WorkoutFormtitle = ugettext_lazy('Edit workout')- form_action_urlname = 'workout-edit'+ form_action_urlname = 'manager:workout:edit'login_required = True@@ -321,11 +321,11 @@ def timer(request, day_pk):# the current one or create a new one (this will be the most usual case)if WorkoutSession.objects.filter(user=request.user, date=datetime.date.today()).exists():session = WorkoutSession.objects.get(user=request.user, date=datetime.date.today())- url = reverse('workout-session-edit', kwargs={'pk': session.pk})+ url = reverse('manager:session:edit', kwargs={'pk': session.pk})session_form = WorkoutSessionHiddenFieldsForm(instance=session)else:today = datetime.date.today()- url = reverse('workout-session-add', kwargs={'workout_pk': day.training_id,+ url = reverse('manager:session:add', kwargs={'workout_pk': day.training_id,'year': today.year,'month': today.month,'day': today.day})diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.pyindex 31f45e588..1d39746f7 100644--- a/wger/manager/views/workout_session.py+++ b/wger/manager/views/workout_session.py@@ -49,13 +49,13 @@ class WorkoutSessionUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):def get_context_data(self, **kwargs):context = super(WorkoutSessionUpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('workout-session-edit', kwargs={'pk': self.object.id})+ context['form_action'] = reverse('manager:session:edit', kwargs={'pk': self.object.id})context['title'] = _('Edit workout impression for {0}').format(self.object.date)return contextdef get_success_url(self):- return reverse('workout-calendar')+ return reverse('manager:workout:calendar')class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):@@ -95,7 +95,7 @@ class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):def get_context_data(self, **kwargs):context = super(WorkoutSessionAddView, self).get_context_data(**kwargs)- context['form_action'] = reverse('workout-session-add',+ context['form_action'] = reverse('manager:session:add',kwargs={'workout_pk': self.kwargs['workout_pk'],'year': self.kwargs['year'],'month': self.kwargs['month'],@@ -104,7 +104,7 @@ class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):return contextdef get_success_url(self):- return reverse('workout-calendar')+ return reverse('manager:workout:calendar')def form_valid(self, form):'''diff --git a/wger/urls.py b/wger/urls.pyindex 3368a4327..cd7b2fdcf 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -132,7 +132,7 @@ sitemaps = {'exercises': ExercisesSitemap,urlpatterns = i18n_patterns('',url(r'^admin/', include(admin.site.urls)),url(r'^', include('wger.core.urls', namespace='core', app_name='core')),- url(r'^', include('wger.manager.urls')),+ url(r'workout/', include('wger.manager.urls', namespace='manager')),url(r'exercise/', include('wger.exercises.urls', namespace='exercise')),url(r'weight/', include('wger.weight.urls')),url(r'nutrition/', include('wger.nutrition.urls', namespace='nutrition')),diff --git a/wger/utils/tests/test_middleware.py b/wger/utils/tests/test_middleware.pyindex ca2129005..ea764032e 100644--- a/wger/utils/tests/test_middleware.py+++ b/wger/utils/tests/test_middleware.py@@ -30,10 +30,10 @@ class RobotsExclusionMiddlewareTestCase(WorkoutManagerTestCase):response = self.client.get(reverse('core:dashboard'))self.assertTrue(response.get('X-Robots-Tag'))- response = self.client.get(reverse('workout-overview'))+ response = self.client.get(reverse('manager:workout:overview'))self.assertTrue(response.get('X-Robots-Tag'))- response = self.client.get(reverse('schedule-overview'))+ response = self.client.get(reverse('manager:schedule:overview'))self.assertTrue(response.get('X-Robots-Tag'))response = self.client.get(reverse('core:feedback'))diff --git a/wger/weight/helpers.py b/wger/weight/helpers.pyindex 1b8f849bb..9af685dc3 100644--- a/wger/weight/helpers.py+++ b/wger/weight/helpers.py@@ -93,7 +93,7 @@ def process_log_entries(logs):reps_list = {}for entry in logs:temp = {'date': '%s' % entry.date,- 'id': 'workout-log-%s' % entry.id}+ 'id': 'manager:workout:log-%s' % entry.id}# Only unique date, rep and weight combinationsif reps_list.get('{0}-{1}-{2}'.format(entry.date, entry.reps, entry.weight)):