From 2d1282d4d1c246d2ba123b4aed5d97e97c1f8504 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 6 Feb 2013 20:14:06 +0400 Subject: [PATCH] remove top hello - feedback - preferences line --- config.php-dist | 4 -- index.php | 32 +++++++------- js/functions.js | 4 ++ js/tt-rss.js | 108 +++++++++++++++++++----------------------------- js/viewfeed.js | 4 +- tt-rss.css | 11 +---- 6 files changed, 69 insertions(+), 94 deletions(-) diff --git a/config.php-dist b/config.php-dist index aaee2f2e..b1f238ca 100644 --- a/config.php-dist +++ b/config.php-dist @@ -181,10 +181,6 @@ // Users may enable other user plugins from Preferences/Plugins but may not // disable plugins specified in this list. - define('FEEDBACK_URL', ''); - // Displays an URL for users to provide feedback or comments regarding - // this instance of tt-rss. Can lead to a forum, contact email, etc. - define('CONFIG_VERSION', 26); // Expected config version. Please update this option in config.php // if necessary (after migrating all new options from this file). diff --git a/index.php b/index.php index 6ddf5de6..5f902d51 100644 --- a/index.php +++ b/index.php @@ -117,20 +117,6 @@ title="" src=""/> - - | - - - - - | - - - - - | - -
+ + + + + +
+
@@ -220,6 +221,9 @@
+ +
+
diff --git a/js/functions.js b/js/functions.js index ec533faa..cef47f8e 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 9d18519b..2e09c86c 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 34235eba..1cdfdba3 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -211,7 +211,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) { ""); } 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("
" + __('Could not display article (invalid object received - see error console for details)') + "
"); } else { - Element.show("net-alert"); + Element.show(dijit.byId("net-alert").domNode); } request_counters(); diff --git a/tt-rss.css b/tt-rss.css index b636140d..5c504248 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -1079,10 +1079,10 @@ div.fatalError textarea { #content-wrap { padding : 0px; - border-width : 1px 0px 1px 1px; + border-width : 0px 0px 1px 1px; border-style : solid; border-color : #c0c0c0; - margin : 25px 0px 0px 0px; + margin : 0px; } #feeds-holder { @@ -1235,13 +1235,6 @@ a.bookmarklet { padding : 2px; } -#newVersionIcon { - margin-left : 5px; - vertical-align : middle; - position : relative; - top : -1px; -} - .player { display : inline-block; color : gray; -- 2.39.5