Bug 903404 - Move toolkit/content/aboutNetworking.net to toolkit/themes/shared. r=gavin
authorRobert Bindar <robertbindar@gmail.com>
Fri, 16 Aug 2013 15:17:53 -0400
changeset 143015 9fb8a7b295e6a9b85f6324aaee999a08e0ddfd34
parent 143014 859d42fcc5268e4592f82447147810acd69d9e5f
child 143016 f304a101e40b31128e7b7baf3e00ba455f291f47
push id32605
push userphilringnalda@gmail.com
push dateMon, 19 Aug 2013 00:51:46 +0000
treeherdermozilla-inbound@7f882e063eaf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs903404
milestone26.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 903404 - Move toolkit/content/aboutNetworking.net to toolkit/themes/shared. r=gavin
toolkit/content/aboutNetworking.css
toolkit/content/aboutNetworking.xhtml
toolkit/content/jar.mn
toolkit/themes/osx/mozapps/jar.mn
toolkit/themes/shared/aboutNetworking.css
toolkit/themes/windows/mozapps/jar.mn
--- a/toolkit/content/aboutNetworking.xhtml
+++ b/toolkit/content/aboutNetworking.xhtml
@@ -10,17 +10,17 @@
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
 <!ENTITY % networkingDTD SYSTEM "chrome://global/locale/aboutNetworking.dtd"> %networkingDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>&aboutNetworking.title;</title>
         <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css" />
-        <link rel="stylesheet" href="chrome://global/content/aboutNetworking.css" type="text/css" />
+        <link rel="stylesheet" href="chrome://mozapps/skin/aboutNetworking.css" type="text/css" />
         <script type="application/javascript;version=1.7" src="chrome://global/content/aboutNetworking.js" />
     </head>
     <body id="body">
         <div id="warning_message" class="warningBackground">
             <div class="warningMessage">
                 &aboutNetworking.warning; <br/> <br/>
                 <label><input id="warncheck" type="checkbox" checked="yes" />&aboutNetworking.showNextTime;</label> <br/> <br/>
                 <button id="confpref">&aboutNetworking.ok;</button>
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -11,17 +11,16 @@ toolkit.jar:
    content/global/textbox.css                 (textbox.css)
    content/global/menulist.css                (menulist.css)
    content/global/about.xhtml                 (about.xhtml)
    content/global/aboutAbout.xhtml            (aboutAbout.xhtml)
    content/global/aboutRights.xhtml           (aboutRights.xhtml)
    content/global/aboutRights-unbranded.xhtml (aboutRights-unbranded.xhtml)
    content/global/aboutNetworking.js
    content/global/aboutNetworking.xhtml
-   content/global/aboutNetworking.css
 *  content/global/aboutSupport.js
 *  content/global/aboutSupport.xhtml
 *  content/global/aboutTelemetry.js
    content/global/aboutTelemetry.xhtml
    content/global/aboutTelemetry.css          (aboutTelemetry.css)
    content/global/directionDetector.html
    content/global/plugins.html
    content/global/plugins.css
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -51,16 +51,17 @@ toolkit.jar:
   skin/classic/mozapps/extensions/eula.css                        (extensions/eula.css)
   skin/classic/mozapps/extensions/blocklist.css                   (extensions/blocklist.css)
 * skin/classic/mozapps/extensions/newaddon.css                    (extensions/newaddon.css)
   skin/classic/mozapps/passwordmgr/key.png                        (passwordmgr/key.png)
   skin/classic/mozapps/passwordmgr/key-16.png                     (passwordmgr/key-16.png)
   skin/classic/mozapps/passwordmgr/key-16@2x.png                  (passwordmgr/key-16@2x.png)
   skin/classic/mozapps/passwordmgr/key-64.png                     (passwordmgr/key-64.png)
   skin/classic/mozapps/plugins/pluginProblem.css                  (../../shared/plugins/pluginProblem.css)
+  skin/classic/mozapps/aboutNetworking.css                        (../../shared/aboutNetworking.css)
   skin/classic/mozapps/plugins/contentPluginActivate.png          (../../shared/plugins/contentPluginActivate.png)
   skin/classic/mozapps/plugins/contentPluginBlocked.png           (../../shared/plugins/contentPluginBlocked.png)
   skin/classic/mozapps/plugins/contentPluginClose.png             (../../shared/plugins/contentPluginClose.png)
   skin/classic/mozapps/plugins/contentPluginCrashed.png           (../../shared/plugins/contentPluginCrashed.png)
   skin/classic/mozapps/plugins/contentPluginDisabled.png          (../../shared/plugins/contentPluginDisabled.png)
   skin/classic/mozapps/plugins/contentPluginDownload.png          (../../shared/plugins/contentPluginDownload.png)
   skin/classic/mozapps/plugins/contentPluginMissing.png           (../../shared/plugins/contentPluginMissing.png)
   skin/classic/mozapps/plugins/contentPluginStripe.png            (../../shared/plugins/contentPluginStripe.png)
rename from toolkit/content/aboutNetworking.css
rename to toolkit/themes/shared/aboutNetworking.css
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -55,16 +55,17 @@ toolkit.jar:
         skin/classic/mozapps/handling/handling.css                 (handling/handling.css)
         skin/classic/mozapps/passwordmgr/key.png                   (passwordmgr/key.png)
         skin/classic/mozapps/passwordmgr/key-16.png                (passwordmgr/key-16.png)
         skin/classic/mozapps/passwordmgr/key-64.png                (passwordmgr/key-64.png)
 #ifdef MOZ_PLACES
         skin/classic/mozapps/places/defaultFavicon.png             (places/defaultFavicon.png)
 #endif
         skin/classic/mozapps/plugins/pluginProblem.css             (../../shared/plugins/pluginProblem.css)
+        skin/classic/mozapps/aboutNetworking.css                   (../../shared/aboutNetworking.css)
         skin/classic/mozapps/plugins/contentPluginActivate.png     (../../shared/plugins/contentPluginActivate.png)
         skin/classic/mozapps/plugins/contentPluginBlocked.png      (../../shared/plugins/contentPluginBlocked.png)
         skin/classic/mozapps/plugins/contentPluginClose.png        (../../shared/plugins/contentPluginClose.png)
         skin/classic/mozapps/plugins/contentPluginCrashed.png      (../../shared/plugins/contentPluginCrashed.png)
         skin/classic/mozapps/plugins/contentPluginDisabled.png     (../../shared/plugins/contentPluginDisabled.png)
         skin/classic/mozapps/plugins/contentPluginDownload.png     (../../shared/plugins/contentPluginDownload.png)
         skin/classic/mozapps/plugins/contentPluginMissing.png      (../../shared/plugins/contentPluginMissing.png)
         skin/classic/mozapps/plugins/contentPluginStripe.png       (../../shared/plugins/contentPluginStripe.png)
@@ -135,16 +136,17 @@ toolkit.jar:
         skin/classic/aero/mozapps/handling/handling.css                    (handling/handling.css)
         skin/classic/aero/mozapps/passwordmgr/key.png                      (passwordmgr/key.png)
         skin/classic/aero/mozapps/passwordmgr/key-16.png                   (passwordmgr/key-16.png)
         skin/classic/aero/mozapps/passwordmgr/key-64.png                   (passwordmgr/key-64.png)
 #ifdef MOZ_PLACES
         skin/classic/aero/mozapps/places/defaultFavicon.png                (places/defaultFavicon.png)
 #endif
         skin/classic/aero/mozapps/plugins/pluginProblem.css                (../../shared/plugins/pluginProblem.css)
+        skin/classic/aero/mozapps/aboutNetworking.css                           (../../shared/aboutNetworking.css)
         skin/classic/aero/mozapps/plugins/contentPluginActivate.png        (../../shared/plugins/contentPluginActivate.png)
         skin/classic/aero/mozapps/plugins/contentPluginBlocked.png         (../../shared/plugins/contentPluginBlocked.png)
         skin/classic/aero/mozapps/plugins/contentPluginClose.png           (../../shared/plugins/contentPluginClose.png)
         skin/classic/aero/mozapps/plugins/contentPluginCrashed.png         (../../shared/plugins/contentPluginCrashed.png)
         skin/classic/aero/mozapps/plugins/contentPluginDisabled.png        (../../shared/plugins/contentPluginDisabled.png)
         skin/classic/aero/mozapps/plugins/contentPluginDownload.png        (../../shared/plugins/contentPluginDownload.png)
         skin/classic/aero/mozapps/plugins/contentPluginMissing.png         (../../shared/plugins/contentPluginMissing.png)
         skin/classic/aero/mozapps/plugins/contentPluginStripe.png          (../../shared/plugins/contentPluginStripe.png)