From 883fee8df09668f268fc95a724fa01e77f02fbd4 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 14 Jan 2010 23:09:23 +0300 Subject: [PATCH] neon updates; make more icons themeable; misc fixes --- feedlist.js | 6 +- functions.js | 9 +- functions.php | 48 +++++-- images/sign_excl.gif | Bin 775 -> 0 bytes images/sign_excl.png | Bin 0 -> 966 bytes images/sign_info.gif | Bin 1200 -> 0 bytes images/sign_info.png | Bin 0 -> 1405 bytes images/sign_quest.gif | Bin 1215 -> 0 bytes images/sign_quest.png | Bin 0 -> 1415 bytes manifest.json.php | 6 +- modules/popup-dialog.php | 3 +- modules/pref-filters.php | 7 +- prefs.php | 2 +- themes/neon/images/indicator_white.gif | Bin 0 -> 1849 bytes themes/neon/images/label.png | Bin 0 -> 1251 bytes themes/neon/images/sign_excl.png | Bin 0 -> 930 bytes themes/neon/images/sign_info.png | Bin 0 -> 914 bytes themes/neon/images/sign_quest.png | Bin 0 -> 1075 bytes themes/neon/images/sign_quest.svg | 187 +++++++++++++++++++++++++ themes/neon/images/small_question.png | Bin 0 -> 712 bytes themes/neon/images/tag.png | Bin 185 -> 1247 bytes themes/neon/theme.css | 13 +- tt-rss.php | 3 +- viewfeed.js | 2 +- 24 files changed, 253 insertions(+), 33 deletions(-) delete mode 100644 images/sign_excl.gif create mode 100644 images/sign_excl.png delete mode 100644 images/sign_info.gif create mode 100644 images/sign_info.png delete mode 100644 images/sign_quest.gif create mode 100644 images/sign_quest.png create mode 100755 themes/neon/images/indicator_white.gif create mode 100755 themes/neon/images/label.png create mode 100755 themes/neon/images/sign_excl.png create mode 100755 themes/neon/images/sign_info.png create mode 100755 themes/neon/images/sign_quest.png create mode 100755 themes/neon/images/sign_quest.svg create mode 100755 themes/neon/images/small_question.png mode change 100644 => 100755 themes/neon/images/tag.png diff --git a/feedlist.js b/feedlist.js index 48385664..19721686 100644 --- a/feedlist.js +++ b/feedlist.js @@ -331,7 +331,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) { if (!img.src.match("indicator_white")) { img.alt = img.src; - img.src = 'images/indicator_white.gif'; + img.src = getInitParam("sign_progress"); } } else { @@ -339,7 +339,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) { if (!$('FLL-' + feed)) { var ll = document.createElement('img'); - ll.src = 'images/indicator_tiny.gif'; + ll.src = getInitParam("sign_progress"); ll.className = 'hlLoading'; ll.id = 'FLL-' + feed; @@ -467,7 +467,7 @@ function feedlist_init() { } } - if (getInitParam("theme") == "" || getInitParam("theme") == "darkroom" || + if (getInitParam("theme") == "" || getInitParam("theme") == "lejla" || getInitParam("theme") == "neon") { setTimeout("hide_footer()", 5000); } diff --git a/functions.js b/functions.js index b2bd2a9e..7a43212d 100644 --- a/functions.js +++ b/functions.js @@ -162,13 +162,13 @@ function notify_real(msg, no_hide, n_type) { n.className = "notify"; } else if (n_type == 2) { n.className = "notifyProgress"; - msg = " " + msg; + msg = " " + msg; } else if (n_type == 3) { n.className = "notifyError"; - msg = " " + msg; + msg = " " + msg; } else if (n_type == 4) { n.className = "notifyInfo"; - msg = " " + msg; + msg = " " + msg; } // msg = " " + msg; @@ -526,7 +526,8 @@ function parse_counters(reply, scheduled_call) { } - if (row_needs_hl && getInitParam("theme") != 'neon') { + if (row_needs_hl && getInitParam("theme") != 'neon' && + getInitParam("theme") != 'lejla') { new Effect.Highlight(feedr, {duration: 1, startcolor: "#fff7d5", queue: { position:'end', scope: 'EFQ-' + id, limit: 1 } } ); diff --git a/functions.php b/functions.php index cf78cdf3..656cadf7 100644 --- a/functions.php +++ b/functions.php @@ -1992,10 +1992,14 @@ } function theme_image($link, $filename) { - $theme_path = get_user_theme_path($link); + if ($link) { + $theme_path = get_user_theme_path($link); - if ($theme_path && is_file($theme_path.$filename)) { - return $theme_path.$filename; + if ($theme_path && is_file($theme_path.$filename)) { + return $theme_path.$filename; + } else { + return $filename; + } } else { return $filename; } @@ -3133,6 +3137,15 @@ print ""; print ""; + print ""; + + print ""; + + print ""; + print ""; @@ -4581,18 +4594,21 @@ } function format_warning($msg, $id = "") { + global $link; return "
- $msg
"; + $msg"; } function format_notice($msg) { - return "
- $msg
"; + global $link; + return "
+ $msg
"; } function format_error($msg) { - return "
- $msg
"; + global $link; + return "
+ $msg
"; } function print_notice($msg) { @@ -5079,7 +5095,8 @@ if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) { - $update_pic = "\"Updated\""; } else { $update_pic = ""; */ - $score_pic = ""; if ($score > 500) { @@ -5866,13 +5884,13 @@ if ($score > 100) { return "score_high.png"; } else if ($score > 0) { - return "score_half_high.png"; + return "score_half_high.png"; } else if ($score < -100) { - return "score_low.png"; + return "score_low.png"; } else if ($score < 0) { - return "score_half_low.png"; + return "score_half_low.png"; } else { - return "score_neutral.png"; + return "score_neutral.png"; } } diff --git a/images/sign_excl.gif b/images/sign_excl.gif deleted file mode 100644 index 72aced5ff405542b6b828470540420154f5bc3b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 775 zcmZ?wbhEHblwgoxc$UxbThz@1L!!+g)3`DG`yWU^T6|X&zqW_ z_xInato(ZC&aby`KTeqN?bxw9wY7Km?R(MEa-^>AMQiJ~yLY$c}>+3&s zbo>Vc1`>hdPZmZ7hI|GckUmhHFtGn`$Zu+HX>Dt7X6IpJVPOk{{Wq{bv| zrYgsyQ7I(J!WVGvM90I2PfyPH zS$zC~{QO;wjc@PYKU-I~yS8>$M#iV-&o8c7vmrJ0YIF0m*|Xobx4&p;csq6K!~Xsc zot^J{dfrZ+ytks_-GmA6ySu;Lx%0HU`)zCMv!%gyTQ$8BwoT3eUK#=dKBzgJhcGB)<-y?d`)Th}KhUMeZsP+x!R=+WzCWfx0I z9@p0X`S$HzT_3A-={mO)dB~ejN+uNVl*MI2f_zwoa;3WxYO71)l)KE|o$j_Qa%1 zK)V@}yxm>uJ@ywq1#&nGJR*yMvQ&rUPkk5@M+ES-K3U%g@urF+}5h z>7?**CPRVN?casU5*ZmC9UKIz-|zi?ui9Mt|Nq&ZWsbJ)&s0y=oSgf_Z^nADgDs15 zJebaNPg4BPXqBGDm3@27qM394F-wG&%yrR`>Q$8q51Gl9@MzlfFNZyZ7u4xsgHn zcf(%)lpx>RnTt1F{dn=|&%+zvzFF_KH81z|`49dz%)Mvk@fdzIn+^i2E+gW literal 0 HcmV?d00001 diff --git a/images/sign_info.gif b/images/sign_info.gif deleted file mode 100644 index 97effe2c89763afb3e4987abca79752f763299f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1200 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 + id='feed_browser_spinner' src='". + theme_image($link, 'images/indicator_white.gif')."'> diff --git a/modules/pref-filters.php b/modules/pref-filters.php index 0a1cc68a..96e6365d 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -300,7 +300,7 @@   - + "; print "