зеркало из https://github.com/mozilla/gecko-dev.git
about:startup - move UI files to toolkit
--HG-- rename : browser/base/content/aboutStartup.js => toolkit/content/aboutStartup.js rename : browser/base/content/aboutStartup.xhtml => toolkit/content/aboutStartup.xhtml rename : browser/locales/en-US/chrome/browser/aboutStartup.dtd => toolkit/locales/en-US/chrome/global/aboutStartup.dtd rename : browser/locales/en-US/chrome/browser/aboutStartup.properties => toolkit/locales/en-US/chrome/global/aboutStartup.properties
This commit is contained in:
Родитель
2106a1685f
Коммит
ba45c80d1c
|
@ -24,8 +24,6 @@ browser.jar:
|
||||||
content/browser/aboutRobots-icon-rtl.png (content/aboutRobots-icon-rtl.png)
|
content/browser/aboutRobots-icon-rtl.png (content/aboutRobots-icon-rtl.png)
|
||||||
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
|
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
|
||||||
content/browser/aboutRobots-widget-right.png (content/aboutRobots-widget-right.png)
|
content/browser/aboutRobots-widget-right.png (content/aboutRobots-widget-right.png)
|
||||||
content/browser/aboutStartup.xhtml (content/aboutStartup.xhtml)
|
|
||||||
content/browser/aboutStartup.js (content/aboutStartup.js)
|
|
||||||
* content/browser/browser.css (content/browser.css)
|
* content/browser/browser.css (content/browser.css)
|
||||||
* content/browser/browser.js (content/browser.js)
|
* content/browser/browser.js (content/browser.js)
|
||||||
* content/browser/browser.xul (content/browser.xul)
|
* content/browser/browser.xul (content/browser.xul)
|
||||||
|
|
|
@ -100,7 +100,7 @@ static RedirEntry kRedirMap[] = {
|
||||||
{ "sync-tabs", "chrome://browser/content/aboutSyncTabs.xul",
|
{ "sync-tabs", "chrome://browser/content/aboutSyncTabs.xul",
|
||||||
nsIAboutModule::ALLOW_SCRIPT },
|
nsIAboutModule::ALLOW_SCRIPT },
|
||||||
#endif
|
#endif
|
||||||
{ "startup", "chrome://browser/content/aboutStartup.html",
|
{ "startup", "chrome://toolkit/content/aboutStartup.xhtml",
|
||||||
nsIAboutModule::ALLOW_SCRIPT },
|
nsIAboutModule::ALLOW_SCRIPT },
|
||||||
{ "home", "chrome://browser/content/aboutHome.xhtml",
|
{ "home", "chrome://browser/content/aboutHome.xhtml",
|
||||||
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd)
|
locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd)
|
||||||
locale/browser/aboutRobots.dtd (%chrome/browser/aboutRobots.dtd)
|
locale/browser/aboutRobots.dtd (%chrome/browser/aboutRobots.dtd)
|
||||||
locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd)
|
locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd)
|
||||||
locale/browser/aboutStartup.dtd (%chrome/browser/aboutStartup.dtd)
|
|
||||||
locale/browser/aboutSessionRestore.dtd (%chrome/browser/aboutSessionRestore.dtd)
|
locale/browser/aboutSessionRestore.dtd (%chrome/browser/aboutSessionRestore.dtd)
|
||||||
#ifdef MOZ_SERVICES_SYNC
|
#ifdef MOZ_SERVICES_SYNC
|
||||||
locale/browser/aboutSyncTabs.dtd (%chrome/browser/aboutSyncTabs.dtd)
|
locale/browser/aboutSyncTabs.dtd (%chrome/browser/aboutSyncTabs.dtd)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
%globalDTD;
|
%globalDTD;
|
||||||
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
|
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
|
||||||
%brandDTD;
|
%brandDTD;
|
||||||
<!ENTITY % aboutStartupDTD SYSTEM "chrome://browser/locale/aboutStartup.dtd">
|
<!ENTITY % aboutStartupDTD SYSTEM "chrome://global/locale/aboutStartup.dtd">
|
||||||
%aboutStartupDTD;
|
%aboutStartupDTD;
|
||||||
]>
|
]>
|
||||||
|
|
||||||
|
@ -34,6 +34,6 @@
|
||||||
<tr><th>×tamp;</th><th>&eventdesc;</th></tr>
|
<tr><th>×tamp;</th><th>&eventdesc;</th></tr>
|
||||||
<tr><td colspan="2"><i>&noevents;</i></td></tr>
|
<tr><td colspan="2"><i>&noevents;</i></td></tr>
|
||||||
</table>
|
</table>
|
||||||
<script type="application/javascript;version=1.8" src="chrome://browser/content/aboutStartup.js"/>
|
<script type="application/javascript;version=1.8" src="chrome://global/content/aboutStartup.js"/>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
|
@ -16,6 +16,8 @@ toolkit.jar:
|
||||||
* content/global/aboutRights-unbranded.xhtml (aboutRights-unbranded.xhtml)
|
* content/global/aboutRights-unbranded.xhtml (aboutRights-unbranded.xhtml)
|
||||||
* content/global/aboutSupport.js
|
* content/global/aboutSupport.js
|
||||||
* content/global/aboutSupport.xhtml
|
* content/global/aboutSupport.xhtml
|
||||||
|
content/global/aboutStartup.xhtml (aboutStartup.xhtml)
|
||||||
|
content/global/aboutStartup.js (aboutStartup.js)
|
||||||
content/global/directionDetector.html
|
content/global/directionDetector.html
|
||||||
content/global/plugins.html
|
content/global/plugins.html
|
||||||
content/global/plugins.css
|
content/global/plugins.css
|
||||||
|
|
|
@ -8,6 +8,8 @@
|
||||||
locale/@AB_CD@/global/aboutRights.properties (%chrome/global/aboutRights.properties)
|
locale/@AB_CD@/global/aboutRights.properties (%chrome/global/aboutRights.properties)
|
||||||
locale/@AB_CD@/global/aboutSupport.dtd (%chrome/global/aboutSupport.dtd)
|
locale/@AB_CD@/global/aboutSupport.dtd (%chrome/global/aboutSupport.dtd)
|
||||||
locale/@AB_CD@/global/aboutSupport.properties (%chrome/global/aboutSupport.properties)
|
locale/@AB_CD@/global/aboutSupport.properties (%chrome/global/aboutSupport.properties)
|
||||||
|
locale/@AB_CD@/global/aboutStartup.dtd (%chrome/global/aboutStartup.dtd)
|
||||||
|
locale/@AB_CD@/global/aboutStartup.properties (%chrome/global/aboutStartup.properties)
|
||||||
locale/@AB_CD@/global/actions.dtd (%chrome/global/actions.dtd)
|
locale/@AB_CD@/global/actions.dtd (%chrome/global/actions.dtd)
|
||||||
locale/@AB_CD@/global/appPicker.dtd (%chrome/global/appPicker.dtd)
|
locale/@AB_CD@/global/appPicker.dtd (%chrome/global/appPicker.dtd)
|
||||||
locale/@AB_CD@/global/brand.dtd (generic/chrome/global/brand.dtd)
|
locale/@AB_CD@/global/brand.dtd (generic/chrome/global/brand.dtd)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче