X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7eca93637b2f696dcc140d36e44d5f4810346e2c..350cd92dbbaefd12c0df8336c19e5eb39f77640a:/forum_modules/facebookauth/templates/button.html

diff --git a/forum_modules/facebookauth/templates/button.html b/forum_modules/facebookauth/templates/button.html
index ceae1fc..ba03a30 100644
--- a/forum_modules/facebookauth/templates/button.html
+++ b/forum_modules/facebookauth/templates/button.html
@@ -1,38 +1,32 @@
-<script src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US" type="text/javascript"></script>
-<script type="text/javascript">
-    var FB_API_KEY = "{{ provider.API_KEY }}";
-    var FB_CHANNEL_PATH = "{% url  xd_receiver %}";
-
-    FB.init(FB_API_KEY, FB_CHANNEL_PATH, {permsToRequestOnConnect : "email"});
+{% load extra_tags %}
 
-    function FB_ConnectPostAuthorization() {
-        if ($('#validate_email').attr('checked')) {
-            FB_RequireFeatures(["Api"], function(){
-                var api = FB.Facebook.apiClient;
-                var fb_uid = api.get_session().uid;
+<div id="fb-root"></div>
+<script src="http://connect.facebook.net/en_US/all.js"></script>
+<script>
+    var FB_API_KEY = "{{ provider.API_KEY }}";
+    FB.init({
+        appId:FB_API_KEY, cookie:true,
+        status:true, xfbml:true
+    });
 
-                $.post('{% url  facebook_user_is_registered %}', {'fb_uid': fb_uid}, function(response) {
-                    if (response != "yes") {
-                        api.users_hasAppPermission("email", function(result) {
-                            if (!result) {
-                                FB.Connect.showPermissionDialog("email", redirect_to_done_page);
-                            } else {
-                                redirect_to_done_page()
-                            }
-                        })
+    function check_login_status() {
+        FB.getLoginStatus(function(response) {
+            if (response.session) {
+                redirect_to_done_page();
+            } else {
+                FB.login(function(response) {
+                    if (response.session) {
+                      redirect_to_done_page();
                     } else {
-                        redirect_to_done_page()
+                      // user cancelled login
                     }
                 });
-            });
-        } else {
-            redirect_to_done_page();
-        }
+            }
+        });
     }
 
     function redirect_to_done_page() {
         window.location = "{% url auth_provider_done provider=provider.id %}";
     }
-
 </script>
-<fb:login-button v="2" size="medium" onlogin="FB_ConnectPostAuthorization()">Facebook</fb:login-button>
\ No newline at end of file
+<a style="position: relative; top: -8px;" href="javascript:void(0);" onclick="check_login_status()" perms="email"><img src="{% media '/media/images/openid/facebook.gif' %}" /></a>