resolves the issue with the email link markdown processing

[osqa.git] / forum_modules / facebookauth / templates / button.html

diff --git a/forum_modules/facebookauth/templates/button.html b/forum_modules/facebookauth/templates/button.html
old mode 100755 (executable)
new mode 100644 (file)
index ceae1fc..a634d1d
--- a/forum_modules/facebookauth/templates/button.html
+++ b/forum_modules/facebookauth/templates/button.html
@@ -1,38 +1,31 @@
-<script src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US" type="text/javascript"></script>\r
-<script type="text/javascript">\r
-    var FB_API_KEY = "{{ provider.API_KEY }}";\r
-    var FB_CHANNEL_PATH = "{% url  xd_receiver %}";\r
+{% load extra_tags %}\r

 \r
 \r

-    FB.init(FB_API_KEY, FB_CHANNEL_PATH, {permsToRequestOnConnect : "email"});\r
-\r
-    function FB_ConnectPostAuthorization() {\r
-        if ($('#validate_email').attr('checked')) {\r
-            FB_RequireFeatures(["Api"], function(){\r
-                var api = FB.Facebook.apiClient;\r
-                var fb_uid = api.get_session().uid;\r
-\r
-                $.post('{% url  facebook_user_is_registered %}', {'fb_uid': fb_uid}, function(response) {\r
-                    if (response != "yes") {\r
-                        api.users_hasAppPermission("email", function(result) {\r
-                            if (!result) {\r
-                                FB.Connect.showPermissionDialog("email", redirect_to_done_page);\r
-                            } else {\r
-                                redirect_to_done_page()\r
-                            }\r
-                        })\r
+<div id="fb-root"></div>\r
+<script src="http://connect.facebook.net/en_US/all.js"></script>\r
+<script>\r
+    function check_login_status() {\r
+        var FB_API_KEY = "{{ provider.API_KEY }}";\r
+        FB.init({\r
+            appId:FB_API_KEY, cookie:true,\r
+            status:true, xfbml:true\r
+        });\r
+        FB.getLoginStatus(function(response) {\r
+            if (response.session) {\r
+                redirect_to_done_page();\r
+            } else {\r
+                FB.login(function(response) {\r
+                    if (response.session) {\r
+                      redirect_to_done_page();\r

                     } else {\r
                     } else {\r

-                        redirect_to_done_page()\r
+                      // user cancelled login\r

                     }\r
                     }\r

-                });\r
-            });\r
-        } else {\r
-            redirect_to_done_page();\r
-        }\r
+                }, {perms:'email'});\r
+            }\r
+        });\r

     }\r
 \r
     function redirect_to_done_page() {\r
         window.location = "{% url auth_provider_done provider=provider.id %}";\r
     }\r
     }\r
 \r
     function redirect_to_done_page() {\r
         window.location = "{% url auth_provider_done provider=provider.id %}";\r
     }\r

-\r

 </script>\r
 </script>\r

-<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>\r