From edb653cad4f927a766e7b8527cb8b66d1e894e87 Mon Sep 17 00:00:00 2001
From: David Norton <david@nortoncrew.com>
Date: Tue, 23 May 2006 19:12:53 +0000
Subject: [PATCH] completed move to overlay.xul. Main interface will now be in
 scholar.xul. Next move: move functionality from sidebar.xul, editpane.xul to
 scholar.xul

---
 chrome/chromeFiles/content/scholar/overlay.xul                  | 2 +-
 .../chromeFiles/content/scholar/{scholar-main.js => scholar.js} | 0
 .../content/scholar/{scholar-main.xul => scholar.xul}           | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename chrome/chromeFiles/content/scholar/{scholar-main.js => scholar.js} (100%)
 rename chrome/chromeFiles/content/scholar/{scholar-main.xul => scholar.xul} (97%)

diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
index 7cd9d95861..1820ec6c19 100644
--- a/chrome/chromeFiles/content/scholar/overlay.xul
+++ b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -25,7 +25,7 @@
 	
 	<menupopup id="menu_ToolsPopup">
 		<menuitem id="tools-scholar"
-			oncommand="open('chrome://scholar/content/scholar-main.xul','scholar-window','chrome, resizable');" label="Scholar"
+			oncommand="open('chrome://scholar/content/scholar.xul','scholar-window','chrome, resizable');" label="Scholar"
 			key="key_openScholar"/>
 	</menupopup>
   
diff --git a/chrome/chromeFiles/content/scholar/scholar-main.js b/chrome/chromeFiles/content/scholar/scholar.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/scholar-main.js
rename to chrome/chromeFiles/content/scholar/scholar.js
diff --git a/chrome/chromeFiles/content/scholar/scholar-main.xul b/chrome/chromeFiles/content/scholar/scholar.xul
similarity index 97%
rename from chrome/chromeFiles/content/scholar/scholar-main.xul
rename to chrome/chromeFiles/content/scholar/scholar.xul
index b207e8236b..a26259eaf7 100644
--- a/chrome/chromeFiles/content/scholar/scholar-main.xul
+++ b/chrome/chromeFiles/content/scholar/scholar.xul
@@ -11,7 +11,7 @@
     onload="init()"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
     
-    <script src="scholar-main.js"/>
+    <script src="scholar.js"/>
     <script src="treeView.js"/>
     
 	<toolbar>