Non-functional (yet) UI refresh.

2008-04-27 02:48:13 +00:00 · 2008-04-27 02:48:13 +00:00 · 86dd923b97
Parent b8d9b2a417
--- a/content/netError.xhtml
+++ b/content/netError.xhtml
@ -62,10 +62,13 @@
   -
   - ***** END LICENSE BLOCK ***** -->

-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+>
  <head>
    <title>&loadError.label;</title>
    <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
+    <link rel="stylesheet" href="chrome://resurrect/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"/>

    <script type="application/x-javascript"><![CDATA[
@ -284,31 +287,40 @@
      </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);" />
+      <xul:button 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;"
+      <fieldset id='resurrect'>
+        <legend>
+          <img src='chrome://resurrect/skin/tb-icon-small.png' />
+          &resurrect.thispage;
+        </legend>
+        <xul:button
+          value='coralcdn' label=' &resurrect.coralcdn;'
+          image='chrome://resurrect/skin/cacheicons/coralcdn.png'
        />
-      </div>
+        <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'
+        />
+      </fieldset>

-	</div>
+    </div>

    <!--
    - Note: It is important to run the script this way, instead of using
--- a/content/resurrect-select-mirror.xul
+++ b/content/resurrect-select-mirror.xul
@ -1,36 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE overlay SYSTEM "chrome://resurrect/locale/overlay.dtd">
+
 <?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"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	title="&resurrect.title;"
-	buttons="accept, cancel"
+	buttons="cancel"
 	onload="document.getElementById('mirror').focus();"
-	ondialogaccept="return resurrect.clickedXul(event);"
 	persist="width height screenX screenY"
 >

-	<script	type='application/x-javascript'	src='chrome://resurrect/content/resurrect.js'></script>
+<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>
+<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>
+
+	<label value='&resurrect.fromMirror;' />
+	<button
+		value='coralcdn' label=' &resurrect.coralcdn;'
+		image='chrome://resurrect/skin/cacheicons/coralcdn.png'
+	/>
+	<button
+		value='google' label=' &resurrect.google;'
+		image='chrome://resurrect/skin/cacheicons/google.png'
+	/>
+	<button
+		value='googletext' label=' &resurrect.google;&resurrect.textonly;'
+		image='chrome://resurrect/skin/cacheicons/google.png'
+	/>
+	<button
+		value='yahoo' label=' &resurrect.yahoo;'
+		image='chrome://resurrect/skin/cacheicons/yahoo.png'
+	/>
+	<button
+		value='archive' label=' &resurrect.archive;'
+		image='chrome://resurrect/skin/cacheicons/archive.png'
+	/>
+	<button
+		value='msn' label=' &resurrect.msn;'
+		image='chrome://resurrect/skin/cacheicons/msn.png'
+	/>
+
+</vbox>

-		<label value='&resurrect.fromMirror;' />
-		<listbox id='mirror' rows='6'
-			onclick='resurrect.clickedXul(event);'
-		>
-			<listitem value='coralcdn' label='&resurrect.coralcdn;' />
-			<listitem value='google' label='&resurrect.google;' />
-			<listitem value='googletext' label='&resurrect.google;&resurrect.textonly;' />
-			<listitem value='yahoo' label='&resurrect.yahoo;' />
-			<listitem value='archive' label='&resurrect.archive;' />
-			<listitem value='msn' label='&resurrect.msn;' />
-		</listbox>
-	</vbox>
 </dialog>
--- a/skin/cacheicons/archive.png
+++ b/skin/cacheicons/archive.png
--- a/skin/cacheicons/coralcdn.png
+++ b/skin/cacheicons/coralcdn.png
--- a/skin/cacheicons/google.png
+++ b/skin/cacheicons/google.png
--- a/skin/cacheicons/msn.png
+++ b/skin/cacheicons/msn.png
--- a/skin/cacheicons/yahoo.png
+++ b/skin/cacheicons/yahoo.png
--- a/skin/netError.css
+++ b/skin/netError.css
@ -1,15 +1,28 @@
-div#resurrect {
-	margin: 2em 0.5em 0em 0.5em;
-	font-size: 110%;
-
-	background: url(chrome://resurrect/skin/em-icon.png) 0px 5px no-repeat;
-	padding-left: 32px;
+div#errorPageContainer {
+	padding-right: 17em;
+	max-width: 47em;
 }

-div#resurrect button {
-	margin: 5px 0px;
+fieldset#resurrect {
+	position: absolute;
+	top: 0;
+	right: 0;
+
+	background-color: white;
+
+	width: 16em;
+	padding: 1em;
+	margin: 1em;
+	margin-right: 1.5em;
+
+	-moz-border-radius: 10px;
 }

-div#resurrect p {
-	margin: 5px 0px;
+fieldset#resurrect legend img {
+	vertical-align: middle;
+	padding-right: 0.25em;
+}
+
+fieldset#resurrect button {
+	width: 16em;
 }
--- a/skin/select-mirror.css
+++ b/skin/select-mirror.css
@ -0,0 +1,3 @@
+button {
+	width: 16em;
+}