summaryrefslogtreecommitdiffstats
path: root/templates/authopenid
diff options
context:
space:
mode:
authorhrcerqueira <hrcerqueira@gmail.com>2010-01-22 20:55:07 +0000
committerhrcerqueira <hrcerqueira@gmail.com>2010-01-22 20:55:07 +0000
commitc4ed047a3b2248aa7544df02f9d1bceaeb8d633c (patch)
treeadae918a2b74fbce5b25be614234727c93cf431d /templates/authopenid
parentd305ad98090558eb872c97f69addd2163f8ba5bd (diff)
downloadaskbot-c4ed047a3b2248aa7544df02f9d1bceaeb8d633c.tar.gz
askbot-c4ed047a3b2248aa7544df02f9d1bceaeb8d633c.tar.bz2
askbot-c4ed047a3b2248aa7544df02f9d1bceaeb8d633c.zip
Handled the returning user case, and the proper redirects in the case of an anonymous question or answer.
Diffstat (limited to 'templates/authopenid')
-rw-r--r--templates/authopenid/complete.html2
-rwxr-xr-xtemplates/authopenid/signin.html10
2 files changed, 10 insertions, 2 deletions
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index efed74c7..1606cfc5 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -72,7 +72,7 @@ parameters:
<form name="fregister" action="{% url user_register %}" method="POST">
{% else %}
{% ifequal login_type 'facebook' %}
- <form name="fregister" action="{% url fb_user_register %}" method="POST">
+ <form name="fregister" action="" method="POST">
{% else %}
<form name="fregister" action="{% url user_signin %}" method="POST">
{% endifequal %}
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index da1e5491..3d20d408 100755
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -64,7 +64,15 @@
</div>
</li>
<li title="Facebook Connect">
- <fb:login-button onlogin="window.location = '{% url fb_signin %}'"></fb:login-button>
+ {% if question %}
+ <fb:login-button onlogin="window.location = '{% url fb_signin_new_question %}'"></fb:login-button>
+ {% else %}
+ {% if answer %}
+ <fb:login-button onlogin="window.location = '{% url fb_signin_new_answer %}'"></fb:login-button>
+ {% else %}
+ <fb:login-button onlogin="window.location = '{% url fb_signin %}'"></fb:login-button>
+ {% endif %}
+ {% endif %}
</li>
</ul>
<ul class="providers">