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 72aced5f..00000000 Binary files a/images/sign_excl.gif and /dev/null differ diff --git a/images/sign_excl.png b/images/sign_excl.png new file mode 100644 index 00000000..383f53dd Binary files /dev/null and b/images/sign_excl.png differ diff --git a/images/sign_info.gif b/images/sign_info.gif deleted file mode 100644 index 97effe2c..00000000 Binary files a/images/sign_info.gif and /dev/null differ diff --git a/images/sign_info.png b/images/sign_info.png new file mode 100644 index 00000000..0d7e7abd Binary files /dev/null and b/images/sign_info.png differ diff --git a/images/sign_quest.gif b/images/sign_quest.gif deleted file mode 100644 index 335a19fb..00000000 Binary files a/images/sign_quest.gif and /dev/null differ diff --git a/images/sign_quest.png b/images/sign_quest.png new file mode 100644 index 00000000..a19f84f3 Binary files /dev/null and b/images/sign_quest.png differ diff --git a/manifest.json.php b/manifest.json.php index 066cbd0e..b322df26 100644 --- a/manifest.json.php +++ b/manifest.json.php @@ -35,9 +35,9 @@ "images/shadow-grid.gif", "images/shadow.png", "images/shadow_white.png", - "images/sign_excl.gif", - "images/sign_info.gif", - "images/sign_quest.gif", + "images/sign_excl.png", + "images/sign_info.png", + "images/sign_quest.png", "images/small_question.png", "images/tag.png", "images/toolbar.png", diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index dbf65bbb..78bc3ba7 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -316,7 +316,8 @@ print "
+ 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 "