Skip to content

Commit

Permalink
nu-5 BUGFIX facebook app id
Browse files Browse the repository at this point in the history
  • Loading branch information
wjdp committed Sep 28, 2014
1 parent 14e35ae commit f871746
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion xSACdb/version.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Version file, currently manually updated

VERSION = {
'tag': 'nu-4',
'tag': 'nu-5',
'last_updated': '2014-09-28',
}
19 changes: 10 additions & 9 deletions xsd_frontend/templates/frontend_login.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,17 @@
<script src="/static/js/facebook.js" type="text/javascript"></script>
<div id="fb-root"></div>
<!--Some facebook code requires the fb-root div -->
{% include 'django_facebook/_facebook_js.html' %}
<script>
facebookAppId = '454237798050818'; // MAJOR TODO this should be in settings, context info isn't getting through to this template!
facebookDefaultScope = ["email"];
staticUrl = 'http://database.uonsubaqua.com';
function facebookJSLoaded(){
FB.init({appId: facebookAppId, status: false, cookie: true, xfbml: true, oauth: true});
}
window.fbAsyncInit = facebookJSLoaded;
F = new facebookClass(facebookAppId);
F.load();
// facebookAppId = '{{facebook_id}}'; // MAJOR TODO this should be in settings, context info isn't getting through to this template!
// facebookDefaultScope = ["email"];
// staticUrl = 'http://database.uonsubaqua.com';
// function facebookJSLoaded(){
// FB.init({appId: facebookAppId, status: false, cookie: true, xfbml: true, oauth: true});
// }
// window.fbAsyncInit = facebookJSLoaded;
// F = new facebookClass(facebookAppId);
// F.load();
</script>


Expand Down

0 comments on commit f871746

Please sign in to comment.