rework tab appearance, various interface improvements

10 files changed, 803 insertions, 614 deletions

diff --git a/backend.php b/backend.php
index c9d86ee0b..051a5f670 100644
--- a/backend.php
+++ b/backend.php
@@ -1308,11 +1308,11 @@
 				print "Feed browser is administratively disabled.";
 				return;
 			}
+
+			print "<div id=\"infoBoxTitle\">Other feeds: Top 50</div>";
 			
 			print "<div class=\"infoBoxContents\">";
 
-			print "<h1>Feed browser</h1>";
-
 			print "<p>Showing top 50 registered feeds, sorted by popularity:</p>";
 
 			$result = db_query($link, "SELECT feed_url,count(id) AS subscribers 
@@ -1388,8 +1388,6 @@
 			$title = htmlspecialchars(db_unescape_string(db_fetch_result($result,
 				0, "title")));
 
-			print "<div class=\"infoBoxContents\">";
-
 			$icon_file = ICONS_DIR . "/$feed_id.ico";
 	
 			if (file_exists($icon_file) && filesize($icon_file) > 0) {
@@ -1398,8 +1396,12 @@
 			} else {
 				$feed_icon = "";
 			}
-	
-			print "<h1>$feed_icon $title</h1>";
+
+			print "<div id=\"infoBoxTitle\">Feed editor</div>";
+
+			print "<div class=\"infoBoxContents\">";
+
+#			print "<h1>$feed_icon $title</h1>";
 
 			print "<table width='100%'>";
 
@@ -1823,10 +1825,11 @@
 				onchange=\"javascript:addFeed()\"
 				size=\"40\">
 				<input type=\"submit\" class=\"button\"
-				onclick=\"javascript:addFeed()\" value=\"Add feed\">";
+				onclick=\"javascript:addFeed()\" value=\"Subscribe\">";
 
 		if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
-			print "&nbsp;(<a href='javascript:browseFeeds()'>Top 50</a>)";
+			print " <input type=\"submit\" class=\"button\"
+				onclick=\"javascript:browseFeeds()\" value=\"Top 50\">";
 		}
 		
 		print "</td><td align='right'>
@@ -2000,16 +2003,16 @@
 	
 				print "
 					Selection:&nbsp;
-				<input type=\"submit\" class=\"button\" 
-					onclick=\"javascript:selectedFeedDetails()\" value=\"Details\">
+				<!-- <input type=\"submit\" class=\"button\" 
+					onclick=\"javascript:selectedFeedDetails()\" value=\"Details\"> -->
 				<input type=\"submit\" class=\"button\" 
 					onclick=\"javascript:editSelectedFeed()\" value=\"Edit\">
 				<input type=\"submit\" class=\"button\" 
-					onclick=\"javascript:removeSelectedFeeds()\" value=\"Remove\">";
+					onclick=\"javascript:removeSelectedFeeds()\" value=\"Unsubscribe\">";
 
 				if (get_pref($link, 'ENABLE_FEED_CATS')) {
 
-					print "&nbsp;&nbsp;";				
+					print "&nbsp;|&nbsp;";				
 
 					$result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
 						WHERE owner_uid = ".$_SESSION["uid"]."
@@ -2058,7 +2061,7 @@
 					size=\"40\">&nbsp;
 				<input 
 					type=\"submit\" class=\"button\" 
-					onclick=\"javascript:addFeedCat()\" value=\"Add category\"></div>";
+					onclick=\"javascript:addFeedCat()\" value=\"Create category\"></div>";
 	
 			$result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
 				WHERE owner_uid = ".$_SESSION["uid"]."
@@ -2233,7 +2236,8 @@
 
 		if ($quiet) return;
 
-		print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
+		print "<div id=\"infoBoxShadow\">
+			<div id=\"infoBox\">PLACEHOLDER</div></div>";
 
 		$result = db_query($link, "SELECT description 
 			FROM ttrss_filter_types ORDER BY description");
@@ -2374,7 +2378,7 @@
 	
 					if (!$line["description"]) $line["description"] = "[No description]";
 	
-					print "<td><input disabled=\"true\" type=\"checkbox\" 
+					print "<td align='center'><input disabled=\"true\" type=\"checkbox\" 
 						id=\"FICHK-".$line["id"]."\"></td>";
 	
 					print "<td>".$line["reg_exp"]."</td>";		
@@ -2384,7 +2388,7 @@
 
 				} else {
 	
-					print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+					print "<td align='center'><input disabled=\"true\" type=\"checkbox\" checked></td>";
 	
 					print "<td><input id=\"iedit_regexp\" value=\"".$line["reg_exp"].
 						"\"></td>";
@@ -2491,9 +2495,11 @@
 			$expr = $_GET["expr"];
 			$descr = $_GET["descr"];
 
+			print "<div id=\"infoBoxTitle\">Test label: $descr</div>";
+
 			print "<div class='infoBoxContents'>";
 		
-			print "<h1>Label &laquo;$descr&raquo;</h1>";
+#			print "<h1>Label &laquo;$descr&raquo;</h1>";
 
 //			print "<p><b>Expression</b>: $expr</p>";
 
@@ -2726,6 +2732,8 @@
 
 		$tid = sprintf("%d", $_GET["tid"]);
 
+		print "<div id=\"infoBoxTitle\">Help</div>";
+
 		print "<div class='infoBoxContents'>";
 
 		if (file_exists("help/$tid.php")) {
@@ -2750,20 +2758,24 @@
 		$id = $_GET["id"];
 		$param = $_GET["param"];
 
-		print "<div class=\"infoBoxContents\">";
-
 		if ($id == "quickAddFeed") {
-			print "
-			Feed URL: <input 
-			onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
-			id=\"qafInput\">";
+
+			print "<div id=\"infoBoxTitle\">Subscribe to feed</div>";
+			print "<div class=\"infoBoxContents\">";
+
+			print "<table width='100%'>
+			<tr><td>Feed URL:</td><td>
+				<input onblur=\"javascript:enableHotkeys()\" 
+					onfocus=\"javascript:disableHotkeys()\" id=\"qafInput\"></td></tr>";
 		
 			if (get_pref($link, 'ENABLE_FEED_CATS')) {
+				print "<tr><td>Category:</td><td>";
+			
 				$result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
 					WHERE owner_uid = ".$_SESSION["uid"]."
 					ORDER BY title");
 
-				print " <select id=\"qafCat\">";
+				print "<select id=\"qafCat\">";
 				print "<option id=\"0\">Uncategorized</option>";
 
 				if (db_num_rows($result) != 0) {
@@ -2777,13 +2789,14 @@
 				}
 
 				print "</select>";
+				print "</td></tr>";
 			}
 			
-			print "&nbsp;<input class=\"button\"
-				type=\"submit\" onclick=\"javascript:qafAdd()\" value=\"Add feed\">
+			print "<tr><td colspan='2' align='right'><input class=\"button\"
+				type=\"submit\" onclick=\"javascript:qafAdd()\" value=\"Subscribe\">
 			<input class=\"button\"
-				type=\"submit\" onclick=\"javascript:closeDlg()\" 
-				value=\"Cancel\">";
+				type=\"submit\" onclick=\"javascript:closeInfoBox()\" 
+				value=\"Cancel\"></td></tr></table>";
 		}
 
 		if ($id == "quickDelFeed") {
@@ -2800,23 +2813,29 @@
 				<input class=\"button\"
 					type=\"submit\" onclick=\"javascript:qfdDelete($param)\" value=\"Remove\">
 				<input class=\"button\"
-					type=\"submit\" onclick=\"javascript:closeDlg()\" 
+					type=\"submit\" onclick=\"javascript:closeInfoBox()\" 
 					value=\"Cancel\">";
 			} else {
 				print "Error: Feed $param not found.&nbsp;
 				<input class=\"button\"
-					type=\"submit\" onclick=\"javascript:closeDlg()\" 
+					type=\"submit\" onclick=\"javascript:closeInfoBox()\" 
 					value=\"Cancel\">";		
 			}
 		}
 
 		if ($id == "search") {
 
+			print "<div id=\"infoBoxTitle\">Search</div>";
+			print "<div class=\"infoBoxContents\">";
+
 			$active_feed_id = db_escape_string($_GET["param"]);
 
+			print "<table width='100%'><tr><td>Search:</td><td>";
+
 			print "<input id=\"searchbox\" class=\"extSearch\"			
 			onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
 			onchange=\"javascript:search()\">
+			</td></tr><tr><td>Where:</td><td>
 			<select id=\"searchmodebox\">
 				<option selected>All feeds</option>";
 				
@@ -2830,17 +2849,22 @@
 				print "<option>This category</option>";
 			}
 
-			print "</select>		
+			print "</select></td></tr>
+
+			<tr><td colspan='2' align='right'>
 			<input type=\"submit\" 
 				class=\"button\" onclick=\"javascript:search()\" value=\"Search\">
 			<input class=\"button\"
-				type=\"submit\" onclick=\"javascript:closeDlg()\" 
-				value=\"Close\">";
+				type=\"submit\" onclick=\"javascript:closeInfoBox()\" 
+				value=\"Cancel\"></td></tr></table>";
 
 		}
 
 		if ($id == "quickAddFilter") {
 
+			print "<div id=\"infoBoxTitle\">Create filter</div>";
+			print "<div class=\"infoBoxContents\">";
+
 			$result = db_query($link, "SELECT description 
 				FROM ttrss_filter_types ORDER BY description");
 	
@@ -2850,9 +2874,9 @@
 				array_push($filter_types, $line["description"]);
 			}
 
-			print "<table>";
+			print "<table width='100%'>";
 
-			print "<tr><td>Match:</td><td><input id=\"fadd_regexp\" size=\"40\">&nbsp;";
+			print "<tr><td>Match:</td><td><input id=\"fadd_regexp\" size=\"30\">&nbsp;";
 			
 			print_select("fadd_match", "Title", $filter_types);	
 	
@@ -2896,13 +2920,14 @@
 	
 			print "<input type=\"submit\" 
 				class=\"button\" onclick=\"javascript:qaddFilter()\" 
-				value=\"Add filter\"> ";
+				value=\"Create\"> ";
 
 			print "<input class=\"button\"
-				type=\"submit\" onclick=\"javascript:closeDlg()\" 
-				value=\"Close\">";
+				type=\"submit\" onclick=\"javascript:closeInfoBox()\" 
+				value=\"Cancel\">";
 
 			print "</td></tr></table>";
+
 		}
 
 		print "</div>";
@@ -3581,6 +3606,8 @@
 
 		$uid = sprintf("%d", $_GET["id"]);
 
+		print "<div id=\"infoBoxTitle\">User details</div>";
+
 		print "<div class='infoBoxContents'>";
 
 		$result = db_query($link, "SELECT login,
@@ -3681,6 +3708,7 @@
 
 		$feed_ids = split(",", db_escape_string($_GET["id"]));
 
+		print "<div id=\"infoBoxTitle\">Feed details</div>";
 		print "<div class=\"infoBoxContents\">";
 
 		foreach ($feed_ids as $feed_id) {
diff --git a/functions.js b/functions.js
index 5d010c6e3..ae25a2cc6 100644
--- a/functions.js
+++ b/functions.js
@@ -918,6 +918,20 @@ function center_element(e) {
 	}
 }
 
+function closeInfoBox() {
+	var box = document.getElementById('infoBox');
+	var shadow = document.getElementById('infoBoxShadow');
+
+	if (shadow) {
+		shadow.style.display = "none";
+	} else if (box) {
+		box.style.display = "none";
+	}
+
+	enableHotkeys();
+}
+
+
 function displayDlg(id, param) {
 
 	if (!xmlhttp_ready(xmlhttp)) {
@@ -929,22 +943,16 @@ function displayDlg(id, param) {
 
 	xmlhttp.open("GET", "backend.php?op=dlg&id=" +
 		param_escape(id) + "&param=" + param_escape(param), true);
-	xmlhttp.onreadystatechange=dlg_display_callback;
+	xmlhttp.onreadystatechange=infobox_callback;
 	xmlhttp.send(null);
 
 	disableHotkeys();
 }
 
-function closeDlg() {
-	var dlg = document.getElementById("infoBoxShadow");
-	dlg.style.display = "none";
-	enableHotkeys();
-}
-
-function dlg_submit_callback() {
+function infobox_submit_callback() {
 	if (xmlhttp.readyState == 4) {
 		notify(xmlhttp.responseText);
-		closeDlg();
+		closeInfoBox();
 
 		// called from prefs, reload tab
 		if (active_tab) {
@@ -953,14 +961,19 @@ function dlg_submit_callback() {
 	} 
 }
 
-function dlg_display_callback() {
+function infobox_callback() {
 	if (xmlhttp.readyState == 4) {
-		var dlg = document.getElementById("infoBox");
-		var dlg_s = document.getElementById("infoBoxShadow");
-
-		dlg.innerHTML = xmlhttp.responseText;
-		dlg_s.style.display = "block";
-	} 
+		var box = document.getElementById('infoBox');
+		var shadow = document.getElementById('infoBoxShadow');
+		if (box) {			
+			box.innerHTML=xmlhttp.responseText;			
+			if (shadow) {
+				shadow.style.display = "block";
+			} else {
+				box.style.display = "block";				
+			}
+		}
+	}
 }
 
 function qaddFilter() {
@@ -976,7 +989,7 @@ function qaddFilter() {
 	var action = document.getElementById("fadd_action");
 
 	if (regexp.value.length == 0) {
-		notify("Missing filter expression.");
+		alert("Missing filter expression.");
 	} else {
 		notify("Adding filter...");
 
@@ -988,7 +1001,7 @@ function qaddFilter() {
 			param_escape(regexp.value) + "&match=" + v_match +
 			"&fid=" + param_escape(feed_id) + "&aid=" + param_escape(action_id), true);
 			
-		xmlhttp.onreadystatechange=dlg_submit_callback;
+		xmlhttp.onreadystatechange=infobox_submit_callback;
 		xmlhttp.send(null);
 
 		regexp.value = "";
diff --git a/images/active_tab.png b/images/active_tab.png
new file mode 100644
index 000000000..a307f8a26
--- /dev/null
+++ b/images/active_tab.png
diff --git a/images/active_tab.svg b/images/active_tab.svg
new file mode 100644
index 000000000..7684eaf61
--- /dev/null
+++ b/images/active_tab.svg
@@ -0,0 +1,89 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="130"
+   height="40"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   version="1.0"
+   sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/images"
+   sodipodi:docname="active_tab.svg"
+   inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/images/active_tab.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient2200">
+      <stop
+         style="stop-color:#ecf0f4;stop-opacity:1;"
+         offset="0"
+         id="stop2202" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2204" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2200"
+       id="linearGradient2206"
+       x1="60.892857"
+       y1="1.6071428"
+       x2="60.892857"
+       y2="17.682539"
+       gradientUnits="userSpaceOnUse" />
+  </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="67.817525"
+     inkscape:cy="17.306406"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1596"
+     inkscape:window-height="1153"
+     inkscape:window-x="0"
+     inkscape:window-y="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" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:1;fill:url(#linearGradient2206);fill-opacity:1.0;stroke:#88b0ff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1325"
+       width="129.28574"
+       height="48.392838"
+       x="0.53571433"
+       y="0.53571421"
+       rx="5"
+       ry="5"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>
diff --git a/images/prefs_tab.png b/images/prefs_tab.png
new file mode 100644
index 000000000..5df6f8bf4
--- /dev/null
+++ b/images/prefs_tab.png
diff --git a/images/prefs_tab.svg b/images/prefs_tab.svg
new file mode 100644
index 000000000..f8307e4de
--- /dev/null
+++ b/images/prefs_tab.svg
@@ -0,0 +1,77 @@
+<?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="130"
+   height="40"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   version="1.0"
+   sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/images"
+   sodipodi:docname="prefs_tab.svg"
+   inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/images/active_tab.png"
+   inkscape:export-xdpi="90.150002"
+   inkscape:export-ydpi="90.150002">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient2200">
+      <stop
+         style="stop-color:#ecf0f4;stop-opacity:1;"
+         offset="0"
+         id="stop2202" />
+      <stop
+         style="stop-color:#88b0ff;stop-opacity:0;"
+         offset="1"
+         id="stop2204" />
+    </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="67.817525"
+     inkscape:cy="17.306406"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1596"
+     inkscape:window-height="1153"
+     inkscape:window-x="0"
+     inkscape:window-y="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" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1.0;stroke:#88b0ff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1325"
+       width="129.28574"
+       height="48.392838"
+       x="0.53571433"
+       y="0.53571421"
+       rx="5"
+       ry="5" />
+  </g>
+</svg>
diff --git a/prefs.js b/prefs.js
index a0348f926..bc6e8667f 100644
--- a/prefs.js
+++ b/prefs.js
@@ -145,22 +145,6 @@ function userlist_callback() {
 	}
 }
 
-function infobox_callback() {
-	if (xmlhttp.readyState == 4) {
-		var box = document.getElementById('infoBox');
-		var shadow = document.getElementById('infoBoxShadow');
-		if (box) {			
-			box.innerHTML=xmlhttp.responseText;			
-			if (shadow) {
-				shadow.style.display = "block";
-			} else {
-				box.style.display = "block";				
-			}
-		}
-	}
-}
-
-
 function prefslist_callback() {
 	var container = document.getElementById('prefContent');
 	if (xmlhttp.readyState == 4) {
@@ -1346,17 +1330,6 @@ function init() {
 	}
 }
 
-function closeInfoBox() {
-	var box = document.getElementById('infoBox');
-	var shadow = document.getElementById('infoBoxShadow');
-
-	if (shadow) {
-		shadow.style.display = "none";
-	} else if (box) {
-		box.style.display = "none";
-	}
-}
-
 function categorizeSelectedFeeds() {
 
 	if (!xmlhttp_ready(xmlhttp)) {
diff --git a/themes/compat/theme.css b/themes/compat/theme.css
index a37d84455..11f7ff4d6 100644
--- a/themes/compat/theme.css
+++ b/themes/compat/theme.css
@@ -469,6 +469,15 @@ div.helpResponse {
 	width : 300px;
 }
 
+#infoBoxTitle {
+	border-width : 1px 1px 1px 1px;
+	border-style : solid;
+	border-color : #c0c0c0;
+	background-color : #c0c0c0;
+	padding : 2px;
+	color : white;
+}
+
 
 #infoBox {
 	border : 1px solid #c0c0c0;
diff --git a/tt-rss.css b/tt-rss.css
index 0cbcc8910..9084ff8b8 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1,199 +1,190 @@
 body {
-        background : white;
-        color : black;
-        margin : 0px;
-        padding : 0px;
-        font-family : sans-serif;
+	background : white;
+	color : black;
+	margin : 0px;
+	padding : 0px;
+	font-family : sans-serif;
 }
 
 /* common styles */
 
 table.main td.headerBox {
 /*        background-image : url("images/vgrad_light_rev2.png");
-        background-position : top left;
-        background-repeat : repeat-x; */
+	background-position : top left;
+	background-repeat : repeat-x; */
   		  background-color : white;
 }
 
 table.main td.header {
-        padding : 10px 10px 10px 10px;
-        height : 70px;
+	padding : 10px 10px 10px 10px;
+	height : 70px;
 }
 
 table.main td.mainToolbar {
-        border-width : 0px 0px 0px 0px;
-        border-style : solid;
-        border-color : #c0c0c0;
-        padding : 3px 25px 3px 10px;
+	border-width : 0px 0px 0px 0px;
+	border-style : solid;
+	border-color : #c0c0c0;
+	padding : 3px 25px 3px 10px;
 }
 
 table.main td.prefsToolbar {
-        padding : 0px 5px 5px 0px;
+	padding : 0px 5px 5px 0px;
 }
 
 table.main td.feeds {
-        width : 290px;
-        height : 100%;
-        border-width : 1px 0px 0px 0px;
-        border-style : solid;
-        border-color : #88b0f0;
-        padding : 0px;
+	width : 290px;
+	height : 100%;
+	border-width : 1px 0px 0px 0px;
+	border-style : solid;
+	border-color : #88b0f0;
+	padding : 0px;
 }
 
 table.main td.headlinesToolbarBox {
-        padding : 10px;
-        border-width : 0px 0px 1px 1px;
-        border-style : solid;
-        border-color : #88b0f0;
-        background-image : url("images/toolbar.png");
-        background-position : bottom left;
-        background-repeat : repeat-x;
-        background-color : white;
+	padding : 10px;
+	border-width : 0px 0px 1px 1px;
+	border-style : solid;
+	border-color : #88b0f0;
+	background-image : url("images/toolbar.png");
+	background-position : bottom left;
+	background-repeat : repeat-x;
+	background-color : white;
 }
 
 table.main td.footer {
-        border-width : 1px 0px 0px 0px;
-        border-style : solid;
-        border-color : #88b0f0;
-        padding : 10px;
-        text-align : center;
-        font-size : x-small;
-        background-image : url("images/footer.png");
-        background-position : top left;
-        background-repeat : repeat-x; 
-		  background-color : white;
-        color : black;
+	border-width : 1px 0px 0px 0px;
+	border-style : solid;
+	border-color : #88b0f0;
+	padding : 10px;
+	text-align : center;
+	font-size : x-small;
+	background-image : url("images/footer.png");
+	background-position : top left;
+	background-repeat : repeat-x; 
+	background-color : white;
+	color : black;
 }
 
 table.main td.prefFooter {
-        border-width : 1px 0px 0px 0px;
-        border-style : solid;
-        border-color : #88b0f0;
-        padding : 10px;
-        text-align : center;
-        font-size : x-small;
-		  background-color : white;
-        color : black;
+	border-width : 1px 0px 0px 0px;
+	border-style : solid;
+	border-color : #88b0f0;
+	padding : 10px;
+	text-align : center;
+	font-size : x-small;
+	background-color : white;
+	color : black;
 }
 
 
 table.main td.footer a {
-        color : black;
+	color : black;
 }
 
 table.main td.footer a:hover {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 table.main td.headlines {
-        height : 25%;
-        border-width : 0px 0px 1px 1px;
-        border-style : solid;
-        border-color : #88b0f0;
+	height : 25%;
+	border-width : 0px 0px 1px 1px;
+	border-style : solid;
+	border-color : #88b0f0;
 }
 
 table.main td.headlines2 {
-        height : 100%;
-        border-width : 0px 0px 0px 1px;
-        border-style : solid;
-        border-color : #c0c0c0;
+	height : 100%;
+	border-width : 0px 0px 0px 1px;
+	border-style : solid;
+	border-color : #c0c0c0;
 }
 
 table.main td.content {
-        height : 100%;
-/*        background-image : url("images/vgrad_light_rev.png");
-        background-position : top left;
-        background-repeat : repeat-x; */
-        border-width : 0px 0px 0px 1px;
-        border-style : solid;
-        border-color : #88b0f0;
-/*		  background-color : #ecf4ff; */
+	height : 100%;
+	border-width : 0px 0px 0px 1px;
+	border-style : solid;
+	border-color : #88b0f0;
 }
 
 table.main td.prefContent {
-        height : 100%;
-        background-image : url("images/prefs-content.png");
-        background-position : top left;
-        background-repeat : repeat-x;
-        border-width : 1px 0px 0px 0px;
-        border-style : solid;
-        border-color : #88b0f0;
-        padding : 20px;
-		  background-color : white; 
-}
-
-/*td.prefContent .even, td.prefContent .even td {
-        background-color : #ecf4ff;
-		  border-color : #88b0f0;
-} */
+	height : 100%;
+	background-image : url("images/prefs-content.png");
+	background-position : top left;
+	background-repeat : repeat-x;
+	border-width : 1px 0px 0px 0px;
+	border-style : solid;
+	border-color : #88b0f0;
+	padding : 20px;
+	background-color : white; 
+}
 
 div.postReply {
-        height : 100%;
-        padding : 10px;
+	height : 100%;
+	padding : 10px;
 }
 
 div.postReply a {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 div.postReply a:hover {
-        color : black;
+	color : black;
 }
 
 div.postReply div.postHeader {
-        background : #ecf4ff;
-        border : 1px solid #88b0f0;
+	background : #ecf4ff;
+	border : 1px solid #88b0f0;
 }
 
 div.postReply > div.postHeader {
-        padding : 5px;
+	padding : 5px;
 }
 
 div.postReply div.postContent {
-        padding : 10px;
+	padding : 10px;
 }
 
 div.postReply div.postIcon {
-        float : right;
-        border : 0px;
-        margin : 10px 0px 10px 10px;
+	float : right;
+	border : 0px;
+	margin : 10px 0px 10px 10px;
 }
 
 ul.feedList {
-        list-style-type : none;
-        margin : 5px;
-        padding : 0px 0px 0px 10px;
+	list-style-type : none;
+	margin : 5px;
+	padding : 0px 0px 0px 10px;
 }
 
 ul.feedList li.feedCat {
-        margin : 0px;
-        padding : 3px 0px 3px 0px;
-        color : #707070;
-        font-size : x-small;
+	margin : 0px;
+	padding : 3px 0px 3px 0px;
+	color : #707070;
+	font-size : x-small;
 }
 
 ul.feedList li.feedCat a {
-        color : #707070;
+	color : #707070;
 }
 
 ul.feedList li.feedCat a:hover {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 ul.feedCatList {
-        list-style-type : none;
-        margin : 0px 0px 0px 20px;
-        padding : 0px;  
+	list-style-type : none;
+	margin : 0px 0px 0px 20px;
+	padding : 0px;  
 }
 
 ul.feedCatList li {
-        margin : 0px;
-        padding : 0px 0px 0px 0px;
-        color : black;
+	margin : 0px;
+	padding : 0px 0px 0px 0px;
+	color : black;
 }
 
 ul.feedList li {
-        margin : 0px;
+	margin : 0px;
 }
 
 ul.feedlist li.feedUnread, 
@@ -201,28 +192,28 @@ ul.feedlist li.errorUnread,
 ul.feedlist li.labelUnread, 
 ul.feedlist li.virtUnread,
 ul.feedlist li.tagUnread {
-        font-weight : bold;
+	font-weight : bold;
 }
 
 ul.feedlist li.errorSelected a,
 ul.feedlist li.error a,
 ul.feedlist li.errorUnread a,
 ul.feedlist li.errorUnreadSelected a {
-        color : #f04040;
+	color : #f04040;
 }
 
 ul.feedlist li.feedSelected a,
 ul.feedlist li.labelSelected a,
 ul.feedlist li.virtSelected a,
 ul.feedlist li.tagSelected a {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 ul.feedlist li.feedUnreadSelected a,
 ul.feedlist li.labelUnreadSelected a,
 ul.feedlist li.virtUnreadSelected a,
 ul.feedlist li.tagUnreadSelected a {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 ul.feedlist li.feedUnreadSelected,
@@ -230,171 +221,171 @@ ul.feedlist li.errorUnreadSelected,
 ul.feedlist li.labelUnreadSelected,
 ul.feedlist li.virtUnreadSelected,
 ul.feedlist li.tagUnreadSelected {
-        font-weight : bold;
+	font-weight : bold;
 }
 
 ul.feedList li.feed {
-        display : block;
+	display : block;
 }
 
 ul.feedList img, img.tinyFeedIcon {
-        margin : 0px 3px 0px 0px;
-        width : 16px;
-        height : 16px;
-        border-width : 0px;
+	margin : 0px 3px 0px 0px;
+	width : 16px;
+	height : 16px;
+	border-width : 0px;
 }
 
 h1 {
-        font-size : 16pt;       
+	font-size : 16pt;       
 }
 
 h2 {
-        font-size : 14pt;
-        font-weight : bold;
-        border-width : 0px 0px 1px 0px;
-        border-style : solid;
-        border-color : #ecf4ff;
+	font-size : 14pt;
+	font-weight : bold;
+	border-width : 0px 0px 1px 0px;
+	border-style : solid;
+	border-color : #ecf4ff;
 }
 
 h3 {
-        font-size : 12pt;
-        font-weight : bold;
-        border-width : 0px 0px 1px 0px;
-        border-style : solid;
-        border-color : #ecf4ff;
+	font-size : 12pt;
+	font-weight : bold;
+	border-width : 0px 0px 1px 0px;
+	border-style : solid;
+	border-color : #ecf4ff;
 }
 
 hr {
-        border-width : 0px 0px 1px 0px;
-        border-style : dashed;
-        border-color : #e0e0e0;
+	border-width : 0px 0px 1px 0px;
+	border-style : dashed;
+	border-color : #e0e0e0;
 }
 
 a {
-        color : black;
-        text-decoration : none;
+	color : black;
+	text-decoration : none;
 }
 
 a:hover {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 #piggie {
-        width : 400;
-        height : 400;
-        right : 0;
-        top : -400;
-        background-color : white;
-        display : none;
-        z-index : 3;
-        background-image : url("http://madoka.spb.ru/stuff/fox/piggie.png");
-        background-position : center center;
-        background-repeat : no-repeat;
-        position : absolute;
-        border : 1px solid pink;        
-        margin-left : auto;
-        margin-right : auto;
-        -moz-border-radius : 10px;
-        opacity : 0.8;
+	width : 400;
+	height : 400;
+	right : 0;
+	top : -400;
+	background-color : white;
+	display : none;
+	z-index : 3;
+	background-image : url("http://madoka.spb.ru/stuff/fox/piggie.png");
+	background-position : center center;
+	background-repeat : no-repeat;
+	position : absolute;
+	border : 1px solid pink;        
+	margin-left : auto;
+	margin-right : auto;
+	-moz-border-radius : 10px;
+	opacity : 0.8;
 }
 
 #iedit_title, #iedit_link, #iedit_regexp, #iedit_descr, #iedit_expr, #iedit_updintl,
 #iedit_purgintl, #iedit_ulogin, #iedit_ulevel, #iedit_match, #iedit_feed,
 #iedit_fcat, #iedit_filter_action, #iedit_login, #iedit_pass, #iedit_email,
 #iedit_parent_feed {
-        width : 100%;
-        padding-left : 2px;
+	width : 100%;
+	padding-left : 2px;
 }
 
 input.editbox {
-        width : 200px;
-        padding-left : 2px;
+	width : 200px;
+	padding-left : 2px;
 }
 
 td.notifyBox {
-        font-size : 10pt;
-        text-align : right;
+	font-size : 10pt;
+	text-align : right;
 }
 
 #notify {
-        color : black;
-        font-weight : bold;
-        padding : 3px;
+	color : black;
+	font-weight : bold;
+	padding : 3px;
 }
 
 #dispSwitch {
-        padding : 5px 5px 5px 0px;
-        font-size : x-small;
-        text-align : right;
+	padding : 5px 5px 5px 0px;
+	font-size : x-small;
+	text-align : right;
 }
 
 #dispSwitch a {
-        color : gray;
+	color : gray;
 }
 
 #dispSwitch a:hover {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 div.expPane {
-        margin : 15px;
+	margin : 15px;
 }
 
 iframe {
-        border : 0px solid white;
+	border : 0px solid white;
 }
 
 iframe.feedsFrameWithActions {
-        width : 100%;
-        height : 90%;
-        margin : 0px;
-        padding : 0px;
+	width : 100%;
+	height : 90%;
+	margin : 0px;
+	padding : 0px;
 }
 
 iframe.feedsFrame {
-        width : 100%;
-        height : 100%;
-        margin : 0px;
-        padding : 0px;
+	width : 100%;
+	height : 100%;
+	margin : 0px;
+	padding : 0px;
 }
 
 iframe.contentFrame, iframe.headlinesFrame {
-        width : 100%;
-        padding : 0px;
-        margin : 0px;
-        height : 100%;
+	width : 100%;
+	padding : 0px;
+	margin : 0px;
+	height : 100%;
 }
 
 /*.button {
-        border : 1px solid #d0d0d0;
-        background-image : url("images/button.png");
-        background-position : top;
-        background-repeat : repeat-x;
-        background-color : white;
-        color : black;  
+	border : 1px solid #d0d0d0;
+	background-image : url("images/button.png");
+	background-position : top;
+	background-repeat : repeat-x;
+	background-color : white;
+	color : black;  
 }
 
 .button:hover {
-        background : white;
-        text-decoration : none;
-        color : black;
+	background : white;
+	text-decoration : none;
+	color : black;
 }
 
 .disabledButton {
-        border : 1px solid #c0c0c0;
-        background-color : white;
-        color : gray;   
+	border : 1px solid #c0c0c0;
+	background-color : white;
+	color : gray;   
 }
 
 a.button {
-        padding : 2px 5px 2px 5px;
-        font-size : small;
+	padding : 2px 5px 2px 5px;
+	font-size : small;
 } */
 
 .evenUnreadSelected, .evenSelectedUnread, .evenUnreadSelected td,
 	.evenSelectedUnread td {
-        background-color : #fff7d5;
-        font-weight : bold;
+	background-color : #fff7d5;
+	font-weight : bold;
 		  border-width : 1px 0px 1px 0px;
 		  border-style : solid;
 		  border-color : #e7d796;
@@ -402,704 +393,713 @@ a.button {
 
 .oddUnreadSelected, .oddSelectedUnread, .oddUnreadSelected td,
 	.oddSelectedUnread td {
-        background-color : #fff7d5;
-        font-weight : bold;
+	background-color : #fff7d5;
+	font-weight : bold;
 }
 
 .evenSelected, .evenSelected td {
-        background-color : #fff7d5;
+	background-color : #fff7d5;
 		  border-width : 1px 0px 1px 0px;
 		  border-style : solid;
 		  border-color : #e7d796;
 }
 
 .oddSelected, .evenSelected td {
-        background-color : #fff7d5;
+	background-color : #fff7d5;
 }
 
 /*
 .feedUnreadSelected, .feedSelectedUnread, 
 .virtUnreadSelected, .virtSelectedUnread,
 .labelUnreadSelected, .labelSelectedUnread {
-        background-color : #e0e0ff;
-        font-weight : bold;
+	background-color : #e0e0ff;
+	font-weight : bold;
 } */
 
 
 .evenGrayed, .evenGrayed td {
-        background-color : #f0f0f0;
-        color : #909090;
+	background-color : #f0f0f0;
+	color : #909090;
 		  border-width : 1px 0px 1px 0px;
 		  border-style : solid;
-		  border-color : #88b0f0;
+		  border-color : #c0c0c0;
 }
 
 .oddGrayed {
-        color : #909090;
+	color : #909090;
 }
 
 .even, .even td {
 		  border-width : 1px 0px 1px 0px;
 		  border-style : solid;
 		  border-color : #c0c0c0;
-        background-color : #f0f0f0;
+	background-color : #f0f0f0;
 }
 
 .evenUnread, .evenUnread td {
-        background-color : #f0f0f0;
-        font-weight : bold;
+	background-color : #f0f0f0;
+	font-weight : bold;
 		  border-width : 1px 0px 1px 0px;
 		  border-style : solid;
 		  border-color : #c0c0c0;
 }
 
 .oddUnread, .oddUnread td {
-        font-weight : bold;
+	font-weight : bold;
 }
 
 .invisible {
-        display : none;
+	display : none;
 }
 
 /*
 td > input, div > input {
-        border : 1px solid #a0a0a0;
+	border : 1px solid #a0a0a0;
 } */
 
 /* preferences */
 
 tr.title td {
-        border-width : 0px 0px 1px 0px;
-        border-color : #ecf4ff;
-        border-style : solid;
-        font-size : x-small;
-        color : black;
+	border-width : 0px 0px 1px 0px;
+	border-color : #ecf4ff;
+	border-style : solid;
+	font-size : x-small;
+	color : black;
 }
 
 tr.title td a {
-        color : black;
+	color : black;
 }
 
 tr.title td a:hover {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 table.prefFeedList td.feedEditCat {
-        font-size : large;
-        font-weight : bold;
-        padding : 5px 0px 5px 0px;
+	font-size : large;
+	font-weight : bold;
+	padding : 5px 0px 5px 0px;
 }
 
 table.prefFeedList td.feedIcon {
-        text-align : center;
+	text-align : center;
 }
 
 table.prefFeedList td.feedSelect {
-        text-align : center;
+	text-align : center;
 }
 
 a.helpLink {
-        color : #808080;
+	color : #808080;
 }
 
 a.helpLink:hover {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 div.helpResponse {
-        margin : 10px;
-        background-image : url("images/vgrad_light_rev2.png");
-        background-position : top left;
-        background-repeat : repeat-x;
-        padding : 10px 20px 10px 20px;
-        border : 1px solid #f0f0f0;
+	margin : 10px;
+	background-image : url("images/vgrad_light_rev2.png");
+	background-position : top left;
+	background-repeat : repeat-x;
+	padding : 10px 20px 10px 20px;
+	border : 1px solid #f0f0f0;
 }
 
 #userDlgShadow {
-        z-index : 3;
-        position : absolute;
-        left : 30%;
-        top : 30%;
-        display : none;
-        background-image : url("images/shadow.png");
+	z-index : 3;
+	position : absolute;
+	left : 30%;
+	top : 30%;
+	display : none;
+	background-image : url("images/shadow.png");
 }
 
 #userDlg {
-        padding : 15px;
-        border : 1px solid #88b0f0;
-        font-size : small;
-        position : relative;
-        bottom : 2px;
-        right : 2px;
-        background-color : #ecf4ff;
+	padding : 15px;
+	border : 1px solid #88b0f0;
+	font-size : small;
+	position : relative;
+	bottom : 2px;
+	right : 2px;
+	background-color : #ecf4ff;
 }
 
-#qafInput {
-        width : 300px;
+#infoBoxTitle {
+	border-width : 1px 1px 1px 1px;
+		  border-style : solid;
+		  border-color : #88b0f0;
+		  background-color : #88b0f0;
+		  padding : 2px;
+		  color : white;
 }
 
-
 #infoBox {	
-        border : 1px solid #88b0f0;
-        padding-bottom : 10px;
-        font-size : small;
-        position : relative;
-        bottom : 2px;
-        right : 2px;
-        background-color : #ecf4ff;
+	border-width : 1px 1px 1px 1px;
+		  border-style : solid;
+		  border-color : #88b0f0;
+	font-size : small;
+	position : relative;
+	bottom : 2px;
+	right : 2px;
+	background-color : #ecf4ff;
+		  padding-bottom : 5px;
 }
 
 #infoBoxShadow {
-        background-image : url("images/shadow.png");
-        position : absolute;
-        width : 30%;
-        left : 35%;
-        top : 30%;
-        z-index : 3;
-        display : none;
+	background-image : url("images/shadow.png");
+	position : absolute;
+	left : 35%;
+	top : 30%;
+		  width : 30%;
+	z-index : 3;
+	display : none;
 }
 
 div.infoBoxContents {
-        padding : 5px;
-        margin-bottom : 5px;
+	padding : 5px;
+	margin-bottom : 5px;
 }
 
 div.infoBoxContents td {
-        font-size : small;
+	font-size : small;
 }
 
 div.helpResponse h1, div.infoBoxContents h1 {
 /*        border-width : 0px 0px 1px 0px;
-        border-style : solid;
-        border-color : #c0c0c0; */
-        font-size : 16pt;
+	border-style : solid;
+	border-color : #c0c0c0; */
+	font-size : 16pt;
 }
 
 div.helpResponse h2, div.infoBoxContents h2 {
 /*        border-width : 0px 0px 0px 0px; */
-        font-size : 12pt;
+	font-size : 12pt;
 }
 
 /* pre {
-        border : 1px solid #c0c0c0;
-        padding : 5px;
-        background : #f0f0f0;
-        margin : 5px 10px 5px 10px;
+	border : 1px solid #c0c0c0;
+	padding : 5px;
+	background : #f0f0f0;
+	margin : 5px 10px 5px 10px;
 } */
 
 pre {
-        margin : 5px;
+	margin : 5px;
 }
 
 input.extSearch {
-        width : 200px;
+	width : 100%;
 }
 
 table.main td.prefsTabs {
-        padding-left : 5px;
+	padding-left : 5px;
 /*		  background-image : url("images/toolbar.png");
-        background-position : bottom left;
-        background-repeat : repeat-x; */
+	background-position : bottom left;
+	background-repeat : repeat-x; */
 }
 
 input.prefsTab {		
-        border-width : 1px 1px 0px 1px;
-        border-color : #88b0f0;
-        padding : 2px 7px 2px 7px;
-        margin : 0px 1px 0px 0px;
-        width : 130px;
-/*        background-image : url("images/vgrad_light_rev2.png");
-        background-position : top left;
-        background-repeat : repeat-x; */
-        -moz-border-radius : 7px 7px 0px 0px;
-        font-size : small;
-        background-color : white;
+
+	background-image : url("images/prefs_tab.png");
+	background-position : top left;
+	background-repeat : repeat-x;
+	border : 0px solid black;
+	padding : 2px 7px 2px 7px;
+	margin : 0px 1px 0px 0px;
+	width : 130px;
+	font-size : small;
+	background-color : white;
 }
 
 input.prefsTabSelected {
-        border-width : 1px 1px 0px 1px;
-        border-color : #c0c0c0; 
-        padding : 2px 7px 2px 7px;
-        margin : 0px 1px 0px 0px;
-        width : 130px;
-        background : #88b0f0;
-        font-weight : bold;
-        background-position : top left;
-        background-repeat : repeat-x;
-        -moz-border-radius : 7px 7px 0px 0px;
-        font-size : small;
-		  color : white;
+
+	background-image : url("images/active_tab.png");
+	background-position : top left;
+	background-repeat : repeat-x;
+	border : 0px solid black;
+	padding : 2px 7px 2px 7px;
+	margin : 0px 1px 0px 0px;
+	width : 130px;
+	font-weight : bold;
+	background-position : top left;
+	background-repeat : repeat-x;
+	font-size : small;
 }
 
 
 /*input.prefsTab:hover {
-        background : white;
+	background : white;
 }*/
 
 div.warning {
-        background : #fff7d5;
-        border : 1px solid #d7c47a;
-        padding : 3px;
-        margin : 5px;
-        font-size : x-small;
+	background : #fff7d5;
+	border : 1px solid #d7c47a;
+	padding : 3px;
+	margin : 5px;
+	font-size : x-small;
 }
 
 div.notice {
-        background : #ffffff;
-        border : 1px solid #88b0f0;
-        padding : 5px;
-        margin : 5px;
-        font-size : x-small;
+	background : #ffffff;
+	border : 1px solid #88b0f0;
+	padding : 5px;
+	margin : 5px;
+	font-size : x-small;
 }
 
 ul.nomarks {
-        list-style-type : none;
-        margin : 0px;
-        padding : 10px; 
+	list-style-type : none;
+	margin : 0px;
+	padding : 10px; 
 }
 
 div.bigErrorMsg {
-        border : 1px solid #c0c0c0;
-        background : #fff0f0;
-        padding : 30px;
-        margin : 20px;
+	border : 1px solid #c0c0c0;
+	background : #fff0f0;
+	padding : 30px;
+	margin : 20px;
 }
 
 div.prefHelp, td.prefHelp {
-        font-size : x-small;
-        color : gray;
-        padding : 5px;
+	font-size : x-small;
+	color : gray;
+	padding : 5px;
 }
 
 td.welcomePrompt {
-        font-size : x-small;
-        color : #4684ff;
-        text-align : right;
-        padding-right : 10px;
+	font-size : x-small;
+	color : #4684ff;
+	text-align : right;
+	padding-right : 10px;
 
 }
 
 td.httpWelcomePrompt {
-        font-size : small;
-        color : gray;
-        text-align : right;
+	font-size : small;
+	color : gray;
+	text-align : right;
 }
 
 table.loginForm {
-        background-color : #ecf4ff;
+	background-color : #ecf4ff;
 }
 
 table.innerLoginForm {
-        border : 1px solid #88b0f0;
-        padding : 50px;
-        background-color : white;
+	border : 1px solid #88b0f0;
+	padding : 50px;
+	background-color : white;
 }
 
 table.innerLoginForm td {
-        padding : 3px 3px 5px 3px;
+	padding : 3px 3px 5px 3px;
 }
 
 span.insensitive {
-        color : gray;
+	color : gray;
 }
 
 .prefGenericAddBox {
-        margin : 5px;
-        font-size : small;
+	margin : 5px;
+	font-size : small;
 }
 
 .prefGenericAddBox td {
-        font-size : small;
+	font-size : small;
 }
 
 body.logoutBody {
-        background-color : #f0f0f0;
-        color : black;
+	background-color : #f0f0f0;
+	color : black;
 }
 
 span.logoutWarning {
-        color : red;
-        font-weight : bold;
+	color : red;
+	font-weight : bold;
 }
 
 div.logoutContent {
-        width : 600px;
-        border : 1px solid #c0c0c0;
-        background-color : white;
-        margin-left : auto;
-        margin-right : auto;
-        margin-top : 20px;
-        padding : 10px;
+	width : 600px;
+	border : 1px solid #c0c0c0;
+	background-color : white;
+	margin-left : auto;
+	margin-right : auto;
+	margin-top : 20px;
+	padding : 10px;
 }
 
 .small {
-        font-size : x-small;
+	font-size : x-small;
 }
 
 table.innerFeedTable td {
-        margin : 0px;
-        padding : 0px;
+	margin : 0px;
+	padding : 0px;
 }
 
 td.selectPrompt {
-        font-size : x-small;
-        color : gray;
+	font-size : x-small;
+	color : gray;
 }
 
 table.headlinesSubToolbar td.headlineActions {
-        font-size : x-small;
-        color : gray;
-        padding : 5px 0px 5px 5px;
+	font-size : x-small;
+	color : gray;
+	padding : 5px 0px 5px 5px;
 }
 
 table.headlinesSubToolbar td.headlineActionsRTL {
-        font-size : x-small;
-        color : gray;
-        padding : 5px 5px 5px 0px;
+	font-size : x-small;
+	color : gray;
+	padding : 5px 5px 5px 0px;
 }
 
 table.headlinesSubToolbar td.headlineTitle {
-        font-size : x-small;
-        color : gray;
-        padding : 5px 5px 5px 0px;
-        text-align : right;
+	font-size : x-small;
+	color : gray;
+	padding : 5px 5px 5px 0px;
+	text-align : right;
 }
 
 table.headlinesSubToolbar td.headlineTitleRTL {
-        font-size : x-small;
-        color : gray;
-        padding : 5px 0px 5px 5px;
-        text-align : left;
+	font-size : x-small;
+	color : gray;
+	padding : 5px 0px 5px 5px;
+	text-align : left;
 }
 
 span.contentPreview {
-        font-size : x-small;
-        color : gray;
-        font-weight : normal;
+	font-size : x-small;
+	color : gray;
+	font-weight : normal;
 }
 
 span.contentPreview:hover {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 table.headlinesList td.hlMarkedPic {
-        width : 25px;
-        text-align : center;
+	width : 25px;
+	text-align : center;
 }
 
 table.headlinesList td.hlfeed {
-        text-align : right;
-        font-size : small;
+	text-align : right;
+	font-size : small;
 }
 
 td.hlSelectRow, td.hlUpdatePic {
-        width : 25px;
-        text-align : center;
+	width : 25px;
+	text-align : center;
 }
 
 table.headlinesList td.hlUpdated {
-        font-size : small;
-        color : gray;
-        text-align : right;
-        width : 100px;
+	font-size : small;
+	color : gray;
+	text-align : right;
+	width : 100px;
 }
 
 table.headlinesList tr td {
-        padding : 2px 0px 2px 0px;
+	padding : 2px 0px 2px 0px;
 }
 
 /*
 tr.even td.headlineContent, tr.evenUnread td.headlineContent {
-        display : block;
-        overflow : hidden;
-        height : 1em;   
-        background-color : #f0f0f0;
+	display : block;
+	overflow : hidden;
+	height : 1em;   
+	background-color : #f0f0f0;
 }
 
 tr.odd td.headlineContent, tr.oddUnread td.headlineContent {
-        display : block;
-        overflow : hidden;
-        height : 1em;
+	display : block;
+	overflow : hidden;
+	height : 1em;
 }
 
 tr.oddSelected td.headlineContent,
 tr.evenSelected td.headlineContent,
 tr.oddUnreadSelected td.headlineContent,
 tr.evenUnreadSelected td.headlineContent {
-        display : block;
-        overflow : hidden;
-        height : 1em;
-        background-color : #e0e0ff;
+	display : block;
+	overflow : hidden;
+	height : 1em;
+	background-color : #e0e0ff;
 } */
 
 div.postHeader td.postDate {
-        font-size : x-small;
-        text-align : right;
-        color : gray;
+	font-size : x-small;
+	text-align : right;
+	color : gray;
 }
 
 div.postHeader td.postDateRTL {
-        font-size : x-small;
-        text-align : left;
-        color : gray;
+	font-size : x-small;
+	text-align : left;
+	color : gray;
 }
 
 #feedUpdateErrors {
-        display : none;
+	display : none;
 }
 
 #allEntryTags {
-        font-size : x-small;
-        border-width : 0px 0px 1px 0px;
-        border-style : solid;
-        border-color : #c0c0c0;
-        padding-bottom : 5px;
-        display : none;
+	font-size : x-small;
+	border-width : 0px 0px 1px 0px;
+	border-style : solid;
+	border-color : #c0c0c0;
+	padding-bottom : 5px;
+	display : none;
 }
 
 /*td.hlContent {
-        overflow : hidden;
-        height : 1em;
-        display : block;
+	overflow : hidden;
+	height : 1em;
+	display : block;
 } */
 
 td.hlMarkedPic, td.hlSelectRow, td.hlUpdated, td.hlFeed {
-        height : 1em;
+	height : 1em;
 }
 
 div.cdmArticle {
-        border : 1px solid #f0f0f0;
-        background-color : #fafafa;
-        -moz-border-radius : 5px;
-        margin : 10px 10px 0px 10px;
-        padding : 10px;
+	border : 1px solid #f0f0f0;
+	background-color : #fafafa;
+	-moz-border-radius : 5px;
+	margin : 10px 10px 0px 10px;
+	padding : 10px;
 }
 
 div.cdmArticleUnread {
-        border : 1px solid #d5f1f4;
-        background-color : #fafeff;
-        -moz-border-radius : 5px;
-        margin : 10px 10px 0px 10px;
-        padding : 10px;
+	border : 1px solid #d5f1f4;
+	background-color : #fafeff;
+	-moz-border-radius : 5px;
+	margin : 10px 10px 0px 10px;
+	padding : 10px;
 }
 
 div.cdmArticleSelected, div.cdmArticleUnreadSelected {
-          -moz-border-radius : 5px;
-        margin : 10px 10px 0px 10px;
-        padding : 10px;
-        background-color : #fff7d5;
+	  -moz-border-radius : 5px;
+	margin : 10px 10px 0px 10px;
+	padding : 10px;
+	background-color : #fff7d5;
 		  border : 1px solid #e7d796;
 }
 
 div.cdmArticleUnread div.cdmHeader a.title, 
 div.cdmArticleUnreadSelected div.cdmHeader a.title {
-        font-weight : bold;
+	font-weight : bold;
 }
 
 div.cdmHeader {
-        padding-bottom : 5px;
+	padding-bottom : 5px;
 }
 
 div.cdmFooter {
-        font-size : x-small;
-        color : gray;
-        padding-top : 5px;
+	font-size : x-small;
+	color : gray;
+	padding-top : 5px;
 }
 
 div.cdmFooter input, div.cdmHeader input, div.cdmFooter img {
-        margin : 0px;
+	margin : 0px;
 }
 
 div.cdmHeader, div.cdmHeader a {
-        color : gray;
-        font-size : x-small;
+	color : gray;
+	font-size : x-small;
 }
 
 div.cdmHeader a:hover {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 div.cdmContent {
-        margin-bottom : 5px;
+	margin-bottom : 5px;
 }
 
 a.warning {
-        color : #f04040;
+	color : #f04040;
 }
 
 img.closeButton {
-        border-width : 0px;
-        float : right;
+	border-width : 0px;
+	float : right;
 }
 
 span.groupPrompt {
-        font-size : x-small;
-        color : #4684ff;
+	font-size : x-small;
+	color : #4684ff;
 }
 
 ul.userFeedList {
-        height : 300px;
-        overflow : auto;
-        list-style-type : none;
+	height : 300px;
+	overflow : auto;
+	list-style-type : none;
 		  border : 1px solid #88b0f0;
-        background-color : white;
-        margin : 0px 0px 5px 0px;
-        padding : 0px;
+	background-color : white;
+	margin : 0px 0px 5px 0px;
+	padding : 0px;
 }
 
 /* #browseBigFeedList li.oddSelected {
-        border : 1px solid #d0d0f6;
-        background-color : #eaeaff;
-        -moz-border-radius : 5px;
+	border : 1px solid #d0d0f6;
+	background-color : #eaeaff;
+	-moz-border-radius : 5px;
 } */
 
 ul.browseFeedList {
-        height : 300px;
-        overflow : auto;
-        list-style-type : none;
-        margin : 0px 0px 5px 0px;
-        padding : 0px;
-		  border : 1px solid #88b0f0;
-		  background-color : white;
+	height : 300px;
+	overflow : auto;
+	list-style-type : none;
+	margin : 0px 0px 5px 0px;
+	padding : 0px;
+	border : 1px solid #88b0f0;
+	background-color : white;
 }
 
 ul.browseFeedList li {
-        margin : 0px;
-        padding : 0px;
+	margin : 0px;
+	padding : 0px;
 }
 
 span.subscribers {
-        color : #808080;
+	color : #808080;
 }
 
 div.subscribers {
-        color : #808080;
-        font-size : x-small;
-        float : right;
+	color : #808080;
+	font-size : x-small;
+	float : right;
 }
 
 input.feedBrowseCB {
-        margin-right : 1em;
+	margin-right : 1em;
 }
 
 div.browserDetails {
-        margin : 5px 5px 5px 5px;
-        display : none;
-        padding : 5px;
+	margin : 5px 5px 5px 5px;
+	display : none;
+	padding : 5px;
 }
 
 ul.compact {
-        list-style-type : none;
-        margin : 0px;
-        padding : 0px;
+	list-style-type : none;
+	margin : 0px;
+	padding : 0px;
 }
 
 ul.compact li {
-        margin : 0px;
-        padding : 0px;
+	margin : 0px;
+	padding : 0px;
 }
 
 div.browserFeedInfo {
-        font-size : x-small;
-		  border : 1px solid #88b0f0;
-		  background-color : #ecf4ff;
-		  -moz-border-radius : 5px;
-		  padding : 10px;
+	font-size : x-small;
+	border : 1px solid #88b0f0;
+	background-color : #ecf4ff;
+	-moz-border-radius : 5px;
+	padding : 10px;
 }
 
 div.browserFeedInfo div.detailsPart {
-        margin : 5px 0px 5px 5px;       
+	margin : 5px 0px 5px 5px;       
 }
 
 div.cdmContent a {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 div.cdmContent a:hover {
-        color : black;
+	color : black;
 }
 
 a.cdmToggleLink {
-        color : #808080;
-        font-size : x-small;
+	color : #808080;
+	font-size : x-small;
 }
 
 a.cdmToggleLink:hover {
-        color : #4684ff;
+	color : #4684ff;
 }
 
 .noborder {
-        border-width : 0px;
+	border-width : 0px;
 }
 
 #debug_output {
-        width : 400;
-        height : 200;
-        right : 20;
-        bottom : 20;
-        background-color : white;
-        display : none;
-        z-index : 999;
-        position : absolute;
-        border : 1px solid #c0c0c0;
-        overflow : auto;
-        margin : 0px;
-        padding : 0px;
-        list-style-type : none;
+	width : 400;
+	height : 200;
+	right : 20;
+	bottom : 20;
+	background-color : white;
+	display : none;
+	z-index : 999;
+	position : absolute;
+	border : 1px solid #c0c0c0;
+	overflow : auto;
+	margin : 0px;
+	padding : 0px;
+	list-style-type : none;
 }
 
 #debug_output li {
-        margin : 0px;
-        padding : 0px;
-        font-size : x-small;
+	margin : 0px;
+	padding : 0px;
+	font-size : x-small;
 }
 
 #overlay {
-        background : white;
-        left : 0;
-        top : 0;
-        height : 100%;
-        width : 100%;
-        z-index : 100;
-        position : absolute;
+	background : white;
+	left : 0;
+	top : 0;
+	height : 100%;
+	width : 100%;
+	z-index : 100;
+	position : absolute;
 }
 
 #overlay_inner {
-        font-weight : bold;
-        text-align : center;
-        margin : 10px;
+	font-weight : bold;
+	text-align : center;
+	margin : 10px;
 }
 
 #fatal_error {
-        background : white;
-        left : 0;
-        top : 0;
-        height : 100%;
-        width : 100%;
-        z-index : 200;
-        display : none;
-        position : absolute;
+	background : white;
+	left : 0;
+	top : 0;
+	height : 100%;
+	width : 100%;
+	z-index : 200;
+	display : none;
+	position : absolute;
 }
 
 #fatal_error_inner {
-        font-weight : bold;
-        margin : 10px;
-        color : red;
+	font-weight : bold;
+	margin : 10px;
+	color : red;
 }
 
 #fatal_error_msg {
-        border : 1px solid #c0c0c0;
-        background-color : #f0f0f0;
-        color : black;
-        padding : 10px;
-        font-weight : normal;
+	border : 1px solid #c0c0c0;
+	background-color : #f0f0f0;
+	color : black;
+	padding : 10px;
+	font-weight : normal;
 }
 
-div.noDaemonWarning {
-        position : absolute;
-		  background-color : #ecf4ff;		  
-		  border : 1px solid #88b0f0;
-		  padding : 10px;
-		  margin : 5px;
-		  z-index : 2;
+div.noDaemonWarning {	
+	position : absolute;
+	background-color : #ecf4ff;		  
+	border : 1px solid #88b0f0;
+	padding : 10px;
+	margin : 5px;
+	z-index : 2;
+}
+
+#qafInput {
+	width : 100%;
 }
diff --git a/tt-rss.php b/tt-rss.php
index ef8f6c45a..bf8d23adc 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -228,7 +228,7 @@ window.onload = init;
 				<option id="qmcSearch">Search</option>
 				<option disabled>--------</option>
 				<option style="color : #5050aa" disabled>Feed actions:</option>
-				<option id="qmcAddFeed">&nbsp;&nbsp;Add new feed</option>
+				<option id="qmcAddFeed">&nbsp;&nbsp;Subscribe to feed</option>
 				<option id="qmcRemoveFeed">&nbsp;&nbsp;Remove this feed</option>
 				<!-- <option>Edit this feed</option> -->
 				<option disabled>--------</option>