suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #871 from adomasven/fix/my-publications-linux

Browse Source 
Fixes the finish button on my publication wizard on linux
This commit is contained in:
Dan Stillman 2015-11-12 05:41:57 -05:00
commit cc9d1cc41d
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chrome/content/zotero-platform/unix/publicationsDialog.css Normal file
View File

@ -0,0 +1,4 @@
/* There's an ugly horizontal scrollbar on linux in some steps of the wizard, which this fixes */
.wizard-page-box {
margin: 10px 40px;
}

10
chrome/content/zotero/publicationsDialog.js
View File

@ -129,9 +129,7 @@ var Zotero_Publications_Dialog = new function () {
var wizard = document.getElementById('zotero-publications-wizard'); var wizard = document.getElementById('zotero-publications-wizard');
var currentPage = wizard.currentPage; var currentPage = wizard.currentPage;
var nextPage = wizard.wizardPages[wizard.pageIndex + 1]; var nextPage = wizard.wizardPages[wizard.pageIndex + 1];
var pageid = wizard.currentPage.pageid;
var nextButton = wizard.getButton('next'); var nextButton = wizard.getButton('next');
var finishButton = wizard.getButton('finish');
// Require authorship checkbox on first page to be checked to advance // Require authorship checkbox on first page to be checked to advance
wizard.canAdvance = document.getElementById('confirm-authorship-checkbox').checked; wizard.canAdvance = document.getElementById('confirm-authorship-checkbox').checked;
@ -147,8 +145,6 @@ var Zotero_Publications_Dialog = new function () {
&& _shareSettings.sharing == 'cc' && _shareSettings.sharing == 'cc'
&& !(_hasRights == 'all' && _keepRights))) { && !(_hasRights == 'all' && _keepRights))) {
this.lastPage = false; this.lastPage = false;
finishButton.hidden = true;
nextButton.hidden = false;
nextButton.label = Zotero.getString( nextButton.label = Zotero.getString(
'publications.buttons.next', 'publications.buttons.next',
Zotero.getString('publications.buttons.' + nextPage.pageid) Zotero.getString('publications.buttons.' + nextPage.pageid)
@ -157,8 +153,10 @@ var Zotero_Publications_Dialog = new function () {
// Otherwise this is the last page // Otherwise this is the last page
else { else {
this.lastPage = true; this.lastPage = true;
nextButton.hidden = true; // Due to issues with linux not handling finish button hiding correctly
finishButton.hidden = false; // we just set the next button label to be the one for the finish button
// and leave visibility handling up to mr wizard
nextButton.label = Zotero.getString('publications.buttons.addToMyPublications');
} }
} }

1
chrome/content/zotero/publicationsDialog.xul
View File

@ -31,6 +31,7 @@
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/publicationsDialog.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero/skin/publicationsDialog.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero-platform/content/publicationsDialog.css"?>
<wizard id="zotero-publications-wizard" title="&zotero.publications.my_publications;" <wizard id="zotero-publications-wizard" title="&zotero.publications.my_publications;"
width="600" width="600"