neon updates; make more icons themeable; misc fixes

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);
 		}

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 = "<img src='images/indicator_white.gif'> " + msg;
+		msg = "<img src='"+getInitParam("sign_progress")+"'> " + msg;
 	} else if (n_type == 3) {
 		n.className = "notifyError";
-		msg = "<img src='images/sign_excl.gif'> " + msg;
+		msg = "<img src='"+getInitParam("sign_excl")+"'> " + msg;
 	} else if (n_type == 4) {
 		n.className = "notifyInfo";
-		msg = "<img src='images/sign_info.gif'> " + msg;
+		msg = "<img src='"+getInitParam("sign_info")+"'> " + msg;
 	}
 
 //	msg = "<img src='images/live_com_loading.gif'> " + 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 } } );
 

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)) {
+			if ($theme_path && is_file($theme_path.$filename)) {
-			return $theme_path.$filename;
+				return $theme_path.$filename;
+			} else {
+				return $filename;
+			}
 		} else {
 			return $filename;
 		}
@@ -3133,6 +3137,15 @@
 		print "<param key=\"feeds_frame_refresh\" value=\"" . FEEDS_FRAME_REFRESH . "\"/>";
 		print "<param key=\"daemon_refresh_only\" value=\"true\"/>";
 
+		print "<param key=\"sign_progress\" value=\"".
+			theme_image($link, "images/indicator_white.gif")."\"/>";
+
+		print "<param key=\"sign_excl\" value=\"".
+			theme_image($link, "images/sign_excl.png")."\"/>";
+
+		print "<param key=\"sign_info\" value=\"".
+			theme_image($link, "images/sign_info.png")."\"/>";
+
 		print "<param key=\"on_catchup_show_next_feed\" value=\"" . 
 			get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED") . "\"/>";
 
@@ -4581,18 +4594,21 @@
 	}
 
 	function format_warning($msg, $id = "") {
+		global $link;
 		return "<div class=\"warning\" id=\"$id\"> 
-			<img src=\"images/sign_excl.gif\">$msg</div>";
+			<img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
 	}
 
 	function format_notice($msg) {
-		return "<div class=\"notice\"> 
+		global $link;
-			<img src=\"images/sign_info.gif\">$msg</div>";
+		return "<div class=\"notice\" id=\"$id\"> 
+			<img src=\"".theme_image($link, "images/sign_info.png")."\">$msg</div>";
 	}
 
 	function format_error($msg) {
-		return "<div class=\"error\"> 
+		global $link;
-			<img src=\"images/sign_excl.gif\">$msg</div>";
+		return "<div class=\"error\" id=\"$id\"> 
+			<img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
 	}
 
 	function print_notice($msg) {
@@ -5079,7 +5095,8 @@
 
 				if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) {
 	
-					$update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\" 
+					$update_pic = "<img id='FUPDPIC-$id' src=\"".
+						theme_image($link, 'images/updated.png')."\" 
 						alt=\"Updated\">";
 				} else {
 					$update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\" 
@@ -5150,13 +5167,14 @@
 
 				$score = $line["score"];
 
-				$score_pic = get_score_pic($score);
+				$score_pic = theme_image($link, 
+					"images/" . get_score_pic($score));
 
 /*				$score_title = __("(Click to change)");
 				$score_pic = "<img class='hlScorePic' src=\"images/$score_pic\" 
 					onclick=\"adjustArticleScore($id, $score)\" title=\"$score $score_title\">"; */
 
-				$score_pic = "<img class='hlScorePic' src=\"images/$score_pic\" 
+				$score_pic = "<img class='hlScorePic' src=\"$score_pic\" 
 					title=\"$score\">";
 
 				if ($score > 500) {

manifest.json.php

@@ -35,9 +35,9 @@
       "images/shadow-grid.gif",
       "images/shadow.png",
       "images/shadow_white.png",
-      "images/sign_excl.gif",
+      "images/sign_excl.png",
-      "images/sign_info.gif",
+      "images/sign_info.png",
-      "images/sign_quest.gif",
+      "images/sign_quest.png",
       "images/small_question.png",
       "images/tag.png",
       "images/toolbar.png",

modules/popup-dialog.php

@@ -316,7 +316,8 @@
 			print "
 				<div style='float : right'>
 				<img style='display : none' 
-					id='feed_browser_spinner' src='images/indicator_white.gif'>
+					id='feed_browser_spinner' src='".
+					theme_image($link, 'images/indicator_white.gif')."'>
 				<input name=\"search\" size=\"20\" type=\"search\"
 					onchange=\"javascript:updateFeedBrowser()\" value=\"$browser_search\">
 				<button onclick=\"javascript:updateFeedBrowser()\">".__('Search')."</button>

modules/pref-filters.php

@@ -300,7 +300,7 @@
 			<button onclick=\"javascript:updateFilterList()\">".__('Search')."</button>
 			&nbsp;
 			<a class='helpLinkPic' href=\"javascript:displayHelpInfobox(2)\">
-			<img src='images/sign_quest.gif'></a>
+			<img style='vertical-align : top;' src='".theme_image($link, "images/sign_quest.png")."'></a>
 		</div>";
 
 		print "<button onclick=\"return displayDlg('quickAddFilter', false)\">".
@@ -415,9 +415,10 @@
 					$line["action_param"] = "&mdash;";
 				} else if ($line["action_name"] == "score") {
 
-					$score_pic = get_score_pic($line["action_param"]);
+					$score_pic = theme_image($link,
+						"images/" . get_score_pic($line["action_param"]));
 
-					$score_pic = "<img class='hlScorePic' src=\"images/$score_pic\">";
+					$score_pic = "<img class='hlScorePic' src=\"$score_pic\">";
 
 					$line["action_param"] = "$score_pic " . $line["action_param"];
 

prefs.php

@@ -99,7 +99,7 @@
 
 <div id="prefTabs">
 		<div class='prefKbdHelp'>
-			<img src="images/small_question.png" alt="?"/> <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a>
+			<img src="<?php echo theme_image($link, 'images/small_question.png') ?>" alt="?"/> <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a>
 		</div>
 
 		<div class="firstTab">&nbsp;</div>

themes/neon/images/sign_quest.svg

@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32px"
+   height="32px"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   inkscape:export-filename="C:\Users\fox\Desktop\small_question.png"
+   inkscape:export-xdpi="50.52"
+   inkscape:export-ydpi="50.52"
+   sodipodi:docname="sign_quest.svg">
+  <defs
+     id="defs2818">
+    <linearGradient
+       id="linearGradient6244">
+      <stop
+         style="stop-color:#b077ec;stop-opacity:1;"
+         offset="0"
+         id="stop6246" />
+      <stop
+         style="stop-color:#3c2c4c;stop-opacity:1;"
+         offset="1"
+         id="stop6248" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6148">
+      <stop
+         style="stop-color:#dd80f1;stop-opacity:1;"
+         offset="0"
+         id="stop6150" />
+      <stop
+         style="stop-color:#db7dee;stop-opacity:1;"
+         offset="1"
+         id="stop6152" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4018">
+      <stop
+         style="stop-color:#dd80f1;stop-opacity:1;"
+         offset="0"
+         id="stop4020" />
+      <stop
+         id="stop5628"
+         offset="0.49594909"
+         style="stop-color:#dd80f1;stop-opacity:1;" />
+      <stop
+         style="stop-color:#d050eb;stop-opacity:1;"
+         offset="0.49594909"
+         id="stop5644" />
+      <stop
+         style="stop-color:#c320e6;stop-opacity:1;"
+         offset="1"
+         id="stop4022" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective2824" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask3664">
+      <path
+         transform="translate(-0.982335,-9.019628)"
+         d="m 13.752699,0.1187433 a 13.752699,13.752699 0 1 1 -27.505398,0 13.752699,13.752699 0 1 1 27.505398,0 z"
+         sodipodi:ry="13.752699"
+         sodipodi:rx="13.752699"
+         sodipodi:cy="0.1187433"
+         sodipodi:cx="0"
+         id="path3666"
+         style="fill:#dd80f1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </mask>
+    <filter
+       id="filter6120"
+       inkscape:label="Drop shadow"
+       width="1.5"
+       height="1.5"
+       x="-.25"
+       y="-.25">
+      <feGaussianBlur
+         id="feGaussianBlur6122"
+         in="SourceAlpha"
+         stdDeviation="1,000000"
+         result="blur" />
+      <feColorMatrix
+         id="feColorMatrix6124"
+         result="bluralpha"
+         type="matrix"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0,650000 0 " />
+      <feOffset
+         id="feOffset6126"
+         in="bluralpha"
+         dx="1,000000"
+         dy="1,000000"
+         result="offsetBlur" />
+      <feMerge
+         id="feMerge6128">
+        <feMergeNode
+           id="feMergeNode6130"
+           in="offsetBlur" />
+        <feMergeNode
+           id="feMergeNode6132"
+           in="SourceGraphic" />
+      </feMerge>
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#202020"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="5.2298075"
+     inkscape:cy="16.407775"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1138"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2821">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="fill:#2a0a4a;fill-opacity:1;fill-rule:evenodd;stroke:#b077ec;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path2826"
+       sodipodi:cx="0"
+       sodipodi:cy="0.1187433"
+       sodipodi:rx="13.752699"
+       sodipodi:ry="13.752699"
+       d="m 13.752699,0.1187433 a 13.752699,13.752699 0 1 1 -27.505398,0 13.752699,13.752699 0 1 1 27.505398,0 z"
+       transform="translate(16,15.881257)" />
+    <text
+       xml:space="preserve"
+       style="font-size:25.01383018px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#b077ec;fill-opacity:1;stroke:none;font-family:Segoe UI;-inkscape-font-specification:Segoe UI"
+       x="8.2831488"
+       y="25.972761"
+       id="text3668"
+       inkscape:export-xdpi="67"
+       inkscape:export-ydpi="67"
+       transform="scale(1.0422429,0.95946923)"><tspan
+         sodipodi:role="line"
+         id="tspan3670"
+         x="8.2831488"
+         y="25.972761"
+         style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;text-anchor:start;fill:#b077ec;fill-opacity:1;stroke:none;font-family:Times New Roman;-inkscape-font-specification:Times New Roman Bold">?</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="39.561337"
+       y="38.519138"
+       id="text6156"><tspan
+         sodipodi:role="line"
+         id="tspan6158"></tspan></text>
+  </g>
+</svg>

themes/neon/theme.css

@@ -321,7 +321,13 @@ div.notice {
 	color : gray;
 }
 
-.notify, .notifyInfo, .notifyProgress {
+div.error, div.warning {
+	background : #3c2c4c;
+	border : 1px solid #404040;
+	color : #b077ec:;
+}
+
+.notify, .notifyInfo, .notifyProgress, .notifyError {
 	border-color : #b077ec;
 	background-color : #3c2c4c;
 	color : gray;
@@ -565,3 +571,8 @@ div.colorPicker {
 	color : gray;
 }
 
+ul.feedErrorsList {
+	border : 1px solid #404040;
+	background-color : #303030;
+}
+

tt-rss.php

@@ -146,7 +146,8 @@
 	</div>
 
 	<img id="newVersionIcon" style="display:none;" onclick="javascript:explainError(2)" 
-		width="13" height="13" src="images/new_version.png" 
+		width="13" height="13" 
+		src="<?php echo theme_image($link, 'images/new_version.png') ?>"
 		title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" 
 		alt="new_version_icon"/>
 

viewfeed.js

@@ -497,7 +497,7 @@ function view(id) {
 			var upic = $('FUPDPIC-' + id);
 
 			if (upic) {	
-				upic.src = 'images/indicator_white.gif'; 
+				upic.src = getInitParam("sign_progress");
 			}
 
 		} else if (cached_article && article_is_unread) {