From f88c78147edb6449f291f47273b2e78ed528a1ab Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Tue, 12 Jan 2010 14:44:41 +0300
Subject: [PATCH] code cleanup; initial button usage

---
 functions.js             |  9 ---------
 modules/help.php         |  5 ++---
 modules/popup-dialog.php | 35 ++++++-----------------------------
 modules/pref-feeds.php   |  9 +++------
 prefs.php                |  7 ++++---
 tt-rss.js                |  4 ++--
 tt-rss.php               | 21 ++++++++-------------
 7 files changed, 25 insertions(+), 65 deletions(-)

diff --git a/functions.js b/functions.js
index 8335f7e6..1e167c94 100644
--- a/functions.js
+++ b/functions.js
@@ -2068,20 +2068,11 @@ function updateFeedBrowser() {
 				var c = $("browseFeedList");
 				var r = transport.responseXML.getElementsByTagName("content")[0];
 				var nr = transport.responseXML.getElementsByTagName("num-results")[0];
-				var sb = $("feed_browser_subscribe");
 
 				if (c && r) {
 					c.innerHTML = r.firstChild.nodeValue;
 				}
 	
-				if (nr && sb) {
-					if (nr.getAttribute("value") > 0) {
-						sb.disabled = false;
-					} else {
-						sb.disabled = true;
-					}
-				}
-
 			} });
 
 	} catch (e) {
diff --git a/modules/help.php b/modules/help.php
index 64ec087b..716a756d 100644
--- a/modules/help.php
+++ b/modules/help.php
@@ -17,9 +17,8 @@
 			print "<p>".__("Help topic not found.")."</p>";
 		}
 		print "<div align='center'>
-			<input type='submit' class='button'			
-			onclick=\"javascript:window.close()\" 
-			value=\"".__('Close this window')."\"></div>";
+			<button onclick=\"javascript:window.close()\">".
+			__('Close this window')."</button></div>";
 
 		if (!$_REQUEST["noheaders"]) { 
 			print "</body></html>";
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 00efdcb7..12c912ea 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -72,11 +72,9 @@
 
 			print __("URL:") . " ";
 
-			print "<input size=\"40\" onblur=\"javascript:enableHotkeys()\" 
+			print "<input size=\"40\"
 					onkeypress=\"return filterCR(event, subscribeToFeed)\"
-					onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
-					onchange=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
-					onfocus=\"javascript:disableHotkeys()\" name=\"feed_url\"></td></tr>";
+					name=\"feed_url\"></td></tr>";
 
 			print "<br/>";
 
@@ -87,31 +85,15 @@
 
 			print "</div>";
 
-
-/*			print "<tr><td colspan='2'><div class='insensitive'>";
-
-			print __("Some feeds require authentication. If you subscribe to such
-				feed, you will have to enter your login and password in Feed Editor");
-
-			print "</div></td></tr>"; */
-
-/*			print "<div id='fadd_login_prompt'><br/>
-				<a href='javascript:appearBlockElement(\"fadd_login_container\", 
-				\"fadd_login_prompt\")'>".__('Click here if this feed requires authentication.')."</a></div>"; */
-
 			print "<div id='fadd_login_container' style='display:none'>
 	
 					<div class=\"dlgSec\">".__("Authentication")."</div>
 					<div class=\"dlgSecCont\">".
 
 					__('Login:') . " <input name='auth_login' size=\"20\" 
-							onfocus=\"javascript:disableHotkeys()\" 
-							onfocus=\"javascript:disableHotkeys()\" 
 							onkeypress=\"return filterCR(event, subscribeToFeed)\"> ".
 					__('Password:') . "<input type='password'
 							name='auth_pass' size=\"20\" 
-							onfocus=\"javascript:disableHotkeys()\" 
-							onfocus=\"javascript:disableHotkeys()\" 
 							onkeypress=\"return filterCR(event, subscribeToFeed)\">
 				</div></div>";
 
@@ -125,15 +107,10 @@
 			print "</form>";
 
 			print "<div class=\"dlgButtons\">
-				<input class=\"button\"
-					id=\"fadd_submit_btn\" disabled=\"true\"
-					type=\"submit\" onclick=\"return subscribeToFeed()\" value=\"".__('Subscribe')."\">
-				<input class=\"button\"					
-					type=\"submit\" onclick=\"return browseFeeds()\" value=\"".__('More feeds')."\">
-
-				<input class=\"button\"
-					type=\"submit\" onclick=\"return closeInfoBox()\" 
-					value=\"".__('Cancel')."\"></div>";
+				<button class=\"button\" id=\"fadd_submit_btn\"
+					onclick=\"return subscribeToFeed()\">".__('Subscribe')."</button>
+				<button onclick=\"return browseFeeds()\">".__('More feeds')."</button>
+				<button onclick=\"return closeInfoBox()\">".__('Cancel')."</button></div>";
 			
 			return;
 		}
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 190d8905..f02ae6c4 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -121,15 +121,12 @@
 			$owner_uid = $_SESSION["uid"];
 
 			print "<ul class='browseFeedList' id='browseFeedList'>";
-			$subscribe_btn_disabled = print_feed_browser($link, $search, 25) == 0 ? "disabled" : "";
+			print_feed_browser($link, $search, 25);
 			print "</ul>";
 
 			print "<div align='center'>
-				<input type=\"submit\" class=\"button\" id=\"feed_browser_subscribe\"
-				$subscribe_btn_disabled
-				onclick=\"feedBrowserSubscribe()\" value=\"".__('Subscribe')."\">
-				<input type='submit' class='button'			
-				onclick=\"closeInfoBox()\" value=\"".__('Cancel')."\"></div>";
+				<button onclick=\"feedBrowserSubscribe()\">".__('Subscribe')."</button>
+				<button onclick=\"closeInfoBox()\" >".__('Cancel')."</button></div>";
 
 			print "</div>";
 			return;
diff --git a/prefs.php b/prefs.php
index d8118c4c..129e1cf8 100644
--- a/prefs.php
+++ b/prefs.php
@@ -139,9 +139,10 @@
 
 <div id="errorBoxShadow" style="display : none">
 	<div id="errorBox">
-		<div id="xebTitle">Fatal Exception</div><div id="xebContent">&nbsp;</div>
-		<div id="xebBtn" align='center'><input type="submit" 
-			onclick="closeErrorBox()" value="Close this window"/></div>
+	<div id="xebTitle"><?php echo __('Fatal Exception') ?></div><div id="xebContent">&nbsp;</div>
+		<div id="xebBtn" align='center'>
+			<button onclick="closeErrorBox()"><?php echo __('Close this window') ?></button>
+		</div>
 	</div>
 </div>
 
diff --git a/tt-rss.js b/tt-rss.js
index 04671c04..72ee01cc 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -919,7 +919,7 @@ function clearFeedArticles(feed_id) {
 
 function collapse_feedlist() {
 	try {
-		debug("toggle_feedlist");
+		debug("collapse_feedlist");
 		
 		var theme = getInitParam("theme");
 		if (theme != "" && theme != "compact" && theme != "graycube" &&
@@ -981,7 +981,7 @@ function collapse_feedlist() {
 
 		}
 	} catch (e) {
-		exception_error("toggle_feedlist", e);
+		exception_error("collapse_feedlist", e);
 	}
 }
 
diff --git a/tt-rss.php b/tt-rss.php
index 88ab1212..6e40333c 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -98,9 +98,10 @@
 
 <div id="errorBoxShadow" style="display : none">
 	<div id="errorBox">
-		<div id="xebTitle">Fatal Exception</div><div id="xebContent">&nbsp;</div>
-		<div id="xebBtn" align='center'><input type="submit" 
-			onclick="closeErrorBox()" value="Close this window"/></div>
+	<div id="xebTitle"><?php echo __('Fatal Exception') ?></div><div id="xebContent">&nbsp;</div>
+		<div id="xebBtn" align='center'>
+			<button onclick="closeErrorBox()"><?php echo __('Close this window') ?></button>
+		</div>
 	</div>
 </div>
 
@@ -206,10 +207,6 @@
 			id="collapse_feeds_btn" onclick="collapse_feedlist()" class="button"
 			title="<?php echo __('Collapse feedlist') ?>" style="display : none"/>
 
-		<input type="submit" value="<?php echo __("Toggle Feedlist") ?>" 
-			id="toggle_feeds_btn" class="button"
-			onclick="toggle_feedlist()" style="display : none"/>
-
 		&nbsp;
 
 		<select name="view_mode" title="<?php echo __('Show articles') ?>" 
@@ -234,13 +231,11 @@
 
 		&nbsp;
 
-		<input class="button" type="submit" name="update"
-			onclick="return viewCurrentFeed('ForceUpdate')" 
-			value="<?php echo __('Update') ?>"/>
+		<button onclick="return viewCurrentFeed('ForceUpdate')">
+			<?php echo __('Update') ?></button>
 
-		<input class="button" type="submit" name="update"
-			onclick="return catchupCurrentFeed()" 
-			value="<?php echo __('Mark as read') ?>"/>
+		<button onclick="return catchupCurrentFeed()">
+			<?php echo __('Mark as read') ?></button>
 
 		</form>
 
-- 
2.39.5