js: misc fixes, code cleanup

5 files changed, 12 insertions, 24 deletions

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index cf2d46cea..9ec575376 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -80,8 +80,8 @@
 				WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
 			print	__('Select:')." 
-				<a href=\"#\" onclick=\"selectPrefRows('fcat', true)\">".__('All')."</a>,
-				<a href=\"#\" onclick=\"selectPrefRows('fcat', false)\">".__('None')."</a>";
+				<a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'all')\">".__('All')."</a>,
+				<a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'none')\">".__('None')."</a>";
 
 			print "<div class=\"prefFeedCatHolder\">";
 
@@ -343,10 +343,6 @@
 
 			$owner_uid = $_SESSION["uid"];
 
-/*			print	__('Select:')." 
-				<a href=\"javascript:selectPrefRows('fbrowse', true)\">".__('All')."</a>,
-					<a href=\"javascript:selectPrefRows('fbrowse', false)\">".__('None')."</a>"; */
-
 			print "<ul class='browseFeedList' id='browseFeedList'>";
 			print_feed_browser($link, $search, 25);
 			print "</ul>";
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index e557903ea..4d7975056 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -993,8 +993,8 @@
 			if (db_num_rows($result) != 0) {
 
 				print	__('Select:')." 
-					<a href=\"#\" onclick=\"selectPrefRows('fcat', true)\">".__('All')."</a>,
-					<a href=\"#\" onclick=\"selectPrefRows('fcat', false)\">".__('None')."</a>";
+					<a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'all')\">".__('All')."</a>,
+					<a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'none')\">".__('None')."</a>";
 
 				print "<div class=\"prefFeedCatHolder\">";
 
@@ -1199,8 +1199,8 @@
 				$show_last_article_checked><label 
 					for='show_last_article_times'>".__('Show last article times')."</label></div>".
 				__('Select:')."
-					<a href=\"#\" onclick=\"selectPrefRows('feed', true)\">".__('All')."</a>,
-					<a href=\"#\" onclick=\"selectPrefRows('feed', false)\">".__('None')."</a>
+					<a href=\"#\" onclick=\"selectTableRows('prefFeedList', 'all')\">".__('All')."</a>,
+					<a href=\"#\" onclick=\"selectTableRows('prefFeedList', 'none')\">".__('None')."</a>
 				</td</tr>";
 
 			if (!get_pref($link, 'ENABLE_FEED_CATS')) {
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 0d3026374..d11d0eb7e 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -376,8 +376,8 @@
 
 			print "<tr><td class=\"selectPrompt\" colspan=\"8\">
 				".__('Select:')." 
-					<a href=\"#\" onclick=\"selectPrefRows('filter', true)\">".__('All')."</a>,
-					<a href=\"#\" onclick=\"selectPrefRows('filter', false)\">".__('None')."</a>
+					<a href=\"#\" onclick=\"selectTableRows('prefFilterList', 'all')\">".__('All')."</a>,
+					<a href=\"#\" onclick=\"selectTableRows('prefFilterList', 'none')\">".__('None')."</a>
 				</td</tr>";
 
 			$lnum = 0;
diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index d7a300843..ac25d01e1 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -199,8 +199,6 @@
 				owner_uid = ".$_SESSION["uid"]."
 			ORDER BY $sort");
 
-//		print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
-
 		if (db_num_rows($result) != 0) {
 
 			print "<p><table width=\"100%\" cellspacing=\"0\" 
@@ -208,16 +206,10 @@
 
 			print "<tr><td class=\"selectPrompt\" colspan=\"8\">
 				".__('Select:')." 
-					<a href=\"#\" onclick=\"selectPrefRows('label', true)\">".__('All')."</a>,
-					<a href=\"#\" onclick=\"selectPrefRows('label', false)\">".__('None')."</a>
+					<a href=\"#\" onclick=\"selectTableRows('prefLabelList', 'all')\">".__('All')."</a>,
+					<a href=\"#\" onclick=\"selectTableRows('prefLabelList', 'none')\">".__('None')."</a>
 				</td</tr>";
 
-/*			print "<tr class=\"title\">
-						<td width=\"5%\">&nbsp;</td>
-						<td width=\"95%\"><a href=\"javascript:updateLabelList('caption')\">".__('Caption')."</a></td>
-						</td>
-						</tr>"; */
-			
 			$lnum = 0;
 			
 			while ($line = db_fetch_assoc($result)) {
diff --git a/modules/pref-users.php b/modules/pref-users.php
index dcca9a936..bed5d45ed 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -417,8 +417,8 @@
 
 		print "<tr><td class=\"selectPrompt\" colspan=\"8\">
 				".__('Select:')." 
-					<a href=\"#\" onclick=\"selectPrefRows('user', true)\">".__('All')."</a>,
-					<a href=\"#\" onclick=\"selectPrefRows('user', false)\">".__('None')."</a>
+					<a href=\"#\" onclick=\"selectTableRows('prefUserList', 'all')\">".__('All')."</a>,
+					<a href=\"#\" onclick=\"selectTableRows('prefUserList', 'none')\">".__('None')."</a>
 				</td</tr>";
 
 		print "<tr class=\"title\">