diff options
author | hrcerqueira <hrcerqueira@gmail.com> | 2010-01-22 01:39:13 +0000 |
---|---|---|
committer | hrcerqueira <hrcerqueira@gmail.com> | 2010-01-22 01:39:13 +0000 |
commit | d305ad98090558eb872c97f69addd2163f8ba5bd (patch) | |
tree | 08472efc2490125d56c6dd3274f4e06fd2db147f /templates | |
parent | c18bda49f13afb4e2eaaf9ccb35098ee174e3afc (diff) | |
download | askbot-d305ad98090558eb872c97f69addd2163f8ba5bd.tar.gz askbot-d305ad98090558eb872c97f69addd2163f8ba5bd.tar.bz2 askbot-d305ad98090558eb872c97f69addd2163f8ba5bd.zip |
Handle the case were user logs in with facebook for the first time.
Diffstat (limited to 'templates')
-rw-r--r-- | templates/authopenid/complete.html | 8 | ||||
-rwxr-xr-x | templates/authopenid/signin.html | 2 | ||||
-rwxr-xr-x | templates/fbconnect/xd_receiver.html (renamed from templates/xd_receiver.html) | 0 |
3 files changed, 8 insertions, 2 deletions
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html index ce5fb7fe..efed74c7 100644 --- a/templates/authopenid/complete.html +++ b/templates/authopenid/complete.html @@ -34,6 +34,8 @@ parameters: {% else %} {% blocktrans %}register new external {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %} {% endif %} + {% else %} + {% blocktrans %}register new Facebook connect account info, see {{gravatar_faq_url}}{% endblocktrans %} {% endifequal %} {% endifequal %} </div> @@ -69,7 +71,11 @@ parameters: {% ifequal login_type 'openid' %} <form name="fregister" action="{% url user_register %}" method="POST"> {% else %} - <form name="fregister" action="{% url user_signin %}" method="POST"> + {% ifequal login_type 'facebook' %} + <form name="fregister" action="{% url fb_user_register %}" method="POST"> + {% else %} + <form name="fregister" action="{% url user_signin %}" method="POST"> + {% endifequal %} {% endifequal %} {{ form1.next }} <div class="form-row-vertical"> diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html index 3a12f1c6..da1e5491 100755 --- a/templates/authopenid/signin.html +++ b/templates/authopenid/signin.html @@ -64,7 +64,7 @@ </div>
</li>
<li title="Facebook Connect">
- <fb:login-button onlogin="window.location.reload(true)"></fb:login-button>
+ <fb:login-button onlogin="window.location = '{% url fb_signin %}'"></fb:login-button>
</li>
</ul>
<ul class="providers">
diff --git a/templates/xd_receiver.html b/templates/fbconnect/xd_receiver.html index c67c57b7..c67c57b7 100755 --- a/templates/xd_receiver.html +++ b/templates/fbconnect/xd_receiver.html |