Self hosted FLOSS fitness/workout, nutrition and weight tracker
Don't show the persona login buttons in the Amazon WebApp
Roland Geiderd7229dffc0b8
diff --git a/wger/manager/templates/mobile/user/login.html b/wger/manager/templates/mobile/user/login.htmlindex 30baa978f..d17b61292 100644--- a/wger/manager/templates/mobile/user/login.html+++ b/wger/manager/templates/mobile/user/login.html@@ -32,6 +32,7 @@</table></form>+{% if not is_amazon %}<div style="text-align:center;"><h3>— {% trans "or" %} —</h3><div style="padding-top:1em;"></div>@@ -50,7 +51,7 @@take a look at the <a href="https://login.persona.org/" target="_blank">thePersona website</a>.{% endblocktrans %}</p>-+{% endif %}{% endblock %}diff --git a/wger/manager/templates/user/login.html b/wger/manager/templates/user/login.htmlindex d8eee8d5a..636bd9672 100644--- a/wger/manager/templates/user/login.html+++ b/wger/manager/templates/user/login.html@@ -34,6 +34,7 @@</table></form>+{% if not is_amazon %}<div style="text-align:center;"><h3>— {% trans "or" %} —</h3><div style="padding-top:1em;"></div>@@ -52,7 +53,7 @@take a look at the <a href="https://login.persona.org/" target="_blank">thePersona website</a>.{% endblocktrans %}</p>-+{% endif %}{% endblock %}diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex 02772db1a..4e00855a6 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -15,6 +15,7 @@ from wger.manager.views.day import DayCreateViewfrom wger.manager.views import setfrom wger.manager.views import miscfrom wger.manager.views import ical+from wger.manager.views import userfrom wger.utils.constants import USER_TAB@@ -166,9 +167,7 @@ urlpatterns = urlpatterns + patterns('wger.manager.pdf',# (besides the templates)urlpatterns = urlpatterns + patterns('',url(r'^user/login$',- 'django.contrib.auth.views.login',- {'template_name': 'user/login.html',- 'extra_context': {'active_tab': USER_TAB}},+ user.login,name='login'),url(r'^user/password/change$',diff --git a/wger/manager/views/user.py b/wger/manager/views/user.pyindex 529a7fc5c..083e7ce97 100644--- a/wger/manager/views/user.py+++ b/wger/manager/views/user.py@@ -39,6 +39,8 @@ from wger.exercises.models import Languagefrom wger.manager.forms import UserPreferencesFormfrom wger.manager.forms import UserEmailFormfrom wger.manager.forms import RegistrationForm+from wger.utils.constants import USER_TAB+from wger.utils.user_agents import check_request_amazonlogger = logging.getLogger('wger.custom')@@ -48,8 +50,11 @@ def login(request):Small wrapper around the django login view'''+ context = {'is_amazon': check_request_amazon(request),+ 'active_tab': USER_TAB}return django_loginview(request,- template_name='user/login.html')+ template_name='user/login.html',+ extra_context=context)def logout(request):