From 2d1282d4d1c246d2ba123b4aed5d97e97c1f8504 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 6 Feb 2013 20:14:06 +0400
Subject: remove top hello - feedback - preferences line

---
 js/functions.js |   4 +++
 js/tt-rss.js    | 108 ++++++++++++++++++++++----------------------------------
 js/viewfeed.js  |   4 +--
 3 files changed, 49 insertions(+), 67 deletions(-)

(limited to 'js')

diff --git a/js/functions.js b/js/functions.js
index ec533faae..cef47f8e4 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -292,6 +292,10 @@ function gotoPreferences() {
 	document.location.href = "prefs.php";
 }
 
+function gotoLogout() {
+	document.location.href = "backend.php?op=logout";
+}
+
 function gotoMain() {
 	document.location.href = "index.php";
 }
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 9d18519b2..2e09c86cd 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -335,42 +335,35 @@ function init_second_stage() {
 
 function quickMenuGo(opid) {
 	try {
-		if (opid == "qmcPrefs") {
+		switch (opid) {
+		case "qmcPrefs":
 			gotoPreferences();
-		}
-
-		if (opid == "qmcTagCloud") {
+			break;
+		case "qmcLogout":
+			gotoLogout();
+			break;
+		case "qmcTagCloud":
 			displayDlg("printTagCloud");
-		}
-
-		if (opid == "qmcTagSelect") {
+			break;
+		case "qmcTagSelect":
 			displayDlg("printTagSelect");
-		}
-
-		if (opid == "qmcSearch") {
+			break;
+		case "qmcSearch":
 			search();
-			return;
-		}
-
-		if (opid == "qmcAddFeed") {
+			break;
+		case "qmcAddFeed":
 			quickAddFeed();
-			return;
-		}
-
-		if (opid == "qmcDigest") {
+			break;
+		case "qmcDigest":
 			window.location.href = "backend.php?op=digest";
-			return;
-		}
-
-		if (opid == "qmcEditFeed") {
+			break;
+		case "qmcEditFeed":
 			if (activeFeedIsCat())
 				alert(__("You can't edit this kind of feed."));
 			else
 				editFeed(getActiveFeedId());
-			return;
-		}
-
-		if (opid == "qmcRemoveFeed") {
+			break;
+		case "qmcRemoveFeed":
 			var actid = getActiveFeedId();
 
 			if (activeFeedIsCat()) {
@@ -390,46 +383,34 @@ function quickMenuGo(opid) {
 			if (confirm(pr)) {
 				unsubscribeFeed(actid);
 			}
-
-			return;
-		}
-
-		if (opid == "qmcCatchupAll") {
+			break;
+		case "qmcCatchupAll":
 			catchupAllFeeds();
-			return;
-		}
-
-		if (opid == "qmcShowOnlyUnread") {
+			break;
+		case "qmcShowOnlyUnread":
 			toggleDispRead();
-			return;
-		}
-
-		if (opid == "qmcAddFilter") {
+			break;
+		case "qmcAddFilter":
 			quickAddFilter();
-			return;
-		}
-
-		if (opid == "qmcAddLabel") {
+			break;
+		case "qmcAddLabel":
 			addLabel();
-			return;
-		}
-
-		if (opid == "qmcRescoreFeed") {
+			break;
+		case "qmcRescoreFeed":
 			rescoreCurrentFeed();
-			return;
-		}
-
-		if (opid == "qmcToggleWidescreen") {
+			break;
+		case "qmcToggleWidescreen":
 			if (!isCdmMode()) {
 				_widescreen_mode = !_widescreen_mode;
 
 				switchPanelMode(_widescreen_mode);
 			}
-			return;
-		}
-
-		if (opid == "qmcHKhelp") {
+			break;
+		case "qmcHKhelp":
 			helpDialog("main");
+			break;
+		default:
+			console.log("quickMenuGo: unknown action: " + opid);
 		}
 
 	} catch (e) {
@@ -469,13 +450,10 @@ function parse_runtime_info(data) {
 //		console.log("RI: " + k + " => " + v);
 
 		if (k == "new_version_available") {
-			var icon = $("newVersionIcon");
-			if (icon) {
-				if (v == "1") {
-					icon.style.display = "inline";
-				} else {
-					icon.style.display = "none";
-				}
+			if (v == "1") {
+				Element.show(dijit.byId("newVersionIcon").domNode);
+			} else {
+				Element.hide(dijit.byId("newVersionIcon").domNode);
 			}
 			return;
 		}
@@ -908,15 +886,15 @@ function handle_rpc_json(transport, scheduled_call) {
 
 			hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
-			Element.hide("net-alert");
+			Element.hide(dijit.byId("net-alert").domNode);
 
 		} else {
 			//notify_error("Error communicating with server.");
-			Element.show("net-alert");
+			Element.show(dijit.byId("net-alert").domNode);
 		}
 
 	} catch (e) {
-		Element.show("net-alert");
+		Element.show(dijit.byId("net-alert").domNode);
 		//notify_error("Error communicating with server.");
 		console.log(e);
 		//exception_error("handle_rpc_json", e, transport);
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 34235eba2..1cdfdba3f 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -211,7 +211,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 					"</div>");
 		} else {
 			//notify_error("Error communicating with server.");
-			Element.show("net-alert");
+			Element.show(dijit.byId("net-alert").domNode);
 		}
 
 		_infscroll_request_sent = 0;
@@ -322,7 +322,7 @@ function article_callback2(transport, id) {
 			render_article("<div class='whiteBox'>" +
 					__('Could not display article (invalid object received - see error console for details)') + "</div>");
 		} else {
-			Element.show("net-alert");
+			Element.show(dijit.byId("net-alert").domNode);
 		}
 
 		request_counters();
-- 
cgit v1.2.3