From 6906f145918586c2f2c453d83857f2442df9b94a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 22 Jan 2009 17:30:37 +0100 Subject: [PATCH] pref-feeds: rework external subscription notice --- modules/pref-feeds.php | 28 ++++++++++++++--------- prefs.js | 4 ++++ quicksub.css | 51 ------------------------------------------ 3 files changed, 21 insertions(+), 62 deletions(-) delete mode 100644 quicksub.css diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index aae7ab45..bc8171c6 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -848,14 +848,13 @@ if ($p_from != 'tt-rss') { print " - Tiny Tiny RSS - Subscribe to feed... - + Tiny Tiny RSS + - $\"Tiny$ -

Subscribe to feed...

"; +

Subscribe to feed...

"; } if (subscribe_to_feed($link, $feed_url, $cat_id, $auth_login, $auth_pass)) { @@ -870,21 +869,28 @@ $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]); - print "

Return to Tiny Tiny RSS |"; - $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]); $feed_id = db_fetch_result($result, 0, "id"); + print "

"; + if ($feed_id) { - print " - Edit subscription options | "; + print "

"; } - print "Close this window.

"; + print "

"; - print "

"; + print ""; return; } diff --git a/prefs.js b/prefs.js index 33b53c38..38dde466 100644 --- a/prefs.js +++ b/prefs.js @@ -1364,6 +1364,10 @@ function init_second_stage() { caller_subop = getURLParam('subop'); + if (getURLParam("subopparam")) { + caller_subop = caller_subop + ":" + getURLParam("subopparam"); + } + if (tab) { active_tab = tab; } diff --git a/quicksub.css b/quicksub.css deleted file mode 100644 index 7b85211b..00000000 --- a/quicksub.css +++ /dev/null @@ -1,51 +0,0 @@ -body { - margin : 1em; -} - -h1 { - font-size : 14pt; - font-weight : bold; -} - -a { - color : #4684ff; - text-decoration : none; -} - -a:hover { - color : black; -} - -img.logo { - float : right; -} - -div.content { - padding : 1em; - /* border : 1px solid #88b0ff; */ -} - -div.notice { - background : #ffffff; - border : 1px solid #88b0f0; - width : 50%; - padding : 5px; - margin : 0px 0px 5px 0px; - font-size : 9pt; -} - -div.warning { - background : #fff7d5; - border : 1px solid #d7c47a; - font-size : 9pt; - width : 50%; - padding : 5px; - margin : 0px 0px 5px 0px; -} - - -div.warning img, div.notice img { - vertical-align : middle; - padding : 5px; -} - -- 2.39.2