From: Andrew Dolgov <fox@bah.spb.su>
Date: Fri, 25 Nov 2005 15:38:08 +0000 (+0100)
Subject: cleaned up unread/selected style mess
X-Git-Tag: schema_feature_freeze_for_1.1~90
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4f3a84f4d336a6d9bb1172873a063ff8a8b390ec;p=tt-rss.git

cleaned up unread/selected style mess
---

diff --git a/backend.php b/backend.php
index aa0c271a..977f3fd8 100644
--- a/backend.php
+++ b/backend.php
@@ -592,7 +592,7 @@
 			print "</div>";
 
 			print "<script type=\"text/javascript\">
-				update_label_counters('$feed_id');
+				update_all_counters('$feed_id');
 			</script>";
 		}
 
@@ -954,7 +954,7 @@
 		
 		print "<script type=\"text/javascript\">
 			document.onkeydown = hotkey_handler;
-			update_label_counters('$feed');
+			update_all_counters('$feed');
 		</script>";
 
 		if ($addheader) {
@@ -1389,9 +1389,9 @@
 				if (get_pref($link, 'ENABLE_PREFS_CATCHUP_UNCATCHUP')) {
 					print "
 					<input type=\"submit\" class=\"button\" 
-						onclick=\"javascript:readSelectedFeeds()\" value=\"Mark as read\">
+						onclick=\"javascript:readSelectedFeeds(true)\" value=\"Mark as read\">
 					<input type=\"submit\" class=\"button\" 
-						onclick=\"javascript:unreadSelectedFeeds()\" 
+						onclick=\"javascript:readSelectedFeeds(false)\" 
 						value=\"Mark as unread\">&nbsp;";
 				}
 				
diff --git a/feedlist.js b/feedlist.js
index 13312563..e8d79c6b 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -84,7 +84,7 @@ function viewfeed(feed, skip, subop, doc) {
 	cleanSelectedList("feedList");
 
 	var feedr = document.getElementById("FEEDR-" + feed);
-	if (feedr) {
+	if (feedr) {	
 		feedr.className = feedr.className + "Selected";
 	} 
 	
diff --git a/functions.js b/functions.js
index c03e623f..83246bfd 100644
--- a/functions.js
+++ b/functions.js
@@ -328,11 +328,11 @@ if (!xmlhttp_rpc && typeof XMLHttpRequest!='undefined') {
 	xmlhttp_rpc = new XMLHttpRequest();
 }
 
-function label_counters_callback() {
+function all_counters_callback() {
 	if (xmlhttp_rpc.readyState == 4) {
 
 		if (!xmlhttp_rpc.responseXML) {
-			notify("label_counters_callback: backend did not return valid XML");
+			notify("[all_counters_callback] backend did not return valid XML");
 			return;
 		}
 
@@ -355,7 +355,17 @@ function label_counters_callback() {
 				if (ctr > 0) {
 					feedctr.className = "odd";
 					if (!feedr.className.match("Unread")) {
+						var is_selected = feedr.className.match("Selected");
+
+						feedr.className = feedr.className.replace("Selected", "");
+						feedr.className = feedr.className.replace("Unread", "");
+
 						feedr.className = feedr.className + "Unread";
+
+						if (is_selected) {
+							feedr.className = feedr.className + "Selected";
+						}
+
 					}
 				} else {
 					feedctr.className = "invisible";
@@ -366,7 +376,7 @@ function label_counters_callback() {
 	}
 }
 
-function update_label_counters(feed) {
+function update_all_counters(feed) {
 	if (xmlhttp_ready(xmlhttp_rpc)) {
 		var query = "backend.php?op=rpc&subop=getAllCounters";
 
@@ -375,7 +385,7 @@ function update_label_counters(feed) {
 		}
 
 		xmlhttp_rpc.open("GET", query, true);
-		xmlhttp_rpc.onreadystatechange=label_counters_callback;
+		xmlhttp_rpc.onreadystatechange=all_counters_callback;
 		xmlhttp_rpc.send(null);
 	}
 }
diff --git a/prefs.js b/prefs.js
index c000ca19..04dd88c7 100644
--- a/prefs.js
+++ b/prefs.js
@@ -448,7 +448,7 @@ function getSelectedFeedCats() {
 }
 
 
-function readSelectedFeeds() {
+function readSelectedFeeds(read) {
 
 	if (!xmlhttp_ready(xmlhttp)) {
 		printLockingError();
@@ -459,34 +459,15 @@ function readSelectedFeeds() {
 
 	if (sel_rows.length > 0) {
 
-		notify("Marking selected feeds as read...");
-
-		xmlhttp.open("GET", "backend.php?op=pref-rpc&subop=unread&ids="+
-			param_escape(sel_rows.toString()), true);
-		xmlhttp.onreadystatechange=notify_callback;
-		xmlhttp.send(null);
-
-	} else {
-
-		notify("Please select some feeds first.");
-
-	}
-}
-
-function unreadSelectedFeeds() {
-
-	if (!xmlhttp_ready(xmlhttp)) {
-		printLockingError();
-		return
-	}
-
-	var sel_rows = getSelectedFeeds();
-
-	if (sel_rows.length > 0) {
+		if (!read) {
+			op = "unread";
+		} else {
+			op = "read";
+		}
 
-		notify("Marking selected feeds as unread...");
+		notify("Marking selected feeds as " + op + "...");
 
-		xmlhttp.open("GET", "backend.php?op=pref-rpc&subop=unread&ids="+
+		xmlhttp.open("GET", "backend.php?op=pref-rpc&subop=" + op + "&ids="+
 			param_escape(sel_rows.toString()), true);
 		xmlhttp.onreadystatechange=notify_callback;
 		xmlhttp.send(null);
diff --git a/tt-rss.css b/tt-rss.css
index d32a3908..1d92d0b5 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -163,6 +163,7 @@ ul.feedList li {
 	margin : 0px;
 }
 
+/*
 li.oddSelected, li.evenSelected {
 	background-color : white;
 }
@@ -200,6 +201,24 @@ ul.feedlist
 	li.virtUnreadSelected a,
 	li.virtSelectedUnread a {
 	color : #5050aa;
+} */
+
+ul.feedlist li.feedSelected a,
+ul.feedlist li.labelSelected a,
+ul.feedlist li.virtSelected a {
+	color : #5050aa;
+}
+
+ul.feedlist li.feedUnreadSelected a,
+ul.feedlist li.labelUnreadSelected a,
+ul.feedlist li.virtUnreadSelected a {
+	color : #5050aa;
+}
+
+ul.feedlist li.feedUnreadSelected ,
+ul.feedlist li.labelUnreadSelected,
+ul.feedlist li.virtUnreadSelected{
+	font-weight : bold;
 }
 
 ul.feedList li.feed {
@@ -346,12 +365,12 @@ a.button {
 	font-size : small;
 }
 
-.evenUnreadSelected, .evenSelectedUnread, {
+.evenUnreadSelected, .evenSelectedUnread {
 	background-color : #e0e0ff;
 	font-weight : bold;
 }
 
-.oddUnreadSelected, .oddSelectedUnread, .feedSelectedUnread,  {
+.oddUnreadSelected, .oddSelectedUnread  {
 	background-color : #e0e0ff;
 	font-weight : bold;
 }
@@ -364,12 +383,13 @@ a.button {
 	background-color : #e0e0ff;
 } 
 
+/*
 .feedUnreadSelected, .feedSelectedUnread, 
 .virtUnreadSelected, .virtSelectedUnread,
 .labelUnreadSelected, .labelSelectedUnread {
 	background-color : #e0e0ff;
 	font-weight : bold;
-}
+} */
 
 .feedUnread, .labelUnread, .virtUnread {
 	font-weight : bold;