From 5f5b0de423196c4f752f001bb7f39df4e6122694 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 3 Dec 2017 22:35:12 +0300 Subject: [PATCH] style feed icon and opml file upload controls --- classes/feeds.php | 11 +++++++++-- classes/pref/feeds.php | 18 ++++++++++++------ css/default.css | 2 +- css/tt-rss.less | 10 ++++++++++ 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/classes/feeds.php b/classes/feeds.php index 95987f73..07dd2a60 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -1586,6 +1586,10 @@ class Feeds extends Handler_Protected { } } + static function getIconFile($feed_id) { + return ICONS_DIR . "/$feed_id.ico"; + } + static function getFeedIcon($id) { switch ($id) { case 0: @@ -1610,8 +1614,11 @@ class Feeds extends Handler_Protected { if ($id < LABEL_BASE_INDEX) { return "images/label.png"; } else { - if (file_exists(ICONS_DIR . "/$id.ico")) - return ICONS_URL . "/$id.ico"; + $icon = self::getIconFile($id); + + if ($icon && file_exists($icon)) { + return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon); + } } break; } diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 9f7ada24..5b7e52ac 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -726,19 +726,23 @@ class Pref_Feeds extends Handler_Protected { print "
"; + print ""; + print ""; + style=\"width: 400px; height: 100px; display: none;\">"; print "
- + -

+ -

"; @@ -1285,7 +1289,9 @@ class Pref_Feeds extends Handler_Protected { print "
-   +