reorganize theme support; add some themeable icons; add neon theme

feedlist.js

@@ -467,7 +467,7 @@ function feedlist_init() {
 			}
 		}
 
-		if (getInitParam("theme") == "") {
+		if (getInitParam("theme") == "" || getInitParam("theme") == "neon") {
 			setTimeout("hide_footer()", 5000);
 		}
 

functions.js

@@ -526,7 +526,7 @@ function parse_counters(reply, scheduled_call) {
 						
 					}
 
-					if (row_needs_hl) { 
+					if (row_needs_hl && getInitParam("theme") != 'neon') { 
 						new Effect.Highlight(feedr, {duration: 1, startcolor: "#fff7d5",
 							queue: { position:'end', scope: 'EFQ-' + id, limit: 1 } } );
 

functions.php

@@ -1592,6 +1592,12 @@
 
 		if (!$icon_file) $icon_file = getFeedIcon($feed_id);
 
+		$theme_path = get_user_theme_path($link);
+
+		if ($theme_path && strpos($icon_file, "images") !== false) {
+			$icon_file = $theme_path . $icon_file;
+		}
+
 		if (file_exists($icon_file) && filesize($icon_file) > 0) {
 				$feed_icon = "<img id=\"FIMG-$feed_id\" src=\"$icon_file\">";
 		} else {
@@ -1990,9 +1996,14 @@
 	function get_user_theme($link) {
 
 		if (get_schema_version($link) >= 63) {
-			return get_pref($link, "_THEME_ID");
+			$theme_name = get_pref($link, "_THEME_ID");
+			if (is_dir("themes/$theme_name")) {
+				return $theme_name;
+			} else {
+				return '';
+			}
 		} else {
-			return false;
+			return '';
 		}
 
 	}
@@ -2002,7 +2013,7 @@
 		if (get_schema_version($link) >= 63) {
 			$theme_name = get_pref($link, "_THEME_ID");
 
-			if ($theme_name) {
+			if ($theme_name && is_dir("themes/$theme_name")) {
 				$theme_path = "themes/$theme_name/";
 			} else {
 				$theme_name = '';
@@ -2017,12 +2028,14 @@
 	function get_all_themes() {
 		$themes = glob("themes/*");
 
+		asort($themes);
+
 		$rv = array();
 
 		foreach ($themes as $t) {
 			if (is_file("$t/theme.ini")) {
 				$ini = parse_ini_file("$t/theme.ini", true);
-				if ($ini['theme']['version']) {
+				if ($ini['theme']['version'] && !$ini['theme']['disabled']) {
 					$entry = array();
 					$entry["path"] = $t;
 					$entry["base"] = basename($t);
@@ -3042,7 +3055,7 @@
 			return "images/mark_set.png";
 			break;
 		case -2:
-			return "images/pub_set.gif";
+			return "images/pub_set.png";
 			break;
 		case -3:
 			return "images/fresh.png";
@@ -4644,6 +4657,8 @@
 		$result = db_query($link, "SELECT rtl_content, always_display_enclosures FROM ttrss_feeds
 			WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
 
+		$theme_path = get_user_theme_path($link);
+
 		if (db_num_rows($result) == 1) {
 			$rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
 			$always_display_enclosures = sql_bool_to_bool(db_fetch_result($result, 0, "always_display_enclosures"));
@@ -4742,30 +4757,21 @@
 			if (!$entry_comments) $entry_comments = "&nbsp;"; # placeholder
 
 			print "<div style='float : right'>
-					<img src='images/tag.png' class='tagsPic' alt='Tags' title='Tags'>&nbsp;";
+					<img src='${theme_path}images/tag.png' class='tagsPic' alt='Tags' title='Tags'>&nbsp;";
 
 			if (!$zoom_mode) {
 				print "<span id=\"ATSTR-$id\">$tags_str</span>
 					<a title=\"".__('Edit tags for this article')."\" 
 					href=\"javascript:editArticleTags($id, $feed_id)\">(+)</a>";
 
-				if (defined('_ENABLE_INLINE_VIEW')) {
-
-					print "<img src=\"images/art-inline.png\" class='tagsPic' 
-							style=\"cursor : pointer\" style=\"cursor : pointer\"
-							onclick=\"showOriginalArticleInline($id)\"
-							alt='Inline' title='".__('Display original article content')."'>";
-
-				}
-
-				print "<img src=\"images/art-zoom.png\" class='tagsPic' 
+				print "<img src=\"${theme_path}images/art-zoom.png\" class='tagsPic' 
 						style=\"cursor : pointer\" style=\"cursor : pointer\"
 						onclick=\"zoomToArticle($id)\"
 						alt='Zoom' title='".__('Show article summary in new window')."'>";
 
 				$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
 
-				print "<img src=\"images/art-pub-note.png\" class='tagsPic' 
+				print "<img src=\"${theme_path}images/art-pub-note.png\" class='tagsPic' 
 						style=\"cursor : pointer\" style=\"cursor : pointer\"
 						onclick=\"publishWithNote($id, '$note_escaped')\"
 						alt='PubNote' title='".__('Publish article with a note')."'>";
@@ -5047,6 +5053,8 @@
 
 			$fresh_intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE") * 60 * 60;
 
+			$theme_path = get_user_theme_path($link);
+
 			while ($line = db_fetch_assoc($result)) {
 
 				$class = ($lnum % 2) ? "even" : "odd";
@@ -5076,7 +5084,7 @@
 				if (sql_bool_to_bool($line["unread"]) && 
 					time() - strtotime($line["updated_noms"]) < $fresh_intl) {
 
-					$update_pic = "<img id='FUPDPIC-$id' src=\"images/fresh_sign.png\" 
+					$update_pic = "<img id='FUPDPIC-$id' src=\"${theme_path}images/fresh_sign.png\" 
 							alt=\"Fresh\">";
 				}
 	
@@ -5089,21 +5097,21 @@
 				}
 
 				if ($line["marked"] == "t" || $line["marked"] == "1") {
-					$marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_set.png\" 
+					$marked_pic = "<img id=\"FMPIC-$id\" src=\"${theme_path}images/mark_set.png\" 
 						class=\"markedPic\"
 						alt=\"Unstar article\" onclick='javascript:tMark($id)'>";
 				} else {
-					$marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_unset.png\" 
+					$marked_pic = "<img id=\"FMPIC-$id\" src=\"${theme_path}images/mark_unset.png\" 
 						class=\"markedPic\"
 						alt=\"Star article\" onclick='javascript:tMark($id)'>";
 				}
 
 				if ($line["published"] == "t" || $line["published"] == "1") {
-					$published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_set.gif\" 
+					$published_pic = "<img id=\"FPPIC-$id\" src=\"${theme_path}images/pub_set.png\" 
 						class=\"markedPic\"
 						alt=\"Unpublish article\" onclick='javascript:tPub($id)'>";
 				} else {
-					$published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_unset.gif\" 
+					$published_pic = "<img id=\"FPPIC-$id\" src=\"${theme_path}images/pub_unset.png\" 
 						class=\"markedPic\"
 						alt=\"Publish article\" onclick='javascript:tPub($id)'>";
 				}
@@ -5494,10 +5502,8 @@
 
 					$tags_str = format_tags_string(get_article_tags($link, $id), $id);
 
-//					print "<img src='images/tag.png' class='markedPic'>";
-
 					print "<span class='s1'>
-						<img class='tagsPic' src='images/tag.png' alt='Tags' title='Tags'>
+						<img class='tagsPic' src='${theme_path}images/tag.png' alt='Tags' title='Tags'>
 						<span id=\"ATSTR-$id\">$tags_str</span>
 						<a title=\"".__('Edit tags for this article')."\" 
 						href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>";

schema/versions/mysql/64.sql

@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set type_id = 2 where pref_name = '_THEME_ID';
+
+update ttrss_version set schema_version = 64;
+
+commit;

schema/versions/pgsql/64.sql

@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set type_id = 2 where pref_name = '_THEME_ID';
+
+update ttrss_version set schema_version = 64;
+
+commit;

themes/compact/images/ttrss_logo.svg

@@ -0,0 +1,121 @@
+<?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://web.resource.org/cc/"
+   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://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="155.00000pt"
+   height="25.000000pt"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/themes/graycube/images"
+   sodipodi:docname="ttrss_logo.svg"
+   inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/themes/graycube/images/ttrss_logo.png"
+   inkscape:export-xdpi="109"
+   inkscape:export-ydpi="109">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3112">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3114" />
+      <stop
+         style="stop-color:#808080;stop-opacity:1;"
+         offset="1"
+         id="stop3116" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2800">
+      <stop
+         style="stop-color:#000000;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2802" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2804" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2782">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2784" />
+      <stop
+         style="stop-color:#f6b5ba;stop-opacity:1;"
+         offset="1"
+         id="stop2786" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="109.86875"
+     inkscape:cy="3.8105931"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1590"
+     inkscape:window-height="1124"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
+       x="3.2755625"
+       y="23.535715"
+       id="text1306"
+       sodipodi:linespacing="125%"
+       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
+       inkscape:export-xdpi="180.00000"
+       inkscape:export-ydpi="180.00000"><tspan
+         sodipodi:role="line"
+         id="tspan1308"
+         x="3.2755625"
+         y="23.535715"
+         style="fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">tiny tiny</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
+       x="143.44531"
+       y="23.594028"
+       id="text3120"
+       sodipodi:linespacing="125%"
+       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
+       inkscape:export-xdpi="180.00000"
+       inkscape:export-ydpi="180.00000"><tspan
+         sodipodi:role="line"
+         id="tspan3122"
+         x="143.44531"
+         y="23.594028"
+         style="fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">rss</tspan></text>
+  </g>
+</svg>

themes/compact/theme.ini

@@ -0,0 +1,3 @@
+[theme]
+name=Compact
+version=1.0

themes/graycube/theme.ini

@@ -0,0 +1,3 @@
+[theme]
+name=Graycube
+version=1.0

themes/neon/images/ttrss_logo.svg

@@ -0,0 +1,155 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="155.00000pt"
+   height="25.000000pt"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="ttrss_logo.svg"
+   inkscape:export-filename="/Users/fox/Desktop/ttrss_logo.png"
+   inkscape:export-xdpi="109.68"
+   inkscape:export-ydpi="109.68"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="TRUE"
+   version="1.1">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 15.625 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="193.75 : 15.625 : 1"
+       inkscape:persp3d-origin="96.875 : 10.416667 : 1"
+       id="perspective2900" />
+    <linearGradient
+       id="linearGradient3112">
+      <stop
+         style="stop-color:#3c2c4c;stop-opacity:1;"
+         offset="0"
+         id="stop3114" />
+      <stop
+         style="stop-color:#b077ec;stop-opacity:1;"
+         offset="1"
+         id="stop3116" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2800">
+      <stop
+         style="stop-color:#000000;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2802" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2804" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2782">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2784" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop2786" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3112"
+       id="linearGradient3118"
+       x1="50"
+       y1="12.985595"
+       x2="50"
+       y2="31.920942"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.474438,0.321428)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2782"
+       id="linearGradient3124"
+       gradientUnits="userSpaceOnUse"
+       x1="50"
+       y1="12.985595"
+       x2="50"
+       y2="31.920942"
+       gradientTransform="translate(139.6953,0.37974)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#202020"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="103.10277"
+     inkscape:cy="3.8105931"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1499"
+     inkscape:window-height="1036"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     showgrid="false"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:url(#linearGradient3118);fill-opacity:1;stroke:#b077ec;stroke-width:0.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
+       x="3.2755625"
+       y="24.07143"
+       id="text1306"
+       sodipodi:linespacing="125%"
+       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
+       inkscape:export-xdpi="180.00000"
+       inkscape:export-ydpi="180.00000"><tspan
+         sodipodi:role="line"
+         id="tspan1308"
+         x="3.2755625"
+         y="24.07143"
+         style="fill:url(#linearGradient3118);fill-opacity:1;stroke:#b077ec;stroke-width:0.50000000000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">tiny tiny</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:url(#linearGradient3124);fill-opacity:1.0;stroke:#b077ec;stroke-width:0.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
+       x="143.44531"
+       y="24.129744"
+       id="text3120"
+       sodipodi:linespacing="125%"
+       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
+       inkscape:export-xdpi="180.00000"
+       inkscape:export-ydpi="180.00000"><tspan
+         sodipodi:role="line"
+         id="tspan3122"
+         x="143.44531"
+         y="24.129744"
+         style="fill:url(#linearGradient3124);fill-opacity:1.0;stroke:#b077ec;stroke-width:0.50000000000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">rss</tspan></text>
+  </g>
+</svg>

themes/neon/theme.css

@@ -0,0 +1,488 @@
+body {
+	background : #202020;
+}
+
+a {
+	color : gray;
+}
+
+a:hover {
+	color : #b077ec;
+}
+
+h3 {
+	border-color : #202020;
+}
+
+#overlay {
+	background : #202020;
+	color : gray;
+}
+
+div#l_progress_o {
+	background-color : #3c2c4c;
+}
+
+div#l_progress_i {
+	background-color : #b077ec;
+}
+
+#header {
+	
+}
+
+#footer, #prefFooter {
+	background : #202020;
+	color : gray;
+	border-color : #404040;
+}
+
+#footer a:hover {
+	color : #b077ec;
+}
+
+#feeds-holder {
+	background : #404040;
+	border-style : solid;
+	border-color : #404040;
+}
+
+#toolbar {
+	background : #202020;
+}
+
+input, select, button {
+	background : #3c2c4c;
+	border : 1px solid black;
+	color : #b077ec;
+	padding : 2px 4px 2px 4px;
+}
+
+textarea {
+	background : #3c2c4c;
+	border : 1px solid black;
+	color : #b077ec;
+}
+
+select {
+	padding : 2px 0px 2px 4px;
+}
+
+div.headlines_normal {
+	border-color : #404040;
+	background : #202020;
+}
+
+div.headlines_cdm {
+	border-color : #404040;
+	background : #202020;
+}
+
+div#headlinesInnerContainer {
+	background : #202020;
+}
+
+div.headlinesSubToolbar {
+	background : #404040;
+	color : #f0f0f0;
+}
+
+#resize-grabber {
+	border-width : 0px 0px 1px 0px;
+	border-style : solid;
+	border-color : #3c2c4c;
+	background : #3c2c4c;
+}
+
+#content-frame {
+	border-color : #404040;
+}
+
+#content-insert {
+	background : #202020;
+}
+
+.evenUnreadSelected, .evenSelectedUnread, .evenUnreadSelected td,
+	.evenSelectedUnread td {
+	background-color : #3c2c4c;
+	font-weight : bold;
+	border-color : #404040;
+}
+
+.oddUnreadSelected, .oddSelectedUnread, .oddUnreadSelected td,
+	.oddSelectedUnread td {
+	background-color : #3c2c4c;
+	font-weight : bold;
+	border-color : #404040;
+
+}
+
+.evenSelected, .evenSelected td {
+	background-color : #3c2c4c;
+	border-color : #404040;
+}
+
+.oddSelected, .oddSelected td {
+	background-color : #3c2c4c;
+	border-color : #404040;
+}
+
+.evenGrayed, .evenGrayed td {
+	background-color : #303030;
+	color : gray;
+	border-color : #404040;
+}
+
+.oddGrayed, .oddGrayed td {
+	border-color : #404040;
+}
+
+.oddGrayed {
+	color : gray;
+	background-color : #404040;
+}
+
+.even, .even td {
+  	border-color : #404040;
+	background-color : #404040;
+}
+
+.odd, .odd td {
+	background-color : #202020;
+	border-color : #202020;
+}
+
+.evenUnread, .evenUnread td {
+	background-color : #404040;
+	font-weight : bold;
+	border-color : #404040;
+}
+
+.oddUnread, .oddUnread td {
+	font-weight : bold;
+	border-color : #404040;
+	background-color : #202020;
+}
+
+ul.feedList li.feedCatSelected {
+	color : #b077ec;
+}
+
+ul.feedList li.feedCatSelected span.catTitle {
+	color : #b077ec;
+}
+
+ul.feedList li.feedCat {
+	color : #b077ec;
+}
+
+ul.feedList li.feedCat span.catTitle:hover {
+	color : #b077ec;
+}
+
+ul.feedList li.feedCat span.catTitle {
+	color : #b077ec;
+}
+
+ul.feedCatList li {
+	color : gray;
+}
+
+#prefContentOuter {
+	background : #404040;
+	border-color : #404040;
+}
+
+#prefContent {
+	background : #404040;
+	color : gray;
+
+}
+
+div.prefsTab {
+	border-color : #404040;
+	color : gray;
+}
+
+div.prefsTabSelected {
+	border-color : #404040;
+	background : #404040;
+	color : gray;
+}
+
+div.topLinks a {
+	color : #b077ec;	
+}
+
+div.topLinks a:hover {
+	color : gray;
+}
+
+li.feedSelected a,
+li.labelSelected a,
+li.virtSelected a,
+li.tagSelected a {
+	color : #b077ec;
+}
+
+li.feedUnreadSelected a,
+li.labelUnreadSelected a,
+li.virtUnreadSelected a,
+li.tagUnreadSelected a {
+	color : #b077ec;
+}
+
+span.contentPreview:hover, td.hlContent a:hover {	
+	color : #b077ec;
+}
+
+.catCtrHasUnread, .feedCtrHasUnread {
+	color : #8752c2;
+}
+
+span#headlineActionsDrop {
+	border : 1px solid #202020;
+	color : gray;
+	background : #202020;
+}
+
+ul#headlineActionsBody {
+	background-color : #202020;
+	border-color : #202020;
+}
+
+ul#headlineActionsBody li {
+	color : gray;
+}
+
+ul#headlineActionsBody li:hover {
+	color : gray;
+	background : #404040;
+}
+
+ul#headlineActionsBody li.insensitive {
+	color : #404040;
+}
+
+ul#headlineActionsBody li.insensitive:hover {
+	background : #202020;
+	color : #404040;
+}
+
+optgroup {
+	color : #b077ec;
+}
+
+#infoBoxTitle {
+	border-color : #404004;
+	background : #404040;
+	color : gray;
+	text-shadow : #202020 0px 1px 0px;
+}
+
+
+#infoBox {	
+	border-color : #202020;
+	background : #202020;
+	color : gray;
+}
+
+div.infoBoxContents a {
+	color : gray;
+}
+
+div.infoBoxContents a:hover {
+	color : #b077ec;
+}
+
+div.notice {
+	background : #202020;
+	border : 1px solid #404040;
+	color : gray;
+}
+
+.notify, .notifyInfo, .notifyProgress {
+	border-color : #b077ec;
+	background-color : #3c2c4c;
+	color : gray;
+}
+
+div.tagCloudContainer {
+	border : 1px solid #404040;
+	background : #202020;
+}
+
+div.tagCloudContainer a:hover {
+	color : #b077ec;
+}
+
+#dispSwitch a:hover {
+	color : #b077ec;
+}
+
+div.postReply {
+	color : gray;
+}
+
+div.postReply a {
+	color : gray;
+}
+
+div.postReply a:hover {
+	color : #b077ec;
+}
+
+div.postReply div.postHeader {
+	background : #3c2c4c;
+	border-color : #202020;
+	margin : 0px;
+}
+
+div.postReply > div.postHeader {
+	padding : 5px;
+}
+
+#dialog_overlay {
+	background-image : url("images/shadow_dark.png");
+}
+
+div#cmdline {
+	background-color : #3c2c4c;
+	border : 1px solid #b077ec;
+	padding : 3px 5px 3px 5px;
+	z-index : 5;
+	color : #b077ec;
+}
+
+table.prefFilterList tr.even:hover td, 
+table.prefFilterList tr.odd:hover td,
+table.prefFilterList tr.evenSelected:hover td, 
+table.prefFilterList tr.oddSelected:hover td 
+table.prefLabelList tr.even:hover td, 
+table.prefLabelList tr.odd:hover td,
+table.prefLabelList tr.evenSelected:hover td, 
+table.prefLabelList tr.oddSelected:hover td,
+table.prefUserList tr.even:hover td, 
+table.prefUserList tr.odd:hover td,
+table.prefUserList tr.evenSelected:hover td, 
+table.prefUserList tr.oddSelected:hover td,
+table.prefFeedList tr.even:hover td, 
+table.prefFeedList tr.odd:hover td,
+table.prefFeedList tr.evenSelected:hover td, 
+table.prefFeedList tr.oddSelected:hover td
+{
+	color : #b077ec;
+}
+
+table.headlinesList tr.feedTitle td a, div.cdmFeedTitle a {
+	color : gray;
+}
+
+table.headlinesList tr.feedTitle td {
+	background : #efefef;
+}
+
+tr.title td {
+	color : gray;
+	font-weight : bold;
+	border-color : #202020;
+}
+
+tr.title td a {
+	color : gray;
+}
+
+tr.title td a:hover {
+	color : #b077ec;
+}
+
+table.prefFeedList td.feedEditCat {
+	border-color : #202020;
+}
+
+table.prefFilterList td.filterEditCat {
+	border-color : #202020;
+}
+
+ul.browseFeedList, ul.userFeedList {
+	border : 1px solid #404040;
+	background : #202020;
+}
+
+div.prefFeedCatHolder {
+	border : 1px solid #404040;
+	background-color : #202020;
+}
+
+#debug_output {
+	background-color : #202020;
+	border : 1px solid #b077ec;
+	color : gray;
+}
+
+span.debugTS {
+	color : #b077ec;
+}
+
+div.cdmArticle {
+	border-color : #202020;
+	background : #404040;
+	color : gray;
+}
+
+div.cdmArticleUnread {
+	border-color : #202020;
+	background : #404040;
+	color : gray;
+}
+
+div.cdmArticleUnread div.cdmHeader {
+	background : transparent;
+	background-repeat : repeat-x;
+	color : gray;
+}
+
+div.cdmArticleUnread div.cdmHeader span.titleWrap a {
+	color : white;
+}
+
+div.cdmArticleUnreadSelected div.cdmHeader span.titleWrap a {
+	color : white;
+}
+
+div.cdmArticleSelected, div.cdmArticleUnreadSelected {
+	border-color : #404040;
+	background : #3c2c4c;
+	color : gray;
+}
+
+div.cdmArticleSelected div.cdmFooter, div.cdmArticleUnreadSelected div.cdmFooter {
+	background : gray;
+}
+
+div.cdmArticleUnread div.cdmHeader a.title, 
+div.cdmArticleUnreadSelected div.cdmHeader a.title {
+	color : gray;
+}
+
+div.cdmHeader a.title {
+	color : gray;
+}
+
+div.cdmHeader a:hover {
+	color : #3c2c4c;
+}
+
+div.cdmFooter {
+	background : #303030;
+	color : gray;
+}
+
+div.cdmContent a {
+	color : #b077ec;
+}
+
+div.cdmContent a:hover {
+	color : #3c2c4c;
+}
+

themes/neon/theme.ini

@@ -0,0 +1,3 @@
+[theme]
+name=Neon
+version=1.0

themes/old-skool/images/ttrss_logo.svg

@@ -0,0 +1,121 @@
+<?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://web.resource.org/cc/"
+   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://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="155.00000pt"
+   height="25.000000pt"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/themes/graycube/images"
+   sodipodi:docname="ttrss_logo.svg"
+   inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/themes/graycube/images/ttrss_logo.png"
+   inkscape:export-xdpi="109"
+   inkscape:export-ydpi="109">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3112">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3114" />
+      <stop
+         style="stop-color:#808080;stop-opacity:1;"
+         offset="1"
+         id="stop3116" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2800">
+      <stop
+         style="stop-color:#000000;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2802" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2804" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2782">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2784" />
+      <stop
+         style="stop-color:#f6b5ba;stop-opacity:1;"
+         offset="1"
+         id="stop2786" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="109.86875"
+     inkscape:cy="3.8105931"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1590"
+     inkscape:window-height="1124"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
+       x="3.2755625"
+       y="23.535715"
+       id="text1306"
+       sodipodi:linespacing="125%"
+       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
+       inkscape:export-xdpi="180.00000"
+       inkscape:export-ydpi="180.00000"><tspan
+         sodipodi:role="line"
+         id="tspan1308"
+         x="3.2755625"
+         y="23.535715"
+         style="fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">tiny tiny</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
+       x="143.44531"
+       y="23.594028"
+       id="text3120"
+       sodipodi:linespacing="125%"
+       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
+       inkscape:export-xdpi="180.00000"
+       inkscape:export-ydpi="180.00000"><tspan
+         sodipodi:role="line"
+         id="tspan3122"
+         x="143.44531"
+         y="23.594028"
+         style="fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">rss</tspan></text>
+  </g>
+</svg>

themes/old-skool/theme.ini

@@ -0,0 +1,3 @@
+[theme]
+name=Old-Skool
+version=1.0

themes/threecolumns/theme.css

@@ -1,60 +0,0 @@
-div.headlines_normal {
-	position : absolute;
-	border-width : 1px 0px 0px 0px;
-	border-style : solid;
-	border-color : #88b0f0;
-	left : 260px;
-	height : auto;
-	top : 85px;
-	right : 35%;
-	bottom : 40px;
-	overflow : hidden;
-	font-size : small;
-	border-collapse : collapse;
-}
-
-div.headlines_cdm {
-	position : absolute;
-	border-width : 1px 0px 1px 0px;
-	border-style : solid;
-	border-color : #88b0f0;
-	left : 260px;
-	bottom : 40px;
-	top : 85px;
-	width : 300px;
-	overflow : auto;
-	font-size : small;
-	border-collapse : collapse;
-}
-
-table.headlinesSubToolbar {
-	height : 25px;
-}
-
-div.postReply {
-	background : white;
-}
-
-#headlinesInnerContainer {
-	overflow : auto;
-	position : absolute;
-	top : 25px;
-	height : auto;
-	bottom : 0px;
-	left : 0px;
-	right : 0px;
-}
-
-#content-frame {
-	position : absolute;
-	border-width : 1px 0px 1px 1px;
-	border-style : solid;
-	border-color : #88b0f0;
-	overflow : auto;
-	top : 85px;
-	left : 65%;
-	bottom : 40px;
-	right : 0px;
-	border-collapse : collapse;
-}
-

themes/triple-pane/images/ttrss_logo.svg

@@ -0,0 +1,121 @@
+<?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://web.resource.org/cc/"
+   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://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="155.00000pt"
+   height="25.000000pt"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/themes/graycube/images"
+   sodipodi:docname="ttrss_logo.svg"
+   inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/themes/graycube/images/ttrss_logo.png"
+   inkscape:export-xdpi="109"
+   inkscape:export-ydpi="109">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3112">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3114" />
+      <stop
+         style="stop-color:#808080;stop-opacity:1;"
+         offset="1"
+         id="stop3116" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2800">
+      <stop
+         style="stop-color:#000000;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2802" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2804" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2782">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2784" />
+      <stop
+         style="stop-color:#f6b5ba;stop-opacity:1;"
+         offset="1"
+         id="stop2786" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="109.86875"
+     inkscape:cy="3.8105931"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1590"
+     inkscape:window-height="1124"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
+       x="3.2755625"
+       y="23.535715"
+       id="text1306"
+       sodipodi:linespacing="125%"
+       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
+       inkscape:export-xdpi="180.00000"
+       inkscape:export-ydpi="180.00000"><tspan
+         sodipodi:role="line"
+         id="tspan1308"
+         x="3.2755625"
+         y="23.535715"
+         style="fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">tiny tiny</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
+       x="143.44531"
+       y="23.594028"
+       id="text3120"
+       sodipodi:linespacing="125%"
+       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
+       inkscape:export-xdpi="180.00000"
+       inkscape:export-ydpi="180.00000"><tspan
+         sodipodi:role="line"
+         id="tspan3122"
+         x="143.44531"
+         y="23.594028"
+         style="fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">rss</tspan></text>
+  </g>
+</svg>

themes/triple-pane/theme.ini

@@ -0,0 +1,3 @@
+[theme]
+name=Triple Pane
+version=1.0

tt-rss.js

@@ -413,7 +413,7 @@ function resize_headlines(delta_x, delta_y) {
 				feeds_frame.style.bottom = f_frame.offsetHeight + "px";		
 		}
 	
-		if (getInitParam("theme") == "3pane") {
+		if (getInitParam("theme") == "triple-pane") {
 	
 			if (delta_x != undefined) {
 				if (c_frame.offsetLeft - delta_x > feeds_frame.offsetWidth + feeds_frame.offsetLeft + 100 && c_frame.offsetWidth + delta_x > 100) {
@@ -431,7 +431,7 @@ function resize_headlines(delta_x, delta_y) {
 				4) + "px";
 			resize_grab.style.display = "block";
 
-			resize_handle.src = "themes/3pane/images/resize_handle_vert.png";
+			resize_handle.src = "themes/triple-pane/images/resize_handle_vert.png";
 			resize_handle.style.paddingTop = (resize_grab.offsetHeight / 2 - 7) + "px";
 	
 		} else {

tt-rss.php

@@ -240,7 +240,7 @@
 	<div id="resize-grabber"
 		onmouseover="enable_resize(true)" onmouseout="enable_resize(false)"
 		title="<?php echo __('Drag me to resize panels') ?>"> 
-		<img src="images/resize_handle_horiz.png" id="resize-handle" 
+		<img src="<?php echo $user_theme ?>images/resize_handle_horiz.png" id="resize-handle" 
 			onmouseover="enable_resize(true)" onmouseout="enable_resize(false)"
 			alt=""/>
 		</div>