Minimal change to work with FF3, no new features.

Cette révision appartient à :
Anthony Lieuallen 2008-04-26 22:21:00 +00:00
Parent 14fdc6bd92
révision 23e8795776
2 fichiers modifiés avec 257 ajouts et 183 suppressions

Voir le fichier

@ -1,22 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html [ <!DOCTYPE html [
<!ENTITY % htmlDTD <!ENTITY % htmlDTD
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"DTD/xhtml1-strict.dtd"> "DTD/xhtml1-strict.dtd">
%htmlDTD; %htmlDTD;
<!ENTITY % netErrorDTD <!ENTITY % netErrorDTD
SYSTEM "chrome://global/locale/netError.dtd"> SYSTEM "chrome://global/locale/netError.dtd">
%netErrorDTD; %netErrorDTD;
<!ENTITY % globalDTD <!ENTITY % globalDTD
SYSTEM "chrome://global/locale/global.dtd"> SYSTEM "chrome://global/locale/global.dtd">
%globalDTD; %globalDTD;
<!ENTITY % dialogOverlayDTD
SYSTEM "chrome://global/locale/dialogOverlay.dtd"> <!ENTITY % dialogOverlayDTD
%dialogOverlayDTD; SYSTEM "chrome://global/locale/dialogOverlay.dtd">
<!ENTITY % resurrectDTD %dialogOverlayDTD;
SYSTEM "chrome://resurrect/locale/overlay.dtd"> <!ENTITY % resurrectDTD
%resurrectDTD; SYSTEM "chrome://resurrect/locale/overlay.dtd">
%resurrectDTD;
]> ]>
<!-- ***** BEGIN LICENSE BLOCK ***** <!-- ***** BEGIN LICENSE BLOCK *****
@ -44,6 +45,8 @@
- William R. Price <wrprice@alumni.rice.edu> - William R. Price <wrprice@alumni.rice.edu>
- Henrik Skupin <mozilla@hskupin.info> - Henrik Skupin <mozilla@hskupin.info>
- Jeff Walden <jwalden+code@mit.edu> - Jeff Walden <jwalden+code@mit.edu>
- Johnathan Nightingale <johnath@mozilla.com>
- Anthony Lieuallen
- -
- Alternatively, the contents of this file may be used under the terms of - Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or - either the GNU General Public License Version 2 or later (the "GPL"), or
@ -60,188 +63,259 @@
- ***** END LICENSE BLOCK ***** --> - ***** END LICENSE BLOCK ***** -->
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>&loadError.label;</title> <title>&loadError.label;</title>
<link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
<link rel="icon" type="image/png" id="favicon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAICSURBVHjaYvz//z8DJQAggJhwiDPvnmlzc2aR0O+JGezt+AwACCCsBhxfYhn59N41FWtXIxZOLu70niRGXVwGAAQQNgNYHj96O8HaWYdJW5ubwd4/mI2Ng7sblwEAAYRhwMm1URk/vn4SUNWVYGD8+YZBXZOZm5OLzRjoCmNsBgAEEKoBN82Y7l851GLrqMjM8Oc7A8O/3wwMP54wuAQFCXNycUzGZgBAAKEYcOaKZO2/f//5FbUVgBrfMoRVcgHpNwyKGjKMXDwCan0prFboBgAEELIBzDcvXyy2cVZhYPj9GWj7H4jo/38MDJ9OMDj7O/KzsjH3oxsAEEBwA/bNNipiZf7FI6cqwcDw8x2qqp8fGORUpVn4BEXlgGHhhCwFEEAwA9gfP3hdZ+Oizcjw+wvCdjgAuuLrFQbXIH9hTm7uqcgyAAEENuD4ctcebm5mbikFYRTbV7V/Q6j88Z5BSuY7q4CQgAjQFR4wYYAAAhtw89L5ZFsnRaDtn4CW/YXrAQcisit+PGVwDgrnZ2NnnwATBQggpsNLvGYLCAmxi8tLARWg+h3FBVBXSEj/ZZWQkRcCuiIQJAQQQCyvnj5KMDTkZ2JgYmRg4FchnHv+vmEwttLmeXT3VjKQtx4ggFgk5TXebV63UfT3ijOMxOZAVlZWdiB1EMQGCCBGSrMzQIABAFR3kRM3KggZAAAAAElFTkSuQmCC"/>
<link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" /> <script type="application/x-javascript"><![CDATA[
<!-- XXX this needs to be themeable --> // Error url MUST be formatted like this:
<link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAICSURBVHjaYvz//z8DJQAggJhwiDPvnmlzc2aR0O+JGezt+AwACCCsBhxfYhn59N41FWtXIxZOLu70niRGXVwGAAQQNgNYHj96O8HaWYdJW5ubwd4/mI2Ng7sblwEAAYRhwMm1URk/vn4SUNWVYGD8+YZBXZOZm5OLzRjoCmNsBgAEEKoBN82Y7l851GLrqMjM8Oc7A8O/3wwMP54wuAQFCXNycUzGZgBAAKEYcOaKZO2/f//5FbUVgBrfMoRVcgHpNwyKGjKMXDwCan0prFboBgAEELIBzDcvXyy2cVZhYPj9GWj7H4jo/38MDJ9OMDj7O/KzsjH3oxsAEEBwA/bNNipiZf7FI6cqwcDw8x2qqp8fGORUpVn4BEXlgGHhhCwFEEAwA9gfP3hdZ+Oizcjw+wvCdjgAuuLrFQbXIH9hTm7uqcgyAAEENuD4ctcebm5mbikFYRTbV7V/Q6j88Z5BSuY7q4CQgAjQFR4wYYAAAhtw89L5ZFsnRaDtn4CW/YXrAQcisit+PGVwDgrnZ2NnnwATBQggpsNLvGYLCAmxi8tLARWg+h3FBVBXSEj/ZZWQkRcCuiIQJAQQQCyvnj5KMDTkZ2JgYmRg4FchnHv+vmEwttLmeXT3VjKQtx4ggFgk5TXebV63UfT3ijOMxOZAVlZWdiB1EMQGCCBGSrMzQIABAFR3kRM3KggZAAAAAElFTkSuQmCC" /> // moz-neterror:page?e=error&u=url&d=desc
//
// or optionally, to specify an alternate CSS class to allow for
// custom styling and favicon:
//
// moz-neterror:page?e=error&u=url&s=classname&d=desc
<link rel="stylesheet" href="chrome://resurrect/skin/netError.css" type="text/css" media="all" /> // Note that this file uses document.documentURI to get
// the URL (with the format from above). This is because
// document.location.href gets the current URI off the docshell,
// which is the URL displayed in the location bar, i.e.
// the URI that the user attempted to load.
<script type="application/x-javascript"><![CDATA[ function getErrorCode()
// Error url MUST be formatted like this: {
// moz-neterror:page?e=error&u=url&d=desc var url = document.documentURI;
var error = url.search(/e\=/);
var duffUrl = url.search(/\&u\=/);
return decodeURIComponent(url.slice(error + 2, duffUrl));
}
// Note that this file uses document.documentURI to get function getCSSClass()
// the URL (with the format from above). This is because {
// document.location.href gets the current URI off the docshell, var url = document.documentURI;
// which is the URL displayed in the location bar, i.e. var matches = url.match(/s\=([^&]+)\&/);
// the URI that the user attempted to load. // s is optional, if no match just return nothing
if (!matches || matches.length < 2)
return "";
function getErrorCode() // parenthetical match is the second entry
{ return decodeURIComponent(matches[1]);
var url = document.documentURI; }
var error = url.search(/e\=/);
var duffUrl = url.search(/\&u\=/);
return decodeURIComponent(url.slice(error + 2, duffUrl));
}
function getDescription() function getDescription()
{ {
var url = document.documentURI; var url = document.documentURI;
var desc = url.search(/d\=/); var desc = url.search(/d\=/);
// desc == -1 if not found; if so, return an empty string // desc == -1 if not found; if so, return an empty string
// instead of what would turn out to be portions of the URI // instead of what would turn out to be portions of the URI
if (desc == -1) return ""; if (desc == -1)
return "";
return decodeURIComponent(url.slice(desc + 2)); return decodeURIComponent(url.slice(desc + 2));
} }
function retryThis() function retryThis(buttonEl)
{ {
// Session history has the URL of the page that failed // Session history has the URL of the page that failed
// to load, not the one of the error page. So, just call // to load, not the one of the error page. So, just call
// reload(), which will also repost POST data correctly. // reload(), which will also repost POST data correctly.
location.reload(); try {
} location.reload();
} catch (e) {
// We probably tried to reload a URI that caused an exception to
// occur; e.g. a non-existent file.
}
function initPage() buttonEl.disabled = true;
{ }
var err = getErrorCode();
// if it's an unknown error or there's no title or description function initPage()
// defined, get the generic message {
var errTitle = document.getElementById("et_" + err); var err = getErrorCode();
var errDesc = document.getElementById("ed_" + err);
if (!errTitle || !errDesc) if (err == "nssBadCert") {
{ // Remove the "Try again" button for security exceptions, since it's
errTitle = document.getElementById("et_generic"); // almost certainly useless.
errDesc = document.getElementById("ed_generic"); document.getElementById("errorTryAgain").style.display = "none";
} }
else {
// Remove the override block for non-certificate errors. CSS-hiding
// isn't good enough here, because of bug 39098
var secOverride = document.getElementById("securityOverrideDiv");
secOverride.parentNode.removeChild(secOverride);
}
var title = document.getElementById("errorTitleText"); // if it's an unknown error or there's no title or description
if (title) // defined, get the generic message
{ var errTitle = document.getElementById("et_" + err);
title.parentNode.replaceChild(errTitle, title); var errDesc = document.getElementById("ed_" + err);
// change id to the replaced child's id so styling works if (!errTitle || !errDesc)
errTitle.id = "errorTitleText"; {
} errTitle = document.getElementById("et_generic");
errDesc = document.getElementById("ed_generic");
}
var sd = document.getElementById("errorShortDescText"); var title = document.getElementById("errorTitleText");
if (sd) if (title)
sd.textContent = getDescription(); {
title.parentNode.replaceChild(errTitle, title);
// change id to the replaced child's id so styling works
errTitle.id = "errorTitleText";
}
var ld = document.getElementById("errorLongDesc"); var sd = document.getElementById("errorShortDescText");
if (ld) if (sd)
{ sd.textContent = getDescription();
ld.parentNode.replaceChild(errDesc, ld);
// change id to the replaced child's id so styling works
errDesc.id = "errorLongDesc";
}
// remove undisplayed errors to avoid bug 39098 var ld = document.getElementById("errorLongDesc");
var errContainer = document.getElementById("errorContainer"); if (ld)
errContainer.parentNode.removeChild(errContainer); {
} ld.parentNode.replaceChild(errDesc, ld);
]]></script> // change id to the replaced child's id so styling works
</head> errDesc.id = "errorLongDesc";
}
<body dir="&locale.dir;"> // remove undisplayed errors to avoid bug 39098
var errContainer = document.getElementById("errorContainer");
errContainer.parentNode.removeChild(errContainer);
<!-- ERROR ITEM CONTAINER (removed during loading to avoid bug 39098) --> var className = getCSSClass();
if (className) {
// Associate a CSS class with the root of the page, if one was passed in,
// to allow custom styling.
document.documentElement.className = className;
// Also, if they specified a CSS class, they must supply their own
// favicon. In order to trigger the browser to repaint though, we
// need to remove/add the link element.
var favicon = document.getElementById("favicon");
var faviconParent = favicon.parentNode;
faviconParent.removeChild(favicon);
favicon.setAttribute("href", "chrome://global/skin/icons/" + className + "_favicon.png");
faviconParent.appendChild(favicon);
}
}
function showSecuritySection() {
// Swap link out, content in
document.getElementById('securityOverrideContent').style.display = '';
document.getElementById('securityOverrideLink').style.display = 'none';
}
]]></script>
</head>
<body dir="&locale.dir;">
<!-- ERROR ITEM CONTAINER (removed during loading to avoid bug 39098) -->
<div id="errorContainer">
<div id="errorTitlesContainer">
<h1 id="et_generic">&generic.title;</h1>
<h1 id="et_dnsNotFound">&dnsNotFound.title;</h1>
<h1 id="et_fileNotFound">&fileNotFound.title;</h1>
<h1 id="et_malformedURI">&malformedURI.title;</h1>
<h1 id="et_protocolNotFound">&protocolNotFound.title;</h1>
<h1 id="et_connectionFailure">&connectionFailure.title;</h1>
<h1 id="et_netTimeout">&netTimeout.title;</h1>
<h1 id="et_redirectLoop">&redirectLoop.title;</h1>
<h1 id="et_unknownSocketType">&unknownSocketType.title;</h1>
<h1 id="et_netReset">&netReset.title;</h1>
<h1 id="et_netOffline">&netOffline.title;</h1>
<h1 id="et_netInterrupt">&netInterrupt.title;</h1>
<h1 id="et_deniedPortAccess">&deniedPortAccess.title;</h1>
<h1 id="et_proxyResolveFailure">&proxyResolveFailure.title;</h1>
<h1 id="et_proxyConnectFailure">&proxyConnectFailure.title;</h1>
<h1 id="et_contentEncodingError">&contentEncodingError.title;</h1>
<h1 id="et_unsafeContentType">&unsafeContentType.title;</h1>
<h1 id="et_nssFailure2">&nssFailure2.title;</h1>
<h1 id="et_nssBadCert">&nssBadCert.title;</h1>
<h1 id="et_malwareBlocked">&malwareBlocked.title;</h1>
</div>
<div id="errorDescriptionsContainer">
<div id="ed_generic">&generic.longDesc;</div>
<div id="ed_dnsNotFound">&dnsNotFound.longDesc;</div>
<div id="ed_fileNotFound">&fileNotFound.longDesc;</div>
<div id="ed_malformedURI">&malformedURI.longDesc;</div>
<div id="ed_protocolNotFound">&protocolNotFound.longDesc;</div>
<div id="ed_connectionFailure">&connectionFailure.longDesc;</div>
<div id="ed_netTimeout">&netTimeout.longDesc;</div>
<div id="ed_redirectLoop">&redirectLoop.longDesc;</div>
<div id="ed_unknownSocketType">&unknownSocketType.longDesc;</div>
<div id="ed_netReset">&netReset.longDesc;</div>
<div id="ed_netOffline">&netOffline.longDesc;</div>
<div id="ed_netInterrupt">&netInterrupt.longDesc;</div>
<div id="ed_deniedPortAccess">&deniedPortAccess.longDesc;</div>
<div id="ed_proxyResolveFailure">&proxyResolveFailure.longDesc;</div>
<div id="ed_proxyConnectFailure">&proxyConnectFailure.longDesc;</div>
<div id="ed_contentEncodingError">&contentEncodingError.longDesc;</div>
<div id="ed_unsafeContentType">&unsafeContentType.longDesc;</div>
<div id="ed_nssFailure2">&nssFailure2.longDesc;</div>
<div id="ed_nssBadCert">&nssBadCert.longDesc2;</div>
<div id="ed_malwareBlocked">&malwareBlocked.longDesc;</div>
</div>
</div>
<!-- PAGE CONTAINER (for styling purposes only) -->
<div id="errorPageContainer">
<!-- Error Title -->
<div id="errorTitle">
<h1 id="errorTitleText" />
</div>
<!-- LONG CONTENT (the section most likely to require scrolling) -->
<div id="errorLongContent">
<!-- Short Description -->
<div id="errorShortDesc">
<p id="errorShortDescText" />
</div>
<!-- Long Description (Note: See netError.dtd for used XHTML tags) -->
<div id="errorLongDesc" />
<!-- Override section - For ssl errors only. Removed on init for other
error types. -->
<div id="securityOverrideDiv">
<a id="securityOverrideLink" href="javascript:showSecuritySection();" >&securityOverride.linkText;</a>
<div id="securityOverrideContent" style="display: none;">&securityOverride.warningText;</div>
</div>
</div>
<!-- Retry Button -->
<xul:button xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="errorTryAgain" label="&retry.label;" oncommand="retryThis(this);" />
<div id='resurrect'>
<!-- fake elements that have IDs matching target selector -->
<div id='targetTab' style='display: none;'></div>
<div id='targetWin' style='display: none;'></div>
<p>&resurrect.thispage;</p>
<select id='mirror' size='6'>
<option value='coralcdn'>&resurrect.coralcdn;</option>
<option value='google'>&resurrect.google;</option>
<option value='googletext'>&resurrect.google;&resurrect.textonly;</option>
<option value='yahoo'>&resurrect.yahoo;</option>
<option value='archive'>&resurrect.archive;</option>
<option value='msn'>&resurrect.msn;</option>
</select>
<br />
<xul:button xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="mirrorSelect" label="&okButton.label;"
/>
</div>
<div id="errorContainer">
<div id="errorTitlesContainer">
<h1 id="et_generic">&generic.title;</h1>
<h1 id="et_dnsNotFound">&dnsNotFound.title;</h1>
<h1 id="et_fileNotFound">&fileNotFound.title;</h1>
<h1 id="et_malformedURI">&malformedURI.title;</h1>
<h1 id="et_protocolNotFound">&protocolNotFound.title;</h1>
<h1 id="et_connectionFailure">&connectionFailure.title;</h1>
<h1 id="et_netTimeout">&netTimeout.title;</h1>
<h1 id="et_redirectLoop">&redirectLoop.title;</h1>
<h1 id="et_unknownSocketType">&unknownSocketType.title;</h1>
<h1 id="et_netReset">&netReset.title;</h1>
<h1 id="et_netOffline">&netOffline.title;</h1>
<h1 id="et_netInterrupt">&netInterrupt.title;</h1>
<h1 id="et_deniedPortAccess">&deniedPortAccess.title;</h1>
<h1 id="et_proxyResolveFailure">&proxyResolveFailure.title;</h1>
<h1 id="et_proxyConnectFailure">&proxyConnectFailure.title;</h1>
</div> </div>
<div id="errorDescriptionsContainer"> <!--
<div id="ed_generic">&generic.longDesc;</div> - Note: It is important to run the script this way, instead of using
<div id="ed_dnsNotFound">&dnsNotFound.longDesc;</div> - an onload handler. This is because error pages are loaded as
<div id="ed_fileNotFound">&fileNotFound.longDesc;</div> - LOAD_BACKGROUND, which means that onload handlers will not be executed.
<div id="ed_malformedURI">&malformedURI.longDesc;</div> -->
<div id="ed_protocolNotFound">&protocolNotFound.longDesc;</div> <script type="application/x-javascript">initPage();</script>
<div id="ed_connectionFailure">&connectionFailure.longDesc;</div>
<div id="ed_netTimeout">&netTimeout.longDesc;</div>
<div id="ed_redirectLoop">&redirectLoop.longDesc;</div>
<div id="ed_unknownSocketType">&unknownSocketType.longDesc;</div>
<div id="ed_netReset">&netReset.longDesc;</div>
<div id="ed_netOffline">&netOffline.longDesc;</div>
<div id="ed_netInterrupt">&netInterrupt.longDesc;</div>
<div id="ed_deniedPortAccess">&deniedPortAccess.longDesc;</div>
<div id="ed_proxyResolveFailure">&proxyResolveFailure.longDesc;</div>
<div id="ed_proxyConnectFailure">&proxyConnectFailure.longDesc;</div>
</div>
</div>
<!-- PAGE CONTAINER (for styling purposes only) --> </body>
<div id="errorPageContainer">
<!-- Error Title -->
<div id="errorTitle">
<h1 id="errorTitleText" />
</div>
<!-- LONG CONTENT (the section most likely to require scrolling) -->
<div id="errorLongContent">
<!-- Short Description -->
<div id="errorShortDesc">
<p id="errorShortDescText" />
</div>
<!-- Long Description (Note: See netError.dtd for used XHTML tags) -->
<div id="errorLongDesc" />
</div>
<!-- Retry Button -->
<xul:button xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="errorTryAgain" label="&retry.label;" oncommand="retryThis();"
/>
<div id='resurrect'>
<!-- fake elements that have IDs matching target selector -->
<div id='targetTab' style='display: none;'></div>
<div id='targetWin' style='display: none;'></div>
<p>&resurrect.thispage;</p>
<select id='mirror' size='6'>
<option value='coralcdn'>&resurrect.coralcdn;</option>
<option value='google'>&resurrect.google;</option>
<option value='googletext'>&resurrect.google;&resurrect.textonly;</option>
<option value='yahoo'>&resurrect.yahoo;</option>
<option value='archive'>&resurrect.archive;</option>
<option value='msn'>&resurrect.msn;</option>
</select>
<br />
<xul:button xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="mirrorSelect" label="&okButton.label;"
/>
</div>
</div>
<!--
- Note: It is important to run the script this way, instead of using
- an onload handler. This is because error pages are loaded as
- LOAD_BACKGROUND, which means that onload handlers will not be executed.
-->
<script type="application/x-javascript">initPage();</script>
</body>
</html> </html>

Voir le fichier

@ -3,11 +3,11 @@
<Description about="urn:mozilla:install-manifest"> <Description about="urn:mozilla:install-manifest">
<em:id>{0c8fbd76-bdeb-4c52-9b24-d587ce7b9dc3}</em:id> <em:id>{0c8fbd76-bdeb-4c52-9b24-d587ce7b9dc3}</em:id>
<em:name>Resurrect Pages</em:name> <em:name>Resurrect Pages</em:name>
<em:version>1.0.8</em:version> <em:version>2.0</em:version>
<em:description>Resurrect dead pages, by finding their ghosts.</em:description> <em:description>Resurrect dead pages, by finding their ghosts.</em:description>
<em:homepageURL>http://trac.arantius.com/wiki/Extensions/Resurrect</em:homepageURL> <em:homepageURL>http://trac.arantius.com/wiki/Extensions/Resurrect</em:homepageURL>
<em:updateURL>http://arantius.com/misc/firefox-extensions/mine/updates.rdf</em:updateURL> <em:updateURL>https://arantius.com/misc/firefox-extensions/mine/resurrect.rdf</em:updateURL>
<em:iconURL>chrome://resurrect/skin/em-icon.png</em:iconURL> <em:iconURL>chrome://resurrect/skin/em-icon.png</em:iconURL>
<em:creator>Anthony Lieuallen</em:creator> <em:creator>Anthony Lieuallen</em:creator>
@ -16,8 +16,8 @@
<em:targetApplication> <em:targetApplication>
<Description> <Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>1.5</em:minVersion> <em:minVersion>3.0a5</em:minVersion>
<em:maxVersion>2.0.0.*</em:maxVersion> <em:maxVersion>3.0.*</em:maxVersion>
</Description> </Description>
</em:targetApplication> </em:targetApplication>
</Description> </Description>