diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js
index 59b40aa0b9..c5f014abd6 100644
--- a/chrome/content/zotero/bibliography.js
+++ b/chrome/content/zotero/bibliography.js
@@ -42,8 +42,7 @@ var Zotero_File_Interface_Bibliography = new function() {
function init() {
// Set font size from pref
// Affects bibliography.xul and integrationDocPrefs.xul
- var sbc = document.getElementById('zotero-bibliography-container');
- if(sbc) Zotero.setFontSize(sbc);
+ Zotero.setFontSize(document.documentElement);
if(window.arguments && window.arguments.length) {
_io = window.arguments[0];
diff --git a/chrome/content/zotero/addCitationDialog.js b/chrome/content/zotero/integration/addCitationDialog.js
similarity index 94%
rename from chrome/content/zotero/addCitationDialog.js
rename to chrome/content/zotero/integration/addCitationDialog.js
index d50194572c..16de7f0dfc 100644
--- a/chrome/content/zotero/addCitationDialog.js
+++ b/chrome/content/zotero/integration/addCitationDialog.js
@@ -57,8 +57,8 @@ var Zotero_Citation_Dialog = new function () {
* initialize add citation dialog
*/
function load() {
- document.getElementById("multiple-sources-button").label = Zotero.getString("citation.multipleSources");
- document.getElementById("show-editor-button").label = Zotero.getString("citation.showEditor");
+ document.documentElement.getButton("extra1").label = Zotero.getString("citation.multipleSources");
+ document.documentElement.getButton("extra2").label = Zotero.getString("citation.showEditor");
io = window.arguments[0].wrappedJSObject;
@@ -145,7 +145,7 @@ var Zotero_Citation_Dialog = new function () {
// var itemDataID = itemID+"::"+0;
document.getElementById("multiple-sources").hidden = undefined;
document.getElementById("zotero-add-citation-dialog").width = "750";
- document.getElementById("multiple-sources-button").label = Zotero.getString("citation.singleSource");
+ document.documentElement.getButton("extra1").label = Zotero.getString("citation.singleSource");
// move user field content to multiple before adding XXXXX
if (itemID) {
// _itemData[itemDataID] = new Object();
@@ -157,8 +157,6 @@ var Zotero_Citation_Dialog = new function () {
_itemData[itemID][box] = element[_preserveData[box]];
}
}
- window.sizeToContent();
- window.moveTo((window.screenX-75), window.screenY);
treeItemSelected();
// disable adding info until citation added
_itemSelected(false);
@@ -172,9 +170,7 @@ var Zotero_Citation_Dialog = new function () {
} else {
document.getElementById("multiple-sources").hidden = true;
document.getElementById("zotero-add-citation-dialog").width = "600";
- document.getElementById("multiple-sources-button").label = Zotero.getString("citation.multipleSources");
- window.sizeToContent();
- window.moveTo((window.screenX+75), window.screenY);
+ document.documentElement.getButton("extra1").label = Zotero.getString("citation.multipleSources");
// enable all fields
for(var i in _preserveData) {
@@ -345,16 +341,14 @@ var Zotero_Citation_Dialog = new function () {
_previewShown = !_previewShown;
if(_previewShown) {
- document.getElementById("show-editor-button").label = Zotero.getString("citation.hideEditor");
- window.sizeToContent();
+ document.documentElement.getButton("extra2").label = Zotero.getString("citation.hideEditor");
if(text) {
editor.value = text;
} else {
_updatePreview();
}
} else {
- document.getElementById("show-editor-button").label = Zotero.getString("citation.showEditor");
- window.sizeToContent();
+ document.documentElement.getButton("extra2").label = Zotero.getString("citation.showEditor");
}
}
diff --git a/chrome/content/zotero/addCitationDialog.xul b/chrome/content/zotero/integration/addCitationDialog.xul
similarity index 92%
rename from chrome/content/zotero/addCitationDialog.xul
rename to chrome/content/zotero/integration/addCitationDialog.xul
index f7ec8747e5..30550f0eb7 100644
--- a/chrome/content/zotero/addCitationDialog.xul
+++ b/chrome/content/zotero/integration/addCitationDialog.xul
@@ -21,6 +21,7 @@
***** END LICENSE BLOCK *****
-->
+
@@ -35,16 +36,18 @@
onunload="doUnload();"
ondialogaccept="return Zotero_Citation_Dialog.accept();"
ondialogcancel="Zotero_Citation_Dialog.cancel();"
- xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- style="padding: 0"
- persist="screenX screenY width height">
+ persist="screenX screenY width height"
+ resizable="true"
+ buttons="extra1,extra2,accept,cancel"
+ ondialogextra2="Zotero_Citation_Dialog.toggleEditor()"
+ ondialogextra1="Zotero_Citation_Dialog.toggleMultipleSources()">
-
-
+
+
-
+
@@ -193,18 +196,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/chrome/content/zotero/editBibliographyDialog.js b/chrome/content/zotero/integration/editBibliographyDialog.js
similarity index 100%
rename from chrome/content/zotero/editBibliographyDialog.js
rename to chrome/content/zotero/integration/editBibliographyDialog.js
diff --git a/chrome/content/zotero/editBibliographyDialog.xul b/chrome/content/zotero/integration/editBibliographyDialog.xul
similarity index 95%
rename from chrome/content/zotero/editBibliographyDialog.xul
rename to chrome/content/zotero/integration/editBibliographyDialog.xul
index 4cf7d78172..c2f55890d0 100644
--- a/chrome/content/zotero/editBibliographyDialog.xul
+++ b/chrome/content/zotero/integration/editBibliographyDialog.xul
@@ -37,14 +37,14 @@
buttons="accept"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- style="padding: 0 5px 15px"
- persist="screenX screenY width height">
+ persist="screenX screenY width height"
+ resizable="true">
-
-
+
+
-
+
diff --git a/chrome/content/zotero/integration/integrationDocPrefs.xul b/chrome/content/zotero/integration/integrationDocPrefs.xul
new file mode 100644
index 0000000000..5fbc550cdf
--- /dev/null
+++ b/chrome/content/zotero/integration/integrationDocPrefs.xul
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/chrome/content/zotero/integrationDocPrefs.xul b/chrome/content/zotero/integrationDocPrefs.xul
deleted file mode 100644
index 855e83c170..0000000000
--- a/chrome/content/zotero/integrationDocPrefs.xul
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index dcfe61ede4..0d21d7d317 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -861,7 +861,7 @@ Zotero.Integration.Session.prototype.setDocPrefs = function(primaryFieldType, se
Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
.getService(Components.interfaces.nsIWindowWatcher)
- .openWindow(null, 'chrome://zotero/content/integrationDocPrefs.xul', '',
+ .openWindow(null, 'chrome://zotero/content/integration/integrationDocPrefs.xul', '',
'chrome,modal,centerscreen', io, true);
if(!io.style) throw new Zotero.Integration.UserCancelledException();
@@ -898,7 +898,7 @@ Zotero.Integration.Session.prototype.reselectItem = function(exception) {
Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
.getService(Components.interfaces.nsIWindowWatcher)
.openWindow(null,'chrome://zotero/content/selectItemsDialog.xul', '',
- 'chrome,modal,centerscreen,resizable=yes', io, true);
+ 'chrome,modal,centerscreen,resizable', io, true);
if(io.dataOut && io.dataOut.length) {
var itemID = io.dataOut[0];
@@ -1252,8 +1252,8 @@ Zotero.Integration.Session.prototype.editCitation = function(index, noteIndex, c
Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
.getService(Components.interfaces.nsIWindowWatcher)
.openWindow(
- null, 'chrome://zotero/content/addCitationDialog.xul', '',
- 'chrome,modal,centerscreen,resizable=yes',
+ null, 'chrome://zotero/content/integration/addCitationDialog.xul', '',
+ 'chrome,modal,centerscreen,resizable',
io
);
@@ -1399,8 +1399,8 @@ Zotero.Integration.Session.prototype.editBibliography = function() {
Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
.getService(Components.interfaces.nsIWindowWatcher)
.openWindow(
- null, 'chrome://zotero/content/editBibliographyDialog.xul', '',
- 'chrome,modal,centerscreen,resizable=yes',
+ null, 'chrome://zotero/content/integration/editBibliographyDialog.xul', '',
+ 'chrome,modal,centerscreen,resizable',
io,
true
);
diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css
index 6ea84f7863..c41685fe40 100644
--- a/chrome/skin/default/zotero/zotero.css
+++ b/chrome/skin/default/zotero/zotero.css
@@ -143,6 +143,11 @@ zoteromergepane {
-moz-binding: url('chrome://zotero/content/bindings/merge.xml#merge-pane');
}
+dialog[resizable="true"]
+{
+ -moz-binding: url('chrome://zotero/content/bindings/resizabledialog.xml#resizabledialog');
+}
+
.zotero-clicky
{
-moz-border-radius: 6px;