Permalink
Browse files

Revert "Issue #19 : Re-jig of About to better abstract strings for lo…

…calization. XHTML FTW!"

This reverts commit 69468d4.
  • Loading branch information...
1 parent d56d642 commit 0bcfd225d339fabf6fd147f41f488c7119bd950b brianking committed Feb 6, 2012
View
@@ -8,7 +8,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox flex="1">
- <browser src="chrome://facebook/content/about/about.xhtml" flex="1"/>
+ <browser src="chrome://facebook/locale/about.html" flex="1"/>
</vbox>
</page>
@@ -1,43 +0,0 @@
-<!ENTITY about.title "About Facebook Toolbar">
-
-<!ENTITY about.thanks.label "Thanks for installing the Facebook Toolbar!">
-<!ENTITY about.start.label "Log In and Authenticate to Start">
-
-<!ENTITY about.first.label "First Log in and Authorize the application!">
-<!ENTITY about.then.label "Then start having fun using it!">
-
-<!-- Following 3 will be grouped together in 1 sentence, second has emphasis -->
-<!ENTITY about.sidebar1.label "Open the">
-<!ENTITY about.sidebar2.label "Friends Sidebar">
-<!ENTITY about.sidebar3.label ", a list of your friends with their latest status updates.">
-
-<!ENTITY about.search.title "Search Facebook">
-<!ENTITY about.search.label "Search as you type right from the Firefox location bar, or from the Facebook toolbar.">
-
-<!ENTITY about.links.title "Quick Links">
-<!ENTITY about.links.label "Easily access your Facebook pages or change your toolbar settings.">
-
-<!ENTITY about.home.title "Home">
-<!ENTITY about.home.label "Go to your profile.">
-
-<!ENTITY about.notifications.title "Notifications">
-<!ENTITY about.notifications.label "Tells you how many unseen requests you have.">
-
-<!ENTITY about.like.title "Like">
-<!ENTITY about.like.label "Like a page as you browse, and see the number of Likes for a page.">
-
-<!-- Following 2 will be grouped together in 1 sentence, first has emphasis -->
-<!ENTITY about.share1.label "Share">
-<!ENTITY about.share2.label "the current page you're viewing with your Facebook friends!">
-
-<!-- Following 2 will be grouped together in 1 sentence, first has emphasis -->
-<!ENTITY about.upload1.label "Upload">
-<!ENTITY about.upload2.label "photos.">
-
-<!ENTITY about.status.title "Status update">
-<!ENTITY about.status.label "Share what you're doing.">
-
-<!ENTITY about.logout.title "Log out">
-<!ENTITY about.logout.label "Log out when you're done.">
-
-<!ENTITY about.copyright.label "Facebook &copy; 2012.">
@@ -1,106 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
-<!ENTITY % aboutDTD SYSTEM "chrome://facebook/locale/about.dtd">
-%aboutDTD;
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<html lang="en">
<head>
- <title>&about.title;</title>
- <link rel="stylesheet" type="text/css" href="chrome://facebook/skin/about.css"></link>
+ <title>About Facebook Toolbar</title>
+ <meta charset="utf-8" />
+ <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>&about.start.label;</span>
+ <span>Log In and<br/>
+ Authenticate<br/>
+ to Start
+ </span>
</div>
<div class="wrap">
<div class="header">
- <h1>&about.thanks.label;</h1>
+ <h1>Thanks for installing the Facebook Toolbar!</h1>
</div>
<div class="login">
- <h2>&about.first.label;</h2>
+ <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>&about.then.label;</h2>
+ <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>&about.sidebar1.label; <span>&about.sidebar2.label;</span>&about.sidebar3.label;</p>
+ <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>&about.search.title;</span>
- <p>&about.search.label;
+ <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>&about.links.title;</span>
- <p>&about.links.label;</p>
+ <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>&about.home.title;</span>
- <p>&about.home.label;</p>
+ <span>Home</span>
+ <p>Go to your profile.</p>
</div>
<div class="column2">
<div class="listpoint">5</div>
- <span>&about.notifications.title;</span>
- <p>&about.notifications.label;</p>
+ <span>Notifications</span>
+ <p>Tells you how many unseen requests you have.</p>
</div>
<div class="column3">
<div class="listpoint">6</div>
- <span>&about.like.title;</span>
- <p>&about.like.label;</p>
+ <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>&about.share1.label;</span> &about.share2.label;</p>
+ <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>&about.upload1.label;</span> &about.upload2.label;</p>
+ <p><span>Upload</span> photos.</p>
</div>
<div class="column3">
<div class="listpoint">9</div>
- <span>&about.status.title;</span>
- <p>&about.status.label;</p>
+ <span>Status update</span>
+ <p>Share what you're doing.</p>
</div>
<div class="column1">
<div class="listpoint">10</div>
- <span>&about.logout.title;</span>
- <p>&about.logout.label;</p>
+ <span>Log out</span>
+ <p>Log out when you're done.</p>
</div>
<hr/>
<div class="footer">
- <p id="copyright">&about.copyright.label;</p>
+ <p id="copyright">Facebook &copy; 2012. </p>
</div>
</div>
View
@@ -39,15 +39,8 @@ span {color: #3B5998; font-weight: bold;}
.column1 img, .column2 img, .column3 img {float: left; margin: 0 10px 50px 0;}
-.arrow {position: absolute; width: 100px; top: 10px; right:10px; text-align: center; z-index: 50000; padding-right: 10px;}
-.arrow img {position: absolute; top: 10px; right:10px;}
-.arrow span {display: block;
- position: absolute;
- top: 60px;
- text-align: center;
- text-transform: uppercase;
- color:#1F8002;
- text-shadow: 1px 1px 1px #fff;}
+.arrow {position: absolute; top: 10px; right:10px; text-align: center; z-index: 50000;}
+.arrow span {display: block; text-align: center; text-transform: uppercase; color:#1F8002; text-shadow: 1px 1px 1px #fff;}
.listpoint {
background-color: #3B5998;

0 comments on commit 0bcfd22

Please sign in to comment.