Fixed a few things in the demo Facebook integration.

ddb71362 · Crisu83 · 62aa36fb · ddb71362 · ddb71362
Commit ddb71362 authored Feb 11, 2012 by Crisu83
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 10 deletions

main.php demo/protected/config/main.php +2 -1

main.php demo/protected/views/layouts/main.php +20 -9

No files found.
--- a/demo/protected/config/main.php
+++ b/demo/protected/config/main.php
@@ -68,7 +68,7 @@ return array(

 	// Application-level parameters
 	'params'=>array(
-		'appTitle'=>'Yii-Bootstrap - Bringing together the Yii PHP framework and Twitter\'s Bootstrap.',
+		'appTitle'=>'Yii-Bootstrap - Bringing together the Yii PHP framework and Twitter\'s Bootstrap',
 		'appDescription'=>'Yii-Bootstrap is an extension for Yii that focuses on server-side that allows you to easily use Bootstrap in your Yii applications.',
 	),
 );
\ No newline at end of file
--- a/demo/protected/views/layouts/main.php
+++ b/demo/protected/views/layouts/main.php
 <!doctype html>
-<html xmlns:fb="http://www.facebook.com/2008/fbml" xml:lang="en" lang="en">
+<html>
 <head prefix="og: http://ogp.me/ns# <?php echo Yii::app()->fb->appNamespace; ?>: http://ogp.me/ns/apps/<?php echo Yii::app()->fb->appNamespace; ?>#">
 	<?php Yii::app()->controller->widget('ext.seo.widgets.SeoHead', array(
 		'defaultDescription'=>Yii::app()->params['appDescription'],
@@ -29,14 +29,25 @@
 <body id="top">

 <div id="fb-root"></div>
-<script type="text/javascript">
-	(function(d, s, id) {
-		var js, fjs = d.getElementsByTagName(s)[0];
-		if (d.getElementById(id)) return;
-		js = d.createElement(s); js.id = id;
-		js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
-		fjs.parentNode.insertBefore(js, fjs);
-	}(document, 'script', 'facebook-jssdk'));
+<script>
+	window.fbAsyncInit = function() {
+		FB.init({
+			appId      : <?php echo Yii::app()->fb->appID; ?>, // App ID
+			status     : true, // check login status
+			cookie     : true, // enable cookies to allow the server to access the session
+			xfbml      : true  // parse XFBML
+		});
+
+		// Additional initialization code here
+	};
+
+	// Load the SDK Asynchronously
+	(function(d){
+		var js, id = 'facebook-jssdk'; if (d.getElementById(id)) {return;}
+		js = d.createElement('script'); js.id = id; js.async = true;
+		js.src = "//connect.facebook.net/en_US/all.js";
+		d.getElementsByTagName('head')[0].appendChild(js);
+	}(document));
 </script>

 <?php $this->widget('BootNavbar',array(