mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix number inputs and adjust linux styling for feed settings

Browse source
This commit is contained in:
Adomas Venčkauskas 2020-11-24 14:50:22 +02:00
parent c4cc44528c
commit ddcbb47538
4 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero-platform/unix/zotero.css Normal file
View file

@ -0,0 +1,8 @@
#zotero-feed-settings dropmarker{
width: 20px;
margin-left: 5px;
}
#zotero-feed-settings .html-input {
padding: 2px 2px 3px;
}

9
chrome/content/zotero/feedSettings.js
View file

@ -150,9 +150,12 @@ var Zotero_Feed_Settings = new function() {
this.accept = function() {
data.url = document.getElementById('feed-url').value;
data.title = document.getElementById('feed-title').value;
data.ttl = document.getElementById('feed-ttl').value * 60;
data.cleanupReadAfter = document.getElementById('feed-cleanupReadAfter').value * 1;
data.cleanupUnreadAfter = document.getElementById('feed-cleanupUnreadAfter').value * 1;
data.ttl = parseInt(document.getElementById('feed-ttl').value);
data.ttl = (isNaN(data.ttl) ? Zotero.Prefs.get('feeds.defaultTTL') : data.ttl) * 60;
data.cleanupReadAfter = parseInt(document.getElementById('feed-cleanupReadAfter').value);
data.cleanupReadAfter = isNaN(data.cleanupReadAfter) ? Zotero.Prefs.get('feeds.defaultCleanupReadAfter') : data.cleanupReadAfter;
data.cleanupUnreadAfter = parseInt(document.getElementById('feed-cleanupUnreadAfter').value);
data.cleanupUnreadAfter = isNaN(data.cleanupUnreadAfter) ? Zotero.Prefs.get('feeds.defaultCleanupUnreadAfter') : data.cleanupUnreadAfter;
return true;
};

7
chrome/content/zotero/feedSettings.xul
View file

@ -6,6 +6,7 @@
<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd" > %zoteroDTD;
]>
<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
title="&zotero.feedSettings.title;" buttons="cancel,accept"
buttonlabelaccept="&zotero.feedSettings.saveButton.label;"
ondialogaccept="return Zotero_Feed_Settings.accept()"
@ -50,17 +51,17 @@
<vbox id="advanced-options-togglable">
<hbox align="center">
<label value="&zotero.feedSettings.refresh.label1;" control="feed-ttl"/>
<textbox id="feed-ttl" type="number" min="1" increment="1" size="3"/>
<html:input class="html-input" id="feed-ttl" type="number" min="1" step="1"/>
<label value="&zotero.feedSettings.refresh.label2;" control="feed-ttl"/>
</hbox>
<hbox align="center">
<label value="&zotero.feedSettings.cleanupReadAfter.label1;" control="feed-cleanupReadAfter"/>
<textbox id="feed-cleanupReadAfter" type="number" min="1" increment="1" size="2"/>
<html:input class="html-input" id="feed-cleanupReadAfter" type="number" min="1" step="1"/>
<label value="&zotero.feedSettings.cleanupReadAfter.label2;" control="feed-cleanupReadAfter"/>
</hbox>
<hbox align="center">
<label value="&zotero.feedSettings.cleanupUnreadAfter.label1;" control="feed-cleanupUnreadAfter"/>
<textbox id="feed-cleanupUnreadAfter" type="number" min="1" increment="1" size="2"/>
<html:input class="html-input" id="feed-cleanupUnreadAfter" type="number" min="1" step="1"/>
<label value="&zotero.feedSettings.cleanupUnreadAfter.label2;" control="feed-cleanupUnreadAfter"/>
</hbox>
</vbox>

10
chrome/skin/default/zotero/zotero.css
View file

@ -333,6 +333,16 @@ zoterosearch .menulist-icon {
-moz-box-pack: end;
}
#zotero-feed-settings .html-input {
width: 50px;
text-align: right;
}
#zotero-feed-settings #advanced-options-togglable hbox {
display: flex;
align-items: center;
}
.zotero-spinner-14 {
list-style-image: url(chrome://zotero/skin/spinner-14px.png);
height: 14px;