From 7f1d3edf69fa5e7d094967782c50258ee7302dd3 Mon Sep 17 00:00:00 2001
From: David Norton <david@nortoncrew.com>
Date: Wed, 31 May 2006 21:06:16 +0000
Subject: [PATCH] Editing metadata works. The metadata and notes panes are
 aligned along the right side of view. The CSS and XUL for view.xul are now
 better structured.

---
 .../content/scholar/metadataPane.js           |  2 +-
 .../content/scholar/metadataPane.xul          |  2 +-
 chrome/chromeFiles/content/scholar/view.js    |  1 +
 chrome/chromeFiles/content/scholar/view.xul   | 21 ++++--------
 .../chromeFiles/skin/default/scholar/view.css | 32 ++++++++++---------
 5 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/chrome/chromeFiles/content/scholar/metadataPane.js b/chrome/chromeFiles/content/scholar/metadataPane.js
index 8492609980..3bba5afd39 100644
--- a/chrome/chromeFiles/content/scholar/metadataPane.js
+++ b/chrome/chromeFiles/content/scholar/metadataPane.js
@@ -194,4 +194,4 @@ MetadataPane = new function()
 	}
 }
 
-window.addEventListener("load", function(e) { MetadataPane.init(e); }, false);
+document.addEventListener("load", function(e) { MetadataPane.init(e); }, false);
diff --git a/chrome/chromeFiles/content/scholar/metadataPane.xul b/chrome/chromeFiles/content/scholar/metadataPane.xul
index d1f72634f9..c0d5dd80d6 100644
--- a/chrome/chromeFiles/content/scholar/metadataPane.xul
+++ b/chrome/chromeFiles/content/scholar/metadataPane.xul
@@ -5,7 +5,7 @@
 	
 	<script src="metadataPane.js"/>
 	
-	<vbox id="metadata-pane">
+	<vbox id="metadata">
 		<grid>
 			<columns>
 				<column/>
diff --git a/chrome/chromeFiles/content/scholar/view.js b/chrome/chromeFiles/content/scholar/view.js
index 370c7b8cbe..1abe4c552b 100644
--- a/chrome/chromeFiles/content/scholar/view.js
+++ b/chrome/chromeFiles/content/scholar/view.js
@@ -5,6 +5,7 @@ function init()
 	thisItem = Scholar.Items.get(getArgument("id"));
 	
 	document.getElementById('view').setAttribute('src','http://www.google.com/search?q='+encodeURIComponent('"'+thisItem.getField("title")+'"')+'&btnI');
+	MetadataPane.viewItem(thisItem);
 }
 
 function toggle(id)
diff --git a/chrome/chromeFiles/content/scholar/view.xul b/chrome/chromeFiles/content/scholar/view.xul
index 4ed716f6d8..4d0a3acd4e 100644
--- a/chrome/chromeFiles/content/scholar/view.xul
+++ b/chrome/chromeFiles/content/scholar/view.xul
@@ -6,6 +6,7 @@
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	<script src="view.js"/>
 	<script src="include.js"/>
+	<?xul-overlay href="metadataPane.xul" ?>
 	
 	<toolbar id="view-toolbar">
 		<toolbarbutton class="toggler" id="tb-view" label="View" checked="true"				oncommand="toggle('view')"/>
@@ -14,21 +15,11 @@
 	</toolbar>
 	<stack flex="1">
 		<browser id="view" flex="1"/>
-		<vbox>
-			<stack id="metadata">
-				<vbox id="metadata-pane">
-					<textbox value="Title"/>
-					<textbox value="Rights"/>
-					<textbox value="Etc."/>
-					<textbox value="Etc."/>
-					<textbox value="Etc."/>
-				</vbox>
-			</stack>
-			<stack id="notes">
-				<vbox id="notes-pane">
-					<textbox value="Notes.... lorem ispum delorum..." multiline="true" flex="1"/>
-				</vbox>
-			</stack>
+		<vbox align="end">
+			<vbox id="metadata" class="floater"/>
+			<vbox id="notes" class="floater">
+				<textbox value="Notes.... lorem ispum delorum..." multiline="true" flex="1"/>
+			</vbox>
 		</vbox>
 	</stack>
 </page>
\ No newline at end of file
diff --git a/chrome/chromeFiles/skin/default/scholar/view.css b/chrome/chromeFiles/skin/default/scholar/view.css
index e19ab35b95..ccfc18b0b1 100644
--- a/chrome/chromeFiles/skin/default/scholar/view.css
+++ b/chrome/chromeFiles/skin/default/scholar/view.css
@@ -1,6 +1,6 @@
 #view-toolbar
 {
-	
+	background: #f5f5f5;
 }
 
 #view-toolbar .toggler
@@ -13,27 +13,29 @@
 	width: 400px;
 }
 
-#metadata-pane
+.floater
 {
 	position: relative;
 	margin-top: 10px;
-	left: 10px;
-	width: 400px;
-	height: 100px;
-	overflow: auto;
+	margin-right: 30px;
+	
 	padding: 5px;
-	font-size: 11px;
+	font-size: 12px;
 	background: #f5f5f5;
+	width: 400px;
 }
 
-#notes-pane
+#metadata
+{
+
+}
+
+#notes
 {
-	position: relative;
-	margin-top: 10px;
-	left: 10px;
-	width: 400px;
 	height: 100px;
-	padding: 5px;
-	font-size: 11px;
-	background: #f5f5f5;
+}
+
+#metadata toolbar
+{
+	border-bottom: none;
 }
\ No newline at end of file