summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-10-08 16:38:03 +0400
committerAndrew Dolgov <[email protected]>2014-10-08 16:38:03 +0400
commit4a1d122c8758c61955ca8344d6c1017ef80bc62e (patch)
tree765b005abd35293d9ab9ec4a22de6f8052c323cc
parent41fac971c481b68c52c08b95148a17caba7a5fa7 (diff)
edit feed: smaller buttons for icon upload; allow uploading larger favicons
-rw-r--r--classes/pref/feeds.php6
-rw-r--r--css/dijit.css4
2 files changed, 7 insertions, 3 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 43b474278..d70c1a26a 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -495,7 +495,7 @@ class Pref_Feeds extends Handler_Protected {
$feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
if (is_file($icon_file) && $feed_id) {
- if (filesize($icon_file) < 20000) {
+ if (filesize($icon_file) < 65535) {
$result = $this->dbh->query("SELECT id FROM ttrss_feeds
WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
@@ -738,9 +738,9 @@ class Pref_Feeds extends Handler_Protected {
<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
<input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\">
<input type=\"hidden\" name=\"method\" value=\"uploadicon\">
- <button dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
+ <button class=\"small\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
type=\"submit\">".__('Replace')."</button>
- <button dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
+ <button class=\"small\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
type=\"submit\">".__('Remove')."</button>
</form>";
diff --git a/css/dijit.css b/css/dijit.css
index bd51929a7..eb4f767db 100644
--- a/css/dijit.css
+++ b/css/dijit.css
@@ -346,6 +346,10 @@ button[disabled],
line-height : 20px;
}
+.claro .dijitButton.small .dijitButtonText {
+ font-size : 11px;
+}
+
.claro .dijitMenu {
border-color : #ccc;
}