Bug 606289: Fix logo link in about:. r+a=gavin
authorSteffen Wilberg <steffen.wilberg@web.de>
Fri, 12 Nov 2010 21:26:14 +0100
changeset 57422 4d99a78ddae4ad70c87e87a38dc7d09b906904f9
parent 57421 ae610cd9842c434e49daa6bc23b71d18cf7681ab
child 57423 cfcd4587cd2e7f25bd8d99e28cf457f615d53831
push idunknown
push userunknown
push dateunknown
bugs606289
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 606289: Fix logo link in about:. r+a=gavin
browser/base/content/browser-doctype.inc
browser/branding/nightly/pref/firefox-branding.js
browser/branding/unofficial/pref/firefox-branding.js
other-licenses/branding/firefox/pref/firefox-branding.js
toolkit/content/about.xhtml
toolkit/locales/en-US/chrome/global-region/region.dtd
toolkit/locales/jar.mn
--- a/browser/base/content/browser-doctype.inc
+++ b/browser/base/content/browser-doctype.inc
@@ -1,17 +1,15 @@
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
 %browserDTD;
 <!ENTITY % baseMenuDTD SYSTEM "chrome://browser/locale/baseMenuOverlay.dtd" >
 %baseMenuDTD;
-<!ENTITY % globalRegionDTD SYSTEM "chrome://global-region/locale/region.dtd">
-%globalRegionDTD;
 <!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" >
 %charsetDTD;
 <!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" >
 %textcontextDTD;
 <!ENTITY % customizeToolbarDTD SYSTEM "chrome://global/locale/customizeToolbar.dtd">
   %customizeToolbarDTD;
 <!ENTITY % placesDTD SYSTEM "chrome://browser/locale/places/places.dtd">
 %placesDTD;
--- a/browser/branding/nightly/pref/firefox-branding.js
+++ b/browser/branding/nightly/pref/firefox-branding.js
@@ -9,16 +9,17 @@ pref("app.update.interval", 28800);
 pref("app.update.download.backgroundInterval", 60);
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
 pref("app.update.url.manual", "http://nightly.mozilla.org/");
 // A default value for the "More information about this update" link
 // supplied in the "An update is available" page of the update wizard. 
 pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
 
-// Release notes URL
+// Release notes and vendor URLs
 pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
+pref("app.vendorURL", "http://www.mozilla.org/projects/%APP%/");
 
 // Search codes belong only in builds with official branding
 pref("browser.search.param.yahoo-fr", "");
 pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused
 pref("browser.search.param.yahoo-fr-ja", "");
 pref("browser.search.param.yahoo-f-CN", "");
--- a/browser/branding/unofficial/pref/firefox-branding.js
+++ b/browser/branding/unofficial/pref/firefox-branding.js
@@ -9,16 +9,17 @@ pref("app.update.interval", 28800);
 pref("app.update.download.backgroundInterval", 60);
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
 pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
 // A default value for the "More information about this update" link
 // supplied in the "An update is available" page of the update wizard. 
 pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
 
-// Release notes URL
+// Release notes and vendor URLs
 pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
+pref("app.vendorURL", "http://www.mozilla.org/projects/%APP%/");
 
 // Search codes belong only in builds with official branding
 pref("browser.search.param.yahoo-fr", "");
 pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused
 pref("browser.search.param.yahoo-fr-ja", "");
 pref("browser.search.param.yahoo-f-CN", "");
--- a/other-licenses/branding/firefox/pref/firefox-branding.js
+++ b/other-licenses/branding/firefox/pref/firefox-branding.js
@@ -9,15 +9,16 @@ pref("app.update.interval", 86400);
 pref("app.update.download.backgroundInterval", 600);
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
 pref("app.update.url.manual", "http://www.firefox.com");
 // A default value for the "More information about this update" link
 // supplied in the "An update is available" page of the update wizard. 
 pref("app.update.url.details", "http://www.mozilla.com/%LOCALE%/%APP%/releases/");
 
-// Release notes URL
+// Release notes and vendor URLs
 pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/releasenotes/");
+pref("app.vendorURL", "http://www.mozilla.com/%LOCALE%/%APP%/");
 
 pref("browser.search.param.ms-pc", "MOZI");
 pref("browser.search.param.yahoo-fr", "moz35");
 pref("browser.search.param.yahoo-fr-cjkt", "moz35"); // now unused
 pref("browser.search.param.yahoo-fr-ja", "mozff");
--- a/toolkit/content/about.xhtml
+++ b/toolkit/content/about.xhtml
@@ -66,36 +66,39 @@
   </div>
 
   <ul id="aboutPageList">
     <li>&about.credits.beforeLink;<a href="about:credits">&about.credits.linkTitle;</a>&about.credits.afterLink;</li>
     <li>&about.license.beforeTheLink;<a href="about:license">&about.license.linkTitle;</a>&about.license.afterTheLink;</li>
     <li>&about.relnotes.beforeTheLink;<a id="releaseNotesURL" href="">&about.relnotes.linkTitle;</a>&about.relnotes.afterTheLink;</li>
     <li>&about.buildconfig.beforeTheLink;<a href="about:buildconfig">&about.buildconfig.linkTitle;</a>&about.buildconfig.afterTheLink;</li>
     <script type="application/javascript">
-      // get release notes URL from prefs
-      try {
-        var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
-                                  .getService(Components.interfaces.nsIURLFormatter);
-        var releaseNotesURL = formatter.formatURLPref("app.releaseNotesURL");
+      // get release notes and vendor URL from prefs
+      var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
+                                .getService(Components.interfaces.nsIURLFormatter);
+      var releaseNotesURL = formatter.formatURLPref("app.releaseNotesURL");
+      if (releaseNotesURL != "about:blank") {
         var relnotes = document.getElementById("releaseNotesURL");
         relnotes.setAttribute("href", releaseNotesURL);
+      }
 
-        var vendorURL = formatter.formatURLPref("app.vendorURL");
+      var vendorURL = formatter.formatURLPref("app.vendorURL");
+      if (vendorURL != "about:blank") {
         var vendor = document.getElementById("vendorURL");
         vendor.setAttribute("href", vendorURL);
+      }
 
-        var versionNum = Components.classes["@mozilla.org/xre/app-info;1"]
-                                   .getService(Components.interfaces.nsIXULAppInfo)
-                                   .version;
-        var version = document.getElementById("version");
-        version.appendChild(document.createTextNode("&about.version; " + versionNum));
-      }
-      catch (ex) { /* no release notes and vendor URL for you without bug 349985 being fixed */ }
+      // insert the version of the XUL application (!= XULRunner platform version)
+      var versionNum = Components.classes["@mozilla.org/xre/app-info;1"]
+                                 .getService(Components.interfaces.nsIXULAppInfo)
+                                 .version;
+      var version = document.getElementById("version");
+      version.appendChild(document.createTextNode("&about.version; " + versionNum));
 
+      // append user agent
       var ua = navigator.userAgent;
       if (ua) {
         var list = document.getElementById("aboutPageList");
         var listItem = list.appendChild(document.createElement("li"));
         listItem.appendChild(document.createTextNode("&about.buildIdentifier;"));
         listItem.appendChild(document.createTextNode(ua));
       }
     </script>
deleted file mode 100644
--- a/toolkit/locales/en-US/chrome/global-region/region.dtd
+++ /dev/null
@@ -1,2 +0,0 @@
-<!-- brand.dtd -->
-<!ENTITY  vendorURL             "http://www.mozilla.org/">
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -60,17 +60,16 @@
 + locale/@AB_CD@/global/viewSource.dtd                  (%chrome/global/viewSource.dtd)
 + locale/@AB_CD@/global/viewSource.properties           (%chrome/global/viewSource.properties)
 + locale/@AB_CD@/global/wizard.dtd                      (%chrome/global/wizard.dtd)
 + locale/@AB_CD@/global/wizard.properties               (%chrome/global/wizard.properties)
   locale/@AB_CD@/global/xpinstall/xpinstall.properties  (%chrome/global/xpinstall/xpinstall.properties)
   locale/@AB_CD@/global/crashes.dtd                     (%crashreporter/crashes.dtd)
   locale/@AB_CD@/global/crashes.properties              (%crashreporter/crashes.properties)
 % locale global-region @AB_CD@ %locale/@AB_CD@/global-region/
-+ locale/@AB_CD@/global-region/region.dtd               (%chrome/global-region/region.dtd)
 + locale/@AB_CD@/global-region/region.properties        (%chrome/global-region/region.properties)
 % locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/
   locale/@AB_CD@/global-platform/mac/platformKeys.properties  (%chrome/global-platform/mac/platformKeys.properties)
   locale/@AB_CD@/global-platform/unix/platformKeys.properties (%chrome/global-platform/unix/platformKeys.properties)
   locale/@AB_CD@/global-platform/win/platformKeys.properties  (%chrome/global-platform/win/platformKeys.properties)
   locale/@AB_CD@/global-platform/mac/intl.properties          (%chrome/global-platform/mac/intl.properties)
   locale/@AB_CD@/global-platform/unix/intl.properties         (%chrome/global-platform/unix/intl.properties)
   locale/@AB_CD@/global-platform/win/intl.properties          (%chrome/global-platform/win/intl.properties)