Switched Notes and Info tabs.
The tabbox should always fill the allotted space. Hopefully?
This commit is contained in:
parent
8ed37732c1
commit
70be7cf8fd
|
@ -281,7 +281,8 @@ Scholar.CollectionTreeView.prototype.canDrop = function(row, orient)
|
||||||
}
|
}
|
||||||
catch (e)
|
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();
|
nsDragAndDrop.mDragSession = nsDragAndDrop.mDragService.getCurrentSession();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -289,6 +290,7 @@ Scholar.CollectionTreeView.prototype.canDrop = function(row, orient)
|
||||||
var dataType = data.flavour.contentType;
|
var dataType = data.flavour.contentType;
|
||||||
var rowCollection = this._getItemAtRow(row).ref;
|
var rowCollection = this._getItemAtRow(row).ref;
|
||||||
|
|
||||||
|
//Check to make sure that the highlighting is done right
|
||||||
if(orient == 1 && row == 0 && dataType == 'scholar/collection')
|
if(orient == 1 && row == 0 && dataType == 'scholar/collection')
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -5,32 +5,32 @@
|
||||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||||
|
|
||||||
<script src="itemPane.js"/>
|
<script src="itemPane.js"/>
|
||||||
<tabbox id="scholar-view-item">
|
<tabbox id="scholar-view-item" height="1000" style="margin-left: 5px;">
|
||||||
<tabs>
|
<tabs>
|
||||||
<tab label="Info"/>
|
|
||||||
<tab label="Notes"/>
|
<tab label="Notes"/>
|
||||||
|
<tab label="Info"/>
|
||||||
</tabs>
|
</tabs>
|
||||||
<tabpanels flex="1">
|
<tabpanels flex="1">
|
||||||
<vbox id="scholar-metadata">
|
|
||||||
<popupset>
|
|
||||||
<popup id="creatorTypeMenu" position="after_start" oncommand="ScholarItemPane.modifyCreator(document.popupNode.getAttribute('fieldname').split('-')[1],'typeID',event.explicitOriginalTarget.getAttribute('typeid'));"/>
|
|
||||||
</popupset>
|
|
||||||
<grid>
|
|
||||||
<columns>
|
|
||||||
<column/>
|
|
||||||
<column flex="1"/>
|
|
||||||
</columns>
|
|
||||||
|
|
||||||
<rows id="editpane-dynamic-fields">
|
|
||||||
</rows>
|
|
||||||
</grid>
|
|
||||||
</vbox>
|
|
||||||
<vbox>
|
<vbox>
|
||||||
<textbox id="scholar-notes"
|
<textbox id="scholar-notes"
|
||||||
type="timed" timeout="1000" oncommand="ScholarItemPane.modifyField('notes',this.value);"
|
type="timed" timeout="1000" oncommand="ScholarItemPane.modifyField('notes',this.value);"
|
||||||
multiline="true" flex="1"
|
multiline="true" flex="1"
|
||||||
onblur="ScholarItemPane.modifyField('notes',this.value);"/>
|
onblur="ScholarItemPane.modifyField('notes',this.value);"/>
|
||||||
</vbox>
|
</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 flex="1">
|
||||||
|
<columns>
|
||||||
|
<column/>
|
||||||
|
<column flex="1"/>
|
||||||
|
</columns>
|
||||||
|
|
||||||
|
<rows id="editpane-dynamic-fields" flex="1">
|
||||||
|
</rows>
|
||||||
|
</grid>
|
||||||
|
</vbox>
|
||||||
</tabpanels>
|
</tabpanels>
|
||||||
</tabbox>
|
</tabbox>
|
||||||
</overlay>
|
</overlay>
|
Loading…
Reference in New Issue
Block a user