diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-06-26 12:04:45 -0700 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-03 15:07:39 -0500 |
| commit | 4f8f0a4e1f2d5a1eb64f47e62958d77bd12379f3 (patch) | |
| tree | 2aff43754fa275c2f60a6510f1d810d7b795bbbe /mediagoblin/plugins/openid | |
| parent | 41a14c6efc1dd9cfc36f1b2eb4cb3f3b34e4d975 (diff) | |
| download | mediagoblin-4f8f0a4e1f2d5a1eb64f47e62958d77bd12379f3.tar.lz mediagoblin-4f8f0a4e1f2d5a1eb64f47e62958d77bd12379f3.tar.xz mediagoblin-4f8f0a4e1f2d5a1eb64f47e62958d77bd12379f3.zip | |
merge --squash persona branch to take care of a false merge commit in
the basic_auth branch that persona is forked from
Conflicts:
mediagoblin/templates/mediagoblin/auth/login.html
mediagoblin/templates/mediagoblin/auth/register.html
mediagoblin/templates/mediagoblin/edit/edit_account.html
These are commit messages from the squashed persona stuff:
- added tests and fixed minor errors
- fixed a redirect loop when only persona is enabled and accessing /auth/login
- moved persona.js to plugin's static dir
- fixes for add/remove persona emails
- add and remove personas
- working with multiple plugins
- working version
- switched to hidden form instead of ajax
- beginings
Diffstat (limited to 'mediagoblin/plugins/openid')
| -rw-r--r-- | mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html index 33df7200..604c4bec 100644 --- a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html +++ b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html @@ -44,6 +44,13 @@ {% trans %}Log in to create an account!{% endtrans %} </p> {% endif %} + {% if persona is defined %} + <p> + <a href="javascript:;" id="persona_login"> + {% trans %}Or login with Persona!{% endtrans %} + </a> + </p> + {% endif %} {% if pass_auth is defined %} <p> <a href="{{ request.urlgen('mediagoblin.auth.login') }}?{{ request.query_string }}"> |