Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Move views from 'misc' view to core

Roland Geider23ce63834015
diff --git a/wger/manager/templates/misc/about.html b/wger/core/templates/misc/about.html
similarity index 100%
rename from wger/manager/templates/misc/about.html
rename to wger/core/templates/misc/about.html
diff --git a/wger/manager/templates/misc/contact.html b/wger/core/templates/misc/contact.html
similarity index 100%
rename from wger/manager/templates/misc/contact.html
rename to wger/core/templates/misc/contact.html
diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.py
index cf559eb6a..caf1983f1 100644
--- a/wger/core/tests/test_temporary_users.py
+++ b/wger/core/tests/test_temporary_users.py
@@ -49,7 +49,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
Tests that the helper function creates demo data (workout, etc.)
for the demo users
'''
- self.client.get(reverse('dashboard'))
+ self.client.get(reverse('core:dashboard'))
self.assertEqual(self.count_temp_users(), 2)
user = User.objects.get(pk=4)
self.assertEqual(user.userprofile.is_temporary, True)
@@ -77,7 +77,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
Tests that the helper function that creates demo data filters out
existing dates for the weight entries
'''
- self.client.get(reverse('dashboard'))
+ self.client.get(reverse('core:dashboard'))
self.assertEqual(self.count_temp_users(), 2)
user = User.objects.get(pk=4)
@@ -116,12 +116,12 @@ class DemoUserTestCase(WorkoutManagerTestCase):
self.assertEqual(self.count_temp_users(), 1)
# These pages will create one
- self.client.get(reverse('dashboard'))
+ self.client.get(reverse('core:dashboard'))
self.assertEqual(self.count_temp_users(), 2)
# The new user is automatically logged in, so no new user is created
# after the first visit
- self.client.get(reverse('dashboard'))
+ self.client.get(reverse('core:dashboard'))
self.assertEqual(self.count_temp_users(), 2)
# Try some other pages
@@ -143,7 +143,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
'''
demo_notice_text = 'You are using a guest account'
self.user_login('demo')
- self.assertContains(self.client.get(reverse('dashboard')), demo_notice_text)
+ self.assertContains(self.client.get(reverse('core:dashboard')), demo_notice_text)
self.assertContains(self.client.get(reverse('workout-overview')),
demo_notice_text)
self.assertContains(self.client.get(reverse('exercise-overview')),
diff --git a/wger/manager/views/misc.py b/wger/core/views/misc.py
similarity index 96%
rename from wger/manager/views/misc.py
rename to wger/core/views/misc.py
index 56526aea6..fe8001e33 100644
--- a/wger/manager/views/misc.py
+++ b/wger/core/views/misc.py
@@ -49,7 +49,7 @@ def index(request):
Index page
'''
if request.user.is_authenticated():
- return HttpResponseRedirect(reverse('dashboard'))
+ return HttpResponseRedirect(reverse('core:dashboard'))
else:
return HttpResponseRedirect(reverse('software:features'))
@@ -73,7 +73,7 @@ def demo_entries(request):
'logs, (body) weight and nutrition plan entries so you can '
'better see what this site can do. Feel free to edit or '
'delete them!'))
- return HttpResponseRedirect(reverse('dashboard'))
+ return HttpResponseRedirect(reverse('core:dashboard'))
@login_required
@@ -138,7 +138,7 @@ class ContactClassView(TemplateView):
context = super(ContactClassView, self).get_context_data(**kwargs)
context.update({'contribute': reverse('software:contribute'),
'issues': reverse('software:issues'),
- 'feedback': reverse('feedback')})
+ 'feedback': reverse('core:feedback')})
return context
@@ -153,7 +153,7 @@ class FeedbackClass(FormView):
context = super(FeedbackClass, self).get_context_data(**kwargs)
context['title'] = _('Feedback')
context['form_fields'] = kwargs['form']
- context['form_action'] = reverse('feedback')
+ context['form_action'] = reverse('core:feedback')
context['submit_text'] = _('Send')
context['contribute_url'] = reverse('software:contribute')
return context
diff --git a/wger/manager/templates/mobile/day/log.html b/wger/manager/templates/mobile/day/log.html
index a81b377b8..9bce391d9 100644
--- a/wger/manager/templates/mobile/day/log.html
+++ b/wger/manager/templates/mobile/day/log.html
@@ -81,7 +81,7 @@ $(document).ready(function () {
<p>
- <a href="{% url 'index' %}"
+ <a href="{% url 'core:index' %}"
data-role="button"
data-rel="back"
data-mini="true">{% trans "Cancel" %}</a>
diff --git a/wger/manager/templates/mobile/delete.html b/wger/manager/templates/mobile/delete.html
index 2f85e2f2c..ce30c3c90 100644
--- a/wger/manager/templates/mobile/delete.html
+++ b/wger/manager/templates/mobile/delete.html
@@ -24,7 +24,7 @@
<p>{% trans "Are you sure you want to delete this? This action cannot be undone." %}</p>
<p>{{ delete_message }}</p>
<p>
- <a href="{% url 'index' %}"
+ <a href="{% url 'core:index' %}"
data-role="button"
data-rel="back"
data-mini="true">{% trans "Cancel" %}</a>
diff --git a/wger/manager/templates/mobile/form.html b/wger/manager/templates/mobile/form.html
index 5a3d55427..ad46e99dd 100644
--- a/wger/manager/templates/mobile/form.html
+++ b/wger/manager/templates/mobile/form.html
@@ -46,7 +46,7 @@
{% endfor %}
<tr>
<td colspan="2">
- <a href="{% url 'index' %}"
+ <a href="{% url 'core:index' %}"
data-role="button"
data-rel="back"
data-mini="true">{% trans "Cancel" %}</a>
diff --git a/wger/manager/templates/mobile/index.html b/wger/manager/templates/mobile/index.html
index 280cad6ce..dc5afbe00 100644
--- a/wger/manager/templates/mobile/index.html
+++ b/wger/manager/templates/mobile/index.html
@@ -242,7 +242,7 @@ its default duration in your settings.{% endblocktrans %}
</a>
</div>
<div class="ui-block-b">
- <a href="{% url 'contact' %}" data-role="button">
+ <a href="{% url 'core:contact' %}" data-role="button">
<img src="{% static 'images/icons/mail.svg' %}"
width="32"
height="32"
diff --git a/wger/manager/templates/mobile/navigation.html b/wger/manager/templates/mobile/navigation.html
index ede14bc21..77deaae81 100644
--- a/wger/manager/templates/mobile/navigation.html
+++ b/wger/manager/templates/mobile/navigation.html
@@ -21,7 +21,7 @@
<a href="#" data-rel="close">{% trans "Close" %}</a>
</li>
<li data-theme="c" style="margin-top:1.5em;">
- <a href="{% url 'index' %}">{% trans "Dashboard" %}</a>
+ <a href="{% url 'core:index' %}">{% trans "Dashboard" %}</a>
</li>
</ul>
@@ -130,8 +130,8 @@
{% endif %}
{# Contact #}
- <li><a href="{% url 'contact' %}">{% trans "Get in touch" %}</a></li>
- <li><a href="{% url 'about' %}">{% trans "About" %}</a></li>
+ <li><a href="{% url 'core:contact' %}">{% trans "Get in touch" %}</a></li>
+ <li><a href="{% url 'core:about' %}">{% trans "About" %}</a></li>
{# Site version #}
<li><a href="?flavour=full" data-ajax="false">{% trans "Desktop version" %}</a></li>
diff --git a/wger/manager/templates/mobile/set/add.html b/wger/manager/templates/mobile/set/add.html
index 60ee6dfd4..5ae761f95 100644
--- a/wger/manager/templates/mobile/set/add.html
+++ b/wger/manager/templates/mobile/set/add.html
@@ -72,7 +72,7 @@ automatically becomes "4 x 10".{% endblocktrans %}</p>
</tr>
<tr>
<td colspan="2">
- <a href="{% url 'index' %}"
+ <a href="{% url 'core:index' %}"
data-role="button"
data-rel="back"
data-mini="true">{% trans "Cancel" %}</a>
diff --git a/wger/manager/templates/mobile/set/edit.html b/wger/manager/templates/mobile/set/edit.html
index 605466ddc..b261a4bb9 100644
--- a/wger/manager/templates/mobile/set/edit.html
+++ b/wger/manager/templates/mobile/set/edit.html
@@ -34,7 +34,7 @@
</tr>
<tr>
<td colspan="2">
- <a href="{% url 'index' %}"
+ <a href="{% url 'core:index' %}"
data-role="button"
data-rel="back"
data-mini="true">{% trans "Cancel" %}</a>
diff --git a/wger/manager/templates/mobile/template.html b/wger/manager/templates/mobile/template.html
index 57d723920..9e5c19b92 100644
--- a/wger/manager/templates/mobile/template.html
+++ b/wger/manager/templates/mobile/template.html
@@ -73,7 +73,7 @@
data-theme="c"
data-ajax="false">{% trans "Register" %} »</a>
{% if not has_demo_data %}
- <a href="{% url 'demo-entries' %}"
+ <a href="{% url 'core:demo-entries' %}"
rel="nofollow"
data-role="button"
data-mini="true"
@@ -119,7 +119,7 @@
{% if not user.is_authenticated %}
<a href="{% url 'login' %}" data-ajax="false">{% trans "Login" %}</a>
{% else %}
- <a href="{% url 'index' %}">{% trans "Dashboard" %}</a>
+ <a href="{% url 'core:index' %}">{% trans "Dashboard" %}</a>
{% endif %}
</li>
diff --git a/wger/manager/templates/mobile/user/preferences.html b/wger/manager/templates/mobile/user/preferences.html
index 15e2015e5..41cfa783f 100644
--- a/wger/manager/templates/mobile/user/preferences.html
+++ b/wger/manager/templates/mobile/user/preferences.html
@@ -46,7 +46,7 @@
</div>
</div>
- <a href="{% url 'index' %}"
+ <a href="{% url 'core:index' %}"
data-role="button"
data-rel="back"
data-mini="true">{% trans "Save" %}</a>
diff --git a/wger/manager/templates/navigation.html b/wger/manager/templates/navigation.html
index 780676ceb..bacbd42a4 100644
--- a/wger/manager/templates/navigation.html
+++ b/wger/manager/templates/navigation.html
@@ -14,7 +14,7 @@
{# #}
{# User tab #}
{# #}
- <li {% if active_tab == 'user' %}class="active"{% endif %}><a href="{% url 'index' %}">{% trans "Dashboard" %}</a></li>
+ <li {% if active_tab == 'user' %}class="active"{% endif %}><a href="{% url 'core:index' %}">{% trans "Dashboard" %}</a></li>
{# #}
diff --git a/wger/manager/templates/template.html b/wger/manager/templates/template.html
index ce2af6290..ff0c62432 100644
--- a/wger/manager/templates/template.html
+++ b/wger/manager/templates/template.html
@@ -109,7 +109,7 @@
<a href="{% url 'wger.manager.views.user.registration' %}">{% trans "Register" %}</a>
{% endif %}
|
- <a href="{% url 'contact' %}">{% trans "Get in touch" %}</a>
+ <a href="{% url 'core:contact' %}">{% trans "Get in touch" %}</a>
|
{# Render the links to the other languages #}
@@ -146,7 +146,7 @@
<div class="abox ainfo" style="padding:0.6em; margin: 0em 0em 1em 0em;text-align:center;font-size:95%;">
{% trans "You are using a guest account, data entered will be deleted after a week."%}
{% if not has_demo_data %}
- <a href="{% url 'demo-entries' %}" rel="nofollow" class="btn btn-success btn-small">{% trans "Create some demo entries" %} »</a>
+ <a href="{% url 'core:demo-entries' %}" rel="nofollow" class="btn btn-success btn-small">{% trans "Create some demo entries" %} »</a>
{% endif %}
</div>
{% endif %}
@@ -173,9 +173,9 @@
</div>
<div class="ym-g80 ym-gl">
<div class="ym-gbox-left">
- <a href="{% url 'about' %}">{% trans "About" %}</a>
+ <a href="{% url 'core:about' %}">{% trans "About" %}</a>
| <a href="{% url 'software:contribute' %}">{% trans "Contribute!" %}</a>
- | <a href="{% url 'contact' %}">{% trans "Get in touch" %}</a>
+ | <a href="{% url 'core:contact' %}">{% trans "Get in touch" %}</a>
| <a href="?flavour=mobile">{% trans "Mobile version" %}</a>
</div>
</div>
diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.html
index 0777945dc..c2b1ec341 100644
--- a/wger/manager/templates/workout/timer.html
+++ b/wger/manager/templates/workout/timer.html
@@ -454,7 +454,7 @@ $(document).ready(function() {
<div class="ui-grid-a bottom_buttons">
<div class="ui-block-a">
- <a href="{% url 'dashboard' %}"
+ <a href="{% url 'core:dashboard' %}"
class="wide_link"
data-role="button"
data-icon="arrow-r"
diff --git a/wger/manager/tests/test_feedback.py b/wger/manager/tests/test_feedback.py
index f28e16fab..bf9776913 100644
--- a/wger/manager/tests/test_feedback.py
+++ b/wger/manager/tests/test_feedback.py
@@ -28,9 +28,9 @@ class FeedbackTestCase(WorkoutManagerTestCase):
'''
Helper function
'''
- response = self.client.get(reverse('feedback'))
+ response = self.client.get(reverse('core:feedback'))
self.assertEqual(response.status_code, 200)
- response = self.client.post(reverse('feedback'),
+ response = self.client.post(reverse('core:feedback'),
{'comment': 'A very long and interesting comment'})
if logged_in:
self.assertEqual(response.status_code, 302)
@@ -39,7 +39,7 @@ class FeedbackTestCase(WorkoutManagerTestCase):
self.assertEqual(response.status_code, 200)
# Short comment
- response = self.client.post(reverse('feedback'), {'comment': '12345'})
+ response = self.client.post(reverse('core:feedback'), {'comment': '12345'})
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['form'].errors), 1)
else:
@@ -48,7 +48,7 @@ class FeedbackTestCase(WorkoutManagerTestCase):
self.assertEqual(len(mail.outbox), 0)
# Correctly filled in reCaptcha
- response = self.client.post(reverse('feedback'),
+ response = self.client.post(reverse('core:feedback'),
{'comment': 'A very long and interesting comment',
'recaptcha_response_field': 'PASSED'})
self.assertEqual(response.status_code, 302)
diff --git a/wger/manager/tests/test_index.py b/wger/manager/tests/test_index.py
index 0706dd365..556247203 100644
--- a/wger/manager/tests/test_index.py
+++ b/wger/manager/tests/test_index.py
@@ -32,7 +32,7 @@ class DashboardTestCase(WorkoutManagerTestCase):
Helper function to test the dashboard
'''
- response = self.client.get(reverse('index'))
+ response = self.client.get(reverse('core:index'))
# Everybody is redirected
self.assertEqual(response.status_code, 302)
@@ -42,7 +42,7 @@ class DashboardTestCase(WorkoutManagerTestCase):
Workout.objects.all().delete()
WeightEntry.objects.all().delete()
- response = self.client.get(reverse('dashboard'))
+ response = self.client.get(reverse('core:dashboard'))
# There is something to send to the template
self.assertEqual(response.status_code, 200)
self.assertFalse(response.context['weight'])
@@ -54,7 +54,7 @@ class DashboardTestCase(WorkoutManagerTestCase):
# 1. Add a workout
#
self.client.get(reverse('workout-add'))
- response = self.client.get(reverse('dashboard'))
+ response = self.client.get(reverse('core:dashboard'))
self.assertEqual(response.status_code, 200)
self.assertFalse(response.context['weight'])
@@ -66,7 +66,7 @@ class DashboardTestCase(WorkoutManagerTestCase):
# 2. Add a nutrition plan
#
self.client.get(reverse('nutrition-add'))
- response = self.client.get(reverse('dashboard'))
+ response = self.client.get(reverse('core:dashboard'))
self.assertEqual(response.status_code, 200)
self.assertFalse(response.context['weight'])
@@ -81,7 +81,7 @@ class DashboardTestCase(WorkoutManagerTestCase):
{'weight': 100,
'creation_date': '2012-01-01',
'user': 1},)
- response = self.client.get(reverse('dashboard'))
+ response = self.client.get(reverse('core:dashboard'))
self.assertEqual(response.status_code, 200)
self.assertTrue(response.context['weight'])
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index acd05cb42..2d6b3c044 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -1,7 +1,6 @@
from django.conf.urls import patterns, url
from django.contrib.auth.decorators import login_required
from django.core.urlresolvers import reverse_lazy
-from django.views.generic import TemplateView
from wger.manager.views import schedule
from wger.manager.views import schedule_step
@@ -12,7 +11,6 @@ from wger.manager.views.log import WorkoutLogAddView
from wger.manager.views.log import WorkoutLogUpdateView
from wger.manager.views.day import DayEditView
from wger.manager.views.day import DayCreateView
-from wger.manager.views import misc
from wger.manager.views import ical
from wger.manager.views import user
from wger.manager.views import workout
@@ -21,21 +19,9 @@ from wger.manager.views import set
from wger.manager.views import day
from wger.manager.views import workout_session
-from wger.utils.constants import USER_TAB
-
urlpatterns = patterns('wger.manager.views',
- # The landing page
- url(r'^$',
- misc.index,
- name='index'),
-
- # The dashboard
- url(r'^dashboard$',
- misc.dashboard,
- name='dashboard'),
-
# User
url(r'^user/logout$',
user.logout,
@@ -46,9 +32,6 @@ urlpatterns = patterns('wger.manager.views',
url(r'^user/preferences$',
user.preferences,
name='preferences'),
- url(r'^user/demo-entries$',
- misc.demo_entries,
- name='demo-entries'),
url(r'^user/api-key$',
user.api_key,
name='api-key'),
@@ -168,17 +151,6 @@ urlpatterns = patterns('wger.manager.views',
# AJAX
url(r'^workout/api/edit-set$', set.api_edit_set),
url(r'^workout/api/user-preferences$', user.api_user_preferences),
-
- # Others
- url(r'^about$',
- TemplateView.as_view(template_name="misc/about.html"),
- name='about'),
- url(r'^contact$',
- misc.ContactClassView.as_view(template_name="misc/contact.html"),
- name='contact'),
- url(r'^feedback$',
- misc.FeedbackClass.as_view(),
- name='feedback'),
)
# PDF stuff is in a different file
diff --git a/wger/manager/views/user.py b/wger/manager/views/user.py
index c93ee0e55..cd42f3564 100644
--- a/wger/manager/views/user.py
+++ b/wger/manager/views/user.py
@@ -79,7 +79,7 @@ def registration(request):
# Redirect regular users, in case they reached the registration page
if request.user.is_authenticated() and not request.user.userprofile.is_temporary:
- return HttpResponseRedirect(reverse('dashboard'))
+ return HttpResponseRedirect(reverse('core:dashboard'))
if request.method == 'POST':
form = FormClass(data=request.POST)
@@ -102,7 +102,7 @@ def registration(request):
user = authenticate(username=username, password=password)
django_login(request, user)
messages.success(request, _('You were successfully registered'))
- return HttpResponseRedirect(reverse('dashboard'))
+ return HttpResponseRedirect(reverse('core:dashboard'))
else:
form = FormClass()
diff --git a/wger/nutrition/templates/mobile/meal_item/edit.html b/wger/nutrition/templates/mobile/meal_item/edit.html
index da0aa8b32..7632b8183 100644
--- a/wger/nutrition/templates/mobile/meal_item/edit.html
+++ b/wger/nutrition/templates/mobile/meal_item/edit.html
@@ -49,7 +49,7 @@ $(document).ready(function() {
{% yaml_form_field form.weight_unit "ym-fbox-select" %}
<tr>
<td colspan="2">
- <a href="{% url 'index' %}"
+ <a href="{% url 'core:index' %}"
data-role="button"
data-rel="back"
data-mini="true">{% trans "Cancel" %}</a>
diff --git a/wger/software/templates/contribute.html b/wger/software/templates/contribute.html
index 19d9174ad..cb3b2bd67 100644
--- a/wger/software/templates/contribute.html
+++ b/wger/software/templates/contribute.html
@@ -52,7 +52,7 @@ ingredients, all released under a free license.{% endblocktrans %}</strong></p>
how useful it is! ;) . When you find something that you specially liked,
could need some improvements or just doesn't work, tell us! This might not sound
like much, but is incredibly important!{% endblocktrans %}</p>
-<a class="btn " href="{% url 'contact' %}">{% trans "Get in touch" %} »</a>
+<a class="btn " href="{% url 'core:contact' %}">{% trans "Get in touch" %} »</a>
</div>
diff --git a/wger/software/templates/mobile/contribute.html b/wger/software/templates/mobile/contribute.html
index 26f62bf44..a76788f3d 100644
--- a/wger/software/templates/mobile/contribute.html
+++ b/wger/software/templates/mobile/contribute.html
@@ -40,7 +40,7 @@ ingredients, all released under a free license.{% endblocktrans %}</strong></p>
how useful it is! ;) . When you find something that you specially liked,
could need some improvements or just doesn't work, tell us! This might not sound
like much, but is incredibly important!{% endblocktrans %}</p>
-<a data-role="button" href="{% url 'contact' %}">{% trans "Get in touch" %} »</a>
+<a data-role="button" href="{% url 'core:contact' %}">{% trans "Get in touch" %} »</a>
</div>
diff --git a/wger/utils/tests/test_middleware.py b/wger/utils/tests/test_middleware.py
index dc590fcd9..b69a7aebf 100644
--- a/wger/utils/tests/test_middleware.py
+++ b/wger/utils/tests/test_middleware.py
@@ -27,7 +27,7 @@ class RobotsExclusionMiddlewareTestCase(WorkoutManagerTestCase):
Test the middleware on URLs from manager app
'''
- response = self.client.get(reverse('dashboard'))
+ response = self.client.get(reverse('core:dashboard'))
self.assertTrue(response.get('X-Robots-Tag'))
response = self.client.get(reverse('workout-overview'))
@@ -36,10 +36,10 @@ class RobotsExclusionMiddlewareTestCase(WorkoutManagerTestCase):
response = self.client.get(reverse('schedule-overview'))
self.assertTrue(response.get('X-Robots-Tag'))
- response = self.client.get(reverse('feedback'))
+ response = self.client.get(reverse('core:feedback'))
self.assertTrue(response.get('X-Robots-Tag'))
- response = self.client.get(reverse('about'))
+ response = self.client.get(reverse('core:about'))
self.assertTrue(response.get('X-Robots-Tag'))
response = self.client.get(reverse('contact'))