Bug 845022 - Remove outdated links from about:plugins. r=dolske
authorMike de Boer <mdeboer@mozilla.com>
Tue, 26 Feb 2013 16:54:54 +0100
changeset 123318 93a749d5d268b6d64cac8d2bacc6fcae4a19a218
parent 123317 2ba886324c76311f520638ca787d63fe4eb84954
child 123319 97f66fd9a29aa37de1b32c65aad2ac7ccd53fc36
push id24376
push userMs2ger@gmail.com
push dateThu, 28 Feb 2013 17:05:14 +0000
treeherdermozilla-central@c65d59d33aa8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdolske
bugs845022
milestone22.0a1
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 845022 - Remove outdated links from about:plugins. r=dolske DONTBUILD
dom/locales/en-US/chrome/plugins.properties
toolkit/content/plugins.css
toolkit/content/plugins.html
toolkit/locales/en-US/chrome/global-region/region.properties
--- a/dom/locales/en-US/chrome/plugins.properties
+++ b/dom/locales/en-US/chrome/plugins.properties
@@ -4,17 +4,15 @@
 
 # LOCALIZATION NOTE (plugins.properties):
 #    Those strings are inserted into an HTML page, so you all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label=About Plugins
 enabledplugins_label=Enabled plugins
 nopluginsareenabled_label=No enabled plugins found
-findmore_label=Find more information about browser plugins at
 findpluginupdates_label=Find updates for installed plugins at
-installhelp_label=Help for installing plugins is available from
 file_label=File:
 version_label=Version:
 state_label=State:
 mimetype_label=MIME Type
 description_label=Description
 suffixes_label=Suffixes
--- a/toolkit/content/plugins.css
+++ b/toolkit/content/plugins.css
@@ -25,17 +25,17 @@ div#outside {
   font-weight: bold;
 }
 
 #noplugs {
   font-size: x-large;
   font-weight: bold;
 }
 
-div#findmore {
+div#findpluginupdates {
   margin-top: 2em;
 }
 
 .plugname {
   margin-top: 2em;
   margin-bottom: 1em;
   font-size: large;
   text-align: start;
--- a/toolkit/content/plugins.html
+++ b/toolkit/content/plugins.html
@@ -70,52 +70,28 @@
       id = "noplugs";
       label = "nopluginsareenabled_label";
     }
     var enabledplugins = document.createElement("h1");
     enabledplugins.setAttribute("id", id);
     enabledplugins.appendChild(document.createTextNode(pluginsbundle.GetStringFromName(label)));
     fragment.appendChild(enabledplugins);
 
-    // "Find more information about browser plugins at " ...
-    var findmore = document.createElement("div");
-    findmore.setAttribute("id", "findmore");
-    findmore.appendChild(document.createTextNode(pluginsbundle.GetStringFromName("findmore_label") + " "));
-    fragment.appendChild(findmore);
-
-    // ... "mozilla.org"
-    var moreplugins = document.createElement("a");
-    moreplugins.setAttribute("href", regionbundle.GetStringFromName("more_plugins_url"));
-    moreplugins.appendChild(document.createTextNode(regionbundle.GetStringFromName("more_plugins_label")));
-    findmore.appendChild(moreplugins);
-
     // "Find updates for installed plugins at " ...
     var findpluginupdates = document.createElement("div");
     findpluginupdates.setAttribute("id", "findpluginupdates");
     findpluginupdates.appendChild(document.createTextNode(pluginsbundle.GetStringFromName("findpluginupdates_label") + " "));
     fragment.appendChild(findpluginupdates);
 
     // ... "mozilla.com/plugincheck"
     var pluginupdates = document.createElement("a");
     pluginupdates.setAttribute("href", regionbundle.GetStringFromName("pluginupdates_url"));
     pluginupdates.appendChild(document.createTextNode(regionbundle.GetStringFromName("pluginupdates_label")));
     findpluginupdates.appendChild(pluginupdates);
 
-    // "Help for installing plugins is available from " ...
-    var installhelp = document.createElement("div");
-    installhelp.setAttribute("id", "installhelp");
-    installhelp.appendChild(document.createTextNode(pluginsbundle.GetStringFromName("installhelp_label") + " "));
-    fragment.appendChild(installhelp);
-
-    // ... "plugindoc.mozdev.org"
-    var plugindoc = document.createElement("a");
-    plugindoc.setAttribute("href", regionbundle.GetStringFromName("plugindoc_url"));
-    plugindoc.appendChild(document.createTextNode(regionbundle.GetStringFromName("plugindoc_label")));
-    installhelp.appendChild(plugindoc);
-
     fragment.appendChild(document.createElement("hr"));
 
     var stateNames = {};
     ["STATE_SOFTBLOCKED",
      "STATE_BLOCKED",
      "STATE_OUTDATED",
      "STATE_VULNERABLE_UPDATE_AVAILABLE",
      "STATE_VULNERABLE_NO_UPDATE"].forEach(function(label) {
--- a/toolkit/locales/en-US/chrome/global-region/region.properties
+++ b/toolkit/locales/en-US/chrome/global-region/region.properties
@@ -3,15 +3,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #
 #   Localizable URLs
 #
 pluginStartupMessage=Starting Plugin for type
 
 # plug-ins URLs
-more_plugins_label=mozilla.org
-more_plugins_url=https://pfs.mozilla.org/plugins/
 pluginupdates_label=mozilla.com/plugincheck
 pluginupdates_url=http://www.mozilla.com/plugincheck/
-plugindoc_label=plugindoc.mozdev.org
-plugindoc_url=http://plugindoc.mozdev.org/