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

…calization. XHTML FTW!" This reverts commit 69468d4.
facebookarchive · Feb 6, 2012 · 0bcfd22 · 0bcfd22
1 parent d56d642
commit 0bcfd22
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 85 deletions.
diff --git a/chrome/content/about.xul b/chrome/content/about.xul
@@ -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>
diff --git a/chrome/locale/en-US/about.dtd b/chrome/locale/en-US/about.dtd
diff --git a/chrome/content/about/about.xhtml → chrome/locale/en-US/about.html b/chrome/content/about/about.xhtml → chrome/locale/en-US/about.html
@@ -1,106 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+<html lang="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">
 
 <head>
-    <title>&about.title;</title>
+    <title>About Facebook Toolbar</title>
-    <link rel="stylesheet" type="text/css" href="chrome://facebook/skin/about.css"></link>
+    <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>
+            <span>Search Facebook</span>
-            <p>&about.search.label;
+            <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>
+            <span>Quick Links</span>
-            <p>&about.links.label;</p>
+            <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>
+            <span>Home</span>
-            <p>&about.home.label;</p>
+            <p>Go to your profile.</p>
         </div>
 
         <div class="column2">
             <div class="listpoint">5</div>
-            <span>&about.notifications.title;</span>
+            <span>Notifications</span>
-            <p>&about.notifications.label;</p>
+            <p>Tells you how many unseen requests you have.</p>
         </div>
 
         <div class="column3">
             <div class="listpoint">6</div>
-            <span>&about.like.title;</span>
+            <span>Like</span>
-            <p>&about.like.label;</p>
+            <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>
+            <span>Status update</span>
-            <p>&about.status.label;</p>
+            <p>Share what you're doing.</p>
         </div>
 
         <div class="column1">
             <div class="listpoint">10</div>
-            <span>&about.logout.title;</span>
+            <span>Log out</span>
-            <p>&about.logout.label;</p>
+            <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>

diff --git a/chrome/skin/about.css b/chrome/skin/about.css
@@ -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 {position: absolute; top: 10px; right:10px; text-align: center; z-index: 50000;}
-.arrow img {position: absolute; top: 10px; right:10px;}
+.arrow span {display: block; text-align: center; text-transform: uppercase; color:#1F8002; text-shadow: 1px 1px 1px #fff;}
-.arrow span {display: block;
-             position: absolute;
-             top: 60px;
-             text-align: center;
-             text-transform: uppercase;
-             color:#1F8002;
-             text-shadow: 1px 1px 1px #fff;}
 
 .listpoint {
   background-color: #3B5998;