diff options
| -rw-r--r-- | modules/pref-feeds.php | 28 | ||||
| -rw-r--r-- | prefs.js | 4 | ||||
| -rw-r--r-- | quicksub.css | 51 |
3 files changed, 21 insertions, 62 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index aae7ab453..bc8171c6d 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -848,14 +848,13 @@ if ($p_from != 'tt-rss') { print "<html> <head> - <title>Tiny Tiny RSS - Subscribe to feed...</title> - <link rel=\"stylesheet\" type=\"text/css\" href=\"quicksub.css\"> + <title>Tiny Tiny RSS</title> + <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\"> </head> <body> - <img class=\"logo\" src=\"images/ttrss_logo.png\" + <img class=\"floatingLogo\" src=\"images/ttrss_logo.png\" alt=\"Tiny Tiny RSS\"/> - <h1>Subscribe to feed...</h1> - <div class=\"content\">"; + <h1>Subscribe to feed...</h1>"; } 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 "<p><a href='$tt_uri'>Return to Tiny Tiny RSS</a> |"; - $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 "<p>"; + if ($feed_id) { - print "<a href='$tp_uri?tab=feedConfig&subop=editFeed:$feed_id'> - Edit subscription options</a> | "; + print "<form method=\"GET\" style='display: inline' + action=\"$tp_uri\"> + <input type=\"hidden\" name=\"tab\" value=\"feedConfig\"> + <input type=\"hidden\" name=\"subop\" value=\"editFeed\"> + <input type=\"hidden\" name=\"subopparam\" value=\"$feed_id\"> + <input type=\"submit\" value=\"".__("Edit subscription options")."\"> + </form>"; } - print "<a href='javascript:window.close()'>Close this window</a>.</p>"; + print "<form style='display: inline' method=\"GET\" action=\"$tt_uri\"> + <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> + </form></p>"; - print "</div></body></html>"; + print "</body></html>"; return; } @@ -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 7b85211b7..000000000 --- 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; -} - |