www

commit 70be7cf8fd41345dcddd0d5fd17f4351875f63c7
parent 8ed37732c1c000952fe92a83ebca6d33236bf61d
Author: David Norton <david@nortoncrew.com>
Date:   Wed, 14 Jun 2006 17:43:02 +0000

Switched Notes and Info tabs.
The tabbox should always fill the allotted space. Hopefully?

Diffstat:
M
chrome/chromeFiles/content/scholar/collectionTreeView.js
 | 
4
+++-
M
chrome/chromeFiles/content/scholar/itemPane.xul
 | 
22
+++++++++++-----------

2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/chrome/chromeFiles/content/scholar/collectionTreeView.js b/chrome/chromeFiles/content/scholar/collectionTreeView.js
@@ -281,7 +281,8 @@ Scholar.CollectionTreeView.prototype.canDrop = function(row, orient)
 	}
 	catch (e)
 	{
-		//a work around a limitation in nsDragAndDrop.js -- the mDragSession is not set until the drag moves over another control. (this will only happen if the first drag is from the collection list)
+		//a work around a limitation in nsDragAndDrop.js -- the mDragSession is not set until the drag moves over another control.
+		//(this will only happen if the first drag is from the collection list)
 		nsDragAndDrop.mDragSession = nsDragAndDrop.mDragService.getCurrentSession();
 		return false;
 	}
@@ -289,6 +290,7 @@ Scholar.CollectionTreeView.prototype.canDrop = function(row, orient)
 	var dataType = data.flavour.contentType;
 	var rowCollection = this._getItemAtRow(row).ref;
 	
+	//Check to make sure that the highlighting is done right
 	if(orient == 1 && row == 0 && dataType == 'scholar/collection')
 	{
 		return true;
diff --git a/chrome/chromeFiles/content/scholar/itemPane.xul b/chrome/chromeFiles/content/scholar/itemPane.xul
@@ -5,32 +5,32 @@
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	
 	<script src="itemPane.js"/>	
-	<tabbox id="scholar-view-item">
+	<tabbox id="scholar-view-item" height="1000" style="margin-left: 5px;">
 		<tabs>
-			<tab label="Info"/>
 			<tab label="Notes"/>
+			<tab label="Info"/>
 		</tabs>
 		<tabpanels flex="1">
-			<vbox id="scholar-metadata">
+			<vbox>
+				<textbox id="scholar-notes"
+					type="timed" timeout="1000" oncommand="ScholarItemPane.modifyField('notes',this.value);"
+					multiline="true" flex="1"
+					onblur="ScholarItemPane.modifyField('notes',this.value);"/>
+			</vbox>
+			<vbox id="scholar-metadata" flex="1">
 				<popupset>
 					<popup id="creatorTypeMenu" position="after_start" oncommand="ScholarItemPane.modifyCreator(document.popupNode.getAttribute('fieldname').split('-')[1],'typeID',event.explicitOriginalTarget.getAttribute('typeid'));"/>
 				</popupset>
-				<grid>
+				<grid flex="1">
 					<columns>
 						<column/>
 						<column flex="1"/>
 					</columns>
 					
-					<rows id="editpane-dynamic-fields">
+					<rows id="editpane-dynamic-fields" flex="1">
 					</rows>
 				</grid>
 			</vbox>
-			<vbox>
-				<textbox id="scholar-notes"
-					type="timed" timeout="1000" oncommand="ScholarItemPane.modifyField('notes',this.value);"
-					multiline="true" flex="1"
-					onblur="ScholarItemPane.modifyField('notes',this.value);"/>
-			</vbox>
 		</tabpanels>
 	</tabbox>
 </overlay>
 \ No newline at end of file