Permalink
Browse files

Merge branch 'master' of http://github.com/facebook/firefox-toolbar

  • Loading branch information...
2 parents 326b359 + 219dd87 commit 8b9526942664f51dd6a5a84c7a0f6d1a5925dc53 @mackers mackers committed Jan 20, 2012
Showing with 104 additions and 100 deletions.
  1. +2 −2 chrome/content/toolbar.js
  2. +97 −95 chrome/locale/en-US/about.html
  3. +3 −1 defaults/preferences/facebook.js
  4. +2 −2 install.rdf
@@ -691,9 +691,9 @@ var facebook = {
facebook.startupLike();
}
// First-run page
- if (!prefSvc.getBoolPref('extensions.facebook.not_first_run')) {
+ if (!prefSvc.getBoolPref('extensions.facebook.firstrun')) {
facebook.aboutpage();
- prefSvc.setBoolPref('extensions.facebook.not_first_run', true);
+ prefSvc.setBoolPref('extensions.facebook.firstrun', true);
}
},
@@ -1,105 +1,107 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
+
<head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <title>Facebook Toolbar successfully installed!</title>
- <link rel="stylesheet" type="text/css" href="chrome://facebook/skin/about.css" />
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <title>About Facebook Toolbar</title>
+ <link rel="stylesheet" type="text/css" href="chrome://facebook/skin/about.css" />
</head>
<body>
-<div class="arrow">
-<img src="chrome://facebook/skin/images/about/arrow.png" alt="Click to start" />
-<span>Click Log In<br /> to Start</span>
-</div>
-
-<div class="wrap">
-
- <div class="header">
- <h1>Thanks for installing the Facebook Toolbar!</h1>
- </div>
-
- <div class="login">
- <h2>First Log in and Authorize the application!</h2>
- <img src="chrome://facebook/skin/images/about/fb-login.png" alt="Login" />
- <img class="arrowr" src="chrome://facebook/skin/images/about/fb-arrow01.png" alt="Arrow Right" />
- <img class="right" src="chrome://facebook/skin/images/about/fb-authorize.png" alt="Authorize" />
- </div>
-
- <div class="use">
- <h2>Then start having fun using it!</h2>
- <img class="arrowd" src="chrome://facebook/skin/images/about/fb-arrow02.png" alt="Arrow Down" />
- <img src="chrome://facebook/skin/images/about/fb-use.png" alt="Use" />
- </div>
-
- <div class="column1">
- <div class="listpoint">1</div>
- <p>Open the <span>Friends Sidebar</span>, a list of your friends with their latest status updates.</p>
- </div>
-
- <div class="column2">
- <div class="listpoint">2</div>
- <span>Search Facebook</span>
- <p>Type in a name and hit enter, or select one of your friends.</p>
- </div>
-
- <div class="column3">
- <div class="listpoint">3</div>
- <span>Quick Links</span>
- <p>Easily access your Facebook pages or change your toolbar settings.</p>
- </div>
-
-
- <div class="column1">
- <div class="listpoint">4</div>
- <span>Home</span>
- <p>Go to your profile.</p>
- </div>
-
- <div class="column2">
- <div class="listpoint">5</div>
- <span>Notifications</span>
- <p>Tells you how many unseen requests you have.</p>
- </div>
-
- <div class="column3">
- <div class="listpoint">6</div>
- <span>Like</span>
- <p>Like a page as you browse, and see the number of Likes for a page.</p>
- </div>
-
-
- <div class="column1">
- <div class="listpoint">7</div>
- <p><span>Share</span> the current page you're viewing with your Facebook friends!</p>
- </div>
-
- <div class="column2">
- <div class="listpoint">8</div>
- <p><span>Upload</span> photos.</p>
- </div>
-
- <div class="column3">
- <div class="listpoint">9</div>
- <span>Status update</span>
- <p>Share what you're doing.</p>
- </div>
-
-
- <div class="column1">
- <div class="listpoint">10</div>
- <span>Log out</span>
- <p>Log out when you're done.</p>
- </div>
-
- <hr>
-
- <div class="footer">
- <p id="copyright">Facebook &copy; 2011. </p>
- </div>
-
-
-</div>
+ <div class="arrow">
+ <img src="chrome://facebook/skin/images/about/arrow.png" alt="Click to start" />
+ <span>Log In and<br/>
+ Authenticate<br/>
+ to Start
+ </span>
+ </div>
+
+ <div class="wrap">
+
+ <div class="header">
+ <h1>Thanks for installing the Facebook Toolbar!</h1>
+ </div>
+
+ <div class="login">
+ <h2>First Log in and Authorize the application!</h2>
+ <img src="chrome://facebook/skin/images/about/fb-login.png" alt="Login" />
+ <img class="arrowr" src="chrome://facebook/skin/images/about/fb-arrow01.png" alt="Arrow Right" />
+ <img class="right" src="chrome://facebook/skin/images/about/fb-authorize.png" alt="Authorize" />
+ </div>
+
+ <div class="use">
+ <h2>Then start having fun using it!</h2>
+ <img class="arrowd" src="chrome://facebook/skin/images/about/fb-arrow02.png" alt="Arrow Down" />
+ <img src="chrome://facebook/skin/images/about/fb-use.png" alt="Use" />
+ </div>
+
+ <div class="column1">
+ <div class="listpoint">1</div>
+ <p>Open the <span>Friends Sidebar</span>, a list of your friends with their latest status updates.</p>
+ </div>
+
+ <div class="column2">
+ <div class="listpoint">2</div>
+ <span>Search Facebook</span>
+ <p>Search as you type right from the Firefox location bar, or from the Facebook toolbar.
+ </p>
+ </div>
+
+ <div class="column3">
+ <div class="listpoint">3</div>
+ <span>Quick Links</span>
+ <p>Easily access your Facebook pages or change your toolbar settings.</p>
+ </div>
+
+ <div class="column1">
+ <div class="listpoint">4</div>
+ <span>Home</span>
+ <p>Go to your profile.</p>
+ </div>
+
+ <div class="column2">
+ <div class="listpoint">5</div>
+ <span>Notifications</span>
+ <p>Tells you how many unseen requests you have.</p>
+ </div>
+
+ <div class="column3">
+ <div class="listpoint">6</div>
+ <span>Like</span>
+ <p>Like a page as you browse, and see the number of Likes for a page.</p>
+ </div>
+
+ <div class="column1">
+ <div class="listpoint">7</div>
+ <p><span>Share</span> the current page you're viewing with your Facebook friends!</p>
+ </div>
+
+ <div class="column2">
+ <div class="listpoint">8</div>
+ <p><span>Upload</span> photos.</p>
+ </div>
+
+ <div class="column3">
+ <div class="listpoint">9</div>
+ <span>Status update</span>
+ <p>Share what you're doing.</p>
+ </div>
+
+ <div class="column1">
+ <div class="listpoint">10</div>
+ <span>Log out</span>
+ <p>Log out when you're done.</p>
+ </div>
+
+ <hr/>
+
+ <div class="footer">
+ <p id="copyright">Facebook &copy; 2012. </p>
+ </div>
+
+ </div>
</body>
</html>
@@ -29,7 +29,9 @@ pref("extensions.facebook.access_token", "" );
pref("extensions.facebook.postuploadaction", 0);
// firstrun prefs
pref("extensions.facebook.first_run_dialog", false);
-pref("extensions.facebook.not_first_run", false);
+pref("extensions.facebook.not_first_run", false); // deprecated
+pref("extensions.facebook.firstrun", false);
+
// Like
pref("extensions.facebook.like.enabled", false);
// Toolbar permissions
View
@@ -5,7 +5,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>firefox@facebook.com</em:id>
- <em:version>1.7.3.3</em:version>
+ <em:version>1.7.3.4</em:version>
<em:type>2</em:type>
<!-- Front End MetaData -->
@@ -30,7 +30,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>3.6</em:minVersion>
- <em:maxVersion>11.0a1</em:maxVersion>
+ <em:maxVersion>12.0a1</em:maxVersion>
</Description>
</em:targetApplication>

0 comments on commit 8b95269

Please sign in to comment.