Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

upgrade use of django-browserid (step 1) #144

Closed
wants to merge 1 commit into from

2 participants

@peterbe
Owner

For @Osmose's eyes only so far.

@willkg willkg commented on the diff
project/settings/local.py-dist
@@ -44,9 +44,9 @@ DEBUG = TEMPLATE_DEBUG = True
# instances and False on stage/prod.
DEV = True
-# By default, BrowserID expects your app to use http://127.0.0.1:8000
+# By default, BrowserID expects your app to use http://localhost:8000
# Uncomment the following line if you prefer to access your app via localhost
@willkg Owner
willkg added a note

I think you need to update this line to "Uncomment the following line if you prefer to access your app via 127.0.0.1."

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@peterbe
Owner

This is mucho too old and has gone awry for a merge anyway.

@peterbe peterbe closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 14, 2012
  1. @peterbe
This page is out of date. Refresh to see the latest.
View
8 project/examples/templates/examples/home.html
@@ -9,7 +9,7 @@
<p>{{ _('You are logged in as {username}')|f(username=request.user) }}.
<a href="{{ url('examples.logout') }}">{{ _('Log out') }}</a></p>
{% else %}
- <p><a id="browserid" href="#">{{ _('Log in with BrowserID') }}</a></p>
+ <p><a class="browserid-login" href="#">{{ _('Log in with BrowserID') }}</a></p>
<form method="POST" action="{{ url('browserid_verify') }}">
{{ csrf() }}
{{ browserid_form.as_p() }}
@@ -40,11 +40,7 @@
</ul>
{% endblock %}
{% block site_js %}
- {% compress js %}
- <script src="{{ static('examples/js/libs/jquery-1.4.4.min.js') }}"></script>
- <script src="{{ static('examples/js/libs/jquery.cookie.js') }}"></script>
- <script src="{{ static('examples/js/init.js') }}"></script>
- {% endcompress %}
+ {{ super() }}
{% if not request.user.is_active %}
{{ browserid_form.media }}
{% endif %}
View
3  project/settings/base.py
@@ -38,8 +38,7 @@
SITE_URL = 'http://127.0.0.1:8000'
LOGIN_URL = '/'
-LOGIN_REDIRECT_URL = 'examples.home'
-LOGIN_REDIRECT_URL_FAILURE = 'examples.home'
+LOGIN_REDIRECT_URL = '/'
TEMPLATE_CONTEXT_PROCESSORS = list(TEMPLATE_CONTEXT_PROCESSORS) + [
'django_browserid.context_processors.browserid_form',
View
4 project/settings/local.py-dist
@@ -44,9 +44,9 @@ DEBUG = TEMPLATE_DEBUG = True
# instances and False on stage/prod.
DEV = True
-# By default, BrowserID expects your app to use http://127.0.0.1:8000
+# By default, BrowserID expects your app to use http://localhost:8000
# Uncomment the following line if you prefer to access your app via localhost
@willkg Owner
willkg added a note

I think you need to update this line to "Uncomment the following line if you prefer to access your app via 127.0.0.1."

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
-# SITE_URL = 'http://localhost:8000'
+#SITE_URL = 'http://127.0.0.1:8000'
# Playdoh ships with Bcrypt+HMAC by default because it's the most secure.
# To use bcrypt, fill in a secret HMAC key. It cannot be blank.
Something went wrong with that request. Please try again.