diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-11-29 02:27:07 -0500 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-11-29 02:27:07 -0500 |
| commit | 4a0ffab2f31062881bd768618a23908e225e067f (patch) | |
| tree | 21f9653e445f8c39a12c4b39cae9f4f9d62adee4 /askbot | |
| parent | 03fce81968ec106a510f2737de35d849e7b37e95 (diff) | |
| download | askbot-4a0ffab2f31062881bd768618a23908e225e067f.tar.gz askbot-4a0ffab2f31062881bd768618a23908e225e067f.tar.bz2 askbot-4a0ffab2f31062881bd768618a23908e225e067f.zip | |
prevented problems with FB connect from breaking other login methods, hopefully
Diffstat (limited to 'askbot')
| -rw-r--r-- | askbot/skins/default/templates/authopenid/signin.html | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/askbot/skins/default/templates/authopenid/signin.html b/askbot/skins/default/templates/authopenid/signin.html index 621cfdad..686068b0 100644 --- a/askbot/skins/default/templates/authopenid/signin.html +++ b/askbot/skins/default/templates/authopenid/signin.html @@ -240,6 +240,40 @@ </div>
{% endblock%}
{% block endjs %}
+ <script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>
+ <script type="text/javascript" src="{{"/jquery-openid/jquery.openid.js"|media}}"></script>
+ <script type="text/javascript">
+ var extra_token_name = {};
+ var create_pw_text = {};
+ var change_pw_text = {};
+ var authUrl = '/{% trans %}account/{% endtrans %}';
+ var siteName = '{{settings.APP_SHORT_NAME}}';
+ var provider_count = {{existing_login_methods|length}};
+ {% for login_provider in major_login_providers %}
+ {% if login_provider.extra_token_name %}
+ extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';
+ {% endif %}
+ {% if login_provider.type == 'password' %}
+ create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';
+ change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';
+ {% endif %}
+ {% endfor %}
+ {% for login_provider in minor_login_providers %}
+ {% if login_provider.extra_token_name %}
+ extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';
+ {% endif %}
+ {% if login_provider.type == 'password' %}
+ create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';
+ change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';
+ {% endif %}
+ {% endfor %}
+ {% if user.is_authenticated() %}
+ var userIsAuthenticated = true;
+ {% else %}
+ var userIsAuthenticated = false;
+ {% endif %}
+ $("body").authenticator();
+ </script>
{% if settings.FACEBOOK_KEY and settings.FACEBOOK_SECRET %}
<div id="fb-root"></div>
<script src="http://connect.facebook.net/en_US/all.js"></script>
@@ -259,39 +293,5 @@ });
</script>
{% endif %}
- <script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>
- <script type="text/javascript" src="{{"/jquery-openid/jquery.openid.js"|media}}"></script>
- <script type="text/javascript">
- $(document).ready( function() { $("body").authenticator(); })
- var extra_token_name = {};
- var create_pw_text = {};
- var change_pw_text = {};
- var authUrl = '/{% trans %}account/{% endtrans %}';
- var siteName = '{{settings.APP_SHORT_NAME}}';
- var provider_count = {{existing_login_methods|length}};
- {% for login_provider in major_login_providers %}
- {% if login_provider.extra_token_name %}
- extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';
- {% endif %}
- {% if login_provider.type == 'password' %}
- create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';
- change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';
- {% endif %}
- {% endfor %}
- {% for login_provider in minor_login_providers %}
- {% if login_provider.extra_token_name %}
- extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';
- {% endif %}
- {% if login_provider.type == 'password' %}
- create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';
- change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';
- {% endif %}
- {% endfor %}
- {% if user.is_authenticated() %}
- var userIsAuthenticated = true;
- {% else %}
- var userIsAuthenticated = false;
- {% endif %}
- </script>
{% endblock %}
<!-- end signin.html -->
|