From aa41978272f75df9d8a9ef8bfdc5608ea77b5b6e Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Wed, 30 Apr 2008 01:34:49 +0000
Subject: [PATCH]  * Tweak the appearance; a bit narrower, skip the "cache"
 labels on (most) all of the buttons.

---
 content/netError.xhtml              |  4 ++
 content/resurrect-select-mirror.xul | 87 ++++++++++++++++-------------
 locale/en-US/overlay.dtd            |  9 +--
 skin/netError.css                   |  6 +-
 skin/select-mirror.css              |  4 +-
 5 files changed, 62 insertions(+), 48 deletions(-)

diff --git a/content/netError.xhtml b/content/netError.xhtml
index 9152959..cc216f5 100644
--- a/content/netError.xhtml
+++ b/content/netError.xhtml
@@ -326,6 +326,10 @@
           value='gigablast' label=' &resurrect.gigablast;'
           image='chrome://resurrect/skin/cacheicons/gigablast.png'
         />
+        <xul:button
+          value='webcitation' label=' &resurrect.webcitation;'
+          image='chrome://resurrect/skin/cacheicons/webcitation.png'
+        />
       </fieldset>
 
     </div>
diff --git a/content/resurrect-select-mirror.xul b/content/resurrect-select-mirror.xul
index a6c1213..4535f90 100644
--- a/content/resurrect-select-mirror.xul
+++ b/content/resurrect-select-mirror.xul
@@ -4,55 +4,64 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://resurrect/skin/select-mirror.css" type="text/css"?>
 
-<dialog id="resurrect-select-mirror"
+<!-- "B" in the ID is to lose the (wrong) persisted height from old versions -->
+<dialog id="resurrect-select-mirrorB"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	title="&resurrect.title;"
 	buttons="cancel"
-	persist="width height screenX screenY"
+	persist="screenX screenY"
 >
 
 <script type='application/x-javascript' src='chrome://resurrect/content/resurrect.js'></script>
 
 <vbox>
-	<label value='&resurrect.this;' />
-	<radiogroup>
-		<radio id='targetCurr' label='&resurrect.inCurrTab;' selected='true' />
-		<radio id='targetTab' label='&resurrect.inNewTab;' />
-		<radio id='targetWin' label='&resurrect.inNewWin;' />
-	</radiogroup>
+	<groupbox>
+		<caption label='&resurrect.this;' />
 
-	<label value='&resurrect.fromMirror;' />
-	<vbox id='resurrect' onclick='resurrect.clickedXul(event);'>
-	<xul:button
-		value='coralcdn' label=' &resurrect.coralcdn;'
-		image='chrome://resurrect/skin/cacheicons/coralcdn.png'
-	/>
-	<xul:button
-		value='google' label=' &resurrect.google;'
-		image='chrome://resurrect/skin/cacheicons/google.png'
-	/>
-	<xul:button
-		value='googletext' label=' &resurrect.google;&resurrect.textonly;'
-		image='chrome://resurrect/skin/cacheicons/google.png'
-	/>
-	<xul:button
-		value='yahoo' label=' &resurrect.yahoo;'
-		image='chrome://resurrect/skin/cacheicons/yahoo.png'
-	/>
-	<xul:button
-		value='archive' label=' &resurrect.archive;'
-		image='chrome://resurrect/skin/cacheicons/archive.png'
-	/>
-	<xul:button
-		value='msn' label=' &resurrect.msn;'
-		image='chrome://resurrect/skin/cacheicons/msn.png'
-	/>
-	<xul:button
-		value='gigablast' label=' &resurrect.gigablast;'
-		image='chrome://resurrect/skin/cacheicons/gigablast.png'
-	/>
-	</vbox>
+		<radiogroup>
+			<radio id='targetCurr' label='&resurrect.inCurrTab;' selected='true' />
+			<radio id='targetTab' label='&resurrect.inNewTab;' />
+			<radio id='targetWin' label='&resurrect.inNewWin;' />
+		</radiogroup>
+	</groupbox>
+
+	<groupbox id='resurrect' onclick='resurrect.clickedXul(event);'>
+		<caption label='&resurrect.fromMirror;' />
+
+		<xul:button
+			value='coralcdn' label=' &resurrect.coralcdn;'
+			image='chrome://resurrect/skin/cacheicons/coralcdn.png'
+		/>
+		<xul:button
+			value='google' label=' &resurrect.google;'
+			image='chrome://resurrect/skin/cacheicons/google.png'
+		/>
+		<xul:button
+			value='googletext' label=' &resurrect.google;&resurrect.textonly;'
+			image='chrome://resurrect/skin/cacheicons/google.png'
+		/>
+		<xul:button
+			value='yahoo' label=' &resurrect.yahoo;'
+			image='chrome://resurrect/skin/cacheicons/yahoo.png'
+		/>
+		<xul:button
+			value='archive' label=' &resurrect.archive;'
+			image='chrome://resurrect/skin/cacheicons/archive.png'
+		/>
+		<xul:button
+			value='msn' label=' &resurrect.msn;'
+			image='chrome://resurrect/skin/cacheicons/msn.png'
+		/>
+		<xul:button
+			value='gigablast' label=' &resurrect.gigablast;'
+			image='chrome://resurrect/skin/cacheicons/gigablast.png'
+		/>
+		<xul:button
+			value='webcitation' label=' &resurrect.webcitation;'
+			image='chrome://resurrect/skin/cacheicons/webcitation.png'
+		/>
+	</groupbox>
 
 </vbox>
 
diff --git a/locale/en-US/overlay.dtd b/locale/en-US/overlay.dtd
index f413ee7..d5f44a2 100644
--- a/locale/en-US/overlay.dtd
+++ b/locale/en-US/overlay.dtd
@@ -5,12 +5,13 @@
 <!ENTITY resurrect.thislink "Resurrect this link...">
 <!ENTITY resurrect.fromMirror "From mirror">
 <!ENTITY resurrect.coralcdn "CoralCDN">
-<!ENTITY resurrect.google "Google Cache">
+<!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly " (text only)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
+<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
-<!ENTITY resurrect.msn "Live Search (MSN) Cache">
-<!ENTITY resurrect.gigablast "Gigablast Cache">
+<!ENTITY resurrect.msn "Live Search (MSN)">
+<!ENTITY resurrect.gigablast "Gigablast">
+<!ENTITY resurrect.webcitation "WebCite">
 <!ENTITY resurrect.inCurrTab "In the current tab/window">
 <!ENTITY resurrect.inNewTab "In a new tab">
 <!ENTITY resurrect.inNewWin "In a new window">
diff --git a/skin/netError.css b/skin/netError.css
index 755b6d2..e25e0d6 100644
--- a/skin/netError.css
+++ b/skin/netError.css
@@ -1,5 +1,5 @@
 div#errorPageContainer {
-	padding-right: 20em;
+	padding-right: 18em;
 	max-width: 45em;
 }
 
@@ -10,7 +10,7 @@ fieldset#resurrect {
 
 	background-color: white;
 
-	width: 16em;
+	width: 14em;
 	padding: 1em;
 	margin: 1em;
 	margin-right: 1.5em;
@@ -24,5 +24,5 @@ fieldset#resurrect legend img {
 }
 
 fieldset#resurrect button {
-	width: 16em;
+	width: 14em;
 }
diff --git a/skin/select-mirror.css b/skin/select-mirror.css
index 13b8b54..daf86af 100755
--- a/skin/select-mirror.css
+++ b/skin/select-mirror.css
@@ -1,3 +1,3 @@
-button {
-	width: 16em;
+#resurrect button {
+	width: 14em;
 }