thereisonlyxul
/
sm-central-contrib
forked from thereisonlyxul/smpatches-quantum


			
				
					
						
						
							123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201
							# HG changeset patch
# User Matt A. Tobin <email@mattatobin.com>
# Date 1659988365 0
# Parent  dd0f9c636b2e2b7783cc81c4ec4ef478e0753c21
9999999 - Remove usage of global.dtd from about pages

Suite's about:certerror is no longer used in central so it remains unchanged.

diff --git a/suite/base/content/about.xhtml b/suite/base/content/about.xhtml
--- a/suite/base/content/about.xhtml
+++ b/suite/base/content/about.xhtml
@@ -1,32 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 <!ENTITY % suiteAboutDTD SYSTEM "chrome://communicator/locale/about.dtd" >
 %suiteAboutDTD;
 ]>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>About:</title>
-  <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css"/>
+  <link rel="stylesheet" href="chrome://communicator/skin/about.css" type="text/css"/>
   <script src="chrome://communicator/content/about.js"/>
 </head>
 
-<body dir="&locale.dir;">
+<body dir="ltr">
   <div id="aboutLogoContainer">
     <a id="vendorURL" href="http://www.seamonkey-project.org/">
       <img src="about:logo" alt="&brandShortName;"/>
       <p id="version">&about.version; </p>
     </a>
   </div>
 
   <ul id="aboutPageList">
diff --git a/suite/base/content/aboutSeaMonkey.xhtml b/suite/base/content/aboutSeaMonkey.xhtml
--- a/suite/base/content/aboutSeaMonkey.xhtml
+++ b/suite/base/content/aboutSeaMonkey.xhtml
@@ -1,14 +1,12 @@
 <!DOCTYPE html
 [
   <!ENTITY % seamonkeyDTD SYSTEM "chrome://communicator/locale/aboutSeaMonkey.dtd" >
   %seamonkeyDTD;
-  <!ENTITY % directionDTD SYSTEM "chrome://global/locale/global.dtd" >
-  %directionDTD;
 ]>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -45,17 +43,17 @@ em {
 
 a {
   text-decoration: none;
   color: white;
 }
 </style>
 </head>
 
-<body dir="&locale.dir;">
+<body dir="ltr">
 
 <section>
   <p id="moztext">
   &seamonkey.quote.1.30;
   </p>
 
   <p id="from">
   &seamonkey.from.1.30;
diff --git a/suite/base/content/blockedSite.xhtml b/suite/base/content/blockedSite.xhtml
--- a/suite/base/content/blockedSite.xhtml
+++ b/suite/base/content/blockedSite.xhtml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE html [
   <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
   %htmlDTD;
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
   <!ENTITY % blockedSiteDTD SYSTEM "chrome://communicator/locale/safeBrowsing.dtd">
   %blockedSiteDTD;
 ]>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,17 +16,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml" class="blacklist">
   <head>
     <link rel="stylesheet" href="chrome://communicator/content/certError.css" type="text/css" media="all" />
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
     <link rel="stylesheet" href="chrome://communicator/skin/blockedSite.css" type="text/css" media="all" />
     <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/blacklist_favicon.png"/>
   </head>
 
-  <body dir="&locale.dir;">
+  <body dir="ltr">
     <div id="errorPageContainer">
 
       <!-- Error Title -->
       <div id="errorTitle">
         <h1 id="errorTitleText_phishing">&safeb.blocked.phishingPage.title2;</h1>
         <h1 id="errorTitleText_malware">&safeb.blocked.malwarePage.title;</h1>
         <h1 id="errorTitleText_unwanted">&safeb.blocked.unwantedPage.title;</h1>
         <h1 id="errorTitleText_harmful">&safeb.blocked.harmfulPage.title;</h1>
diff --git a/suite/components/feeds/content/subscribe.xhtml b/suite/components/feeds/content/subscribe.xhtml
--- a/suite/components/feeds/content/subscribe.xhtml
+++ b/suite/components/feeds/content/subscribe.xhtml
@@ -4,19 +4,16 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
 <!DOCTYPE html [
   <!ENTITY % htmlDTD
     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "DTD/xhtml1-strict.dtd">
   %htmlDTD;
-  <!ENTITY % globalDTD
-    SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
   <!ENTITY % feedDTD
     SYSTEM "chrome://communicator/locale/feeds/subscribe.dtd">
   %feedDTD;
 ]>
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 
 <html id="feedHandler"
@@ -29,17 +26,17 @@
           media="all"/>
     <link rel="stylesheet"
           href="chrome://communicator/skin/feed-subscribe.css"
           type="text/css"
           media="all"/>
   </head>
   <body>
     <div id="feedHeaderContainer">
-      <div id="feedHeader" dir="&locale.dir;">
+      <div id="feedHeader" dir="ltr">
         <div id="feedIntroText">
           <p id="feedSubscriptionInfo1" />
           <p id="feedSubscriptionInfo2" />
         </div>
         <div id="feedSubscribeLine" />
       </div>
     </div>
 
diff --git a/suite/components/sessionstore/content/aboutSessionRestore.xhtml b/suite/components/sessionstore/content/aboutSessionRestore.xhtml
--- a/suite/components/sessionstore/content/aboutSessionRestore.xhtml
+++ b/suite/components/sessionstore/content/aboutSessionRestore.xhtml
@@ -6,33 +6,31 @@
 -->
 <!DOCTYPE html [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
   <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
   %htmlDTD;
   <!ENTITY % netErrorDTD SYSTEM "chrome://global/locale/netError.dtd">
   %netErrorDTD;
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
   <!ENTITY % restorepageDTD SYSTEM "chrome://communicator/locale/aboutSessionRestore.dtd">
   %restorepageDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&restorepage.tabtitle;</title>
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all"/>
     <link rel="stylesheet" href="chrome://communicator/skin/aboutSessionRestore.css" type="text/css" media="all"/>
     <link rel="icon" type="image/png" href="chrome://global/skin/icons/question-16.png"/>
 
     <script src="chrome://communicator/content/aboutSessionRestore.js"/>
   </head>
 
-  <body dir="&locale.dir;">
+  <body dir="ltr">
 
     <!-- PAGE CONTAINER (for styling purposes only) -->
     <div id="errorPageContainer">
 
       <!-- Error Title -->
       <div id="errorTitle">
         <h1 id="errorTitleText">&restorepage.pagetitle;</h1>
       </div>