valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pref-feeds: rework external subscription notice

This commit is contained in:
Andrew Dolgov 2009-01-22 17:30:37 +01:00
parent 9e97b64e48
commit 6906f14591
3 changed files with 21 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/pref-feeds.php
View File

@ -848,14 +848,13 @@
if ($p_from != 'tt-rss') { if ($p_from != 'tt-rss') {
print "<html> print "<html>
<head> <head>
<title>Tiny Tiny RSS - Subscribe to feed...</title> <title>Tiny Tiny RSS</title>
<link rel=\"stylesheet\" type=\"text/css\" href=\"quicksub.css\"> <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
</head> </head>
<body> <body>
<img class=\"logo\" src=\"images/ttrss_logo.png\" <img class=\"floatingLogo\" src=\"images/ttrss_logo.png\"
alt=\"Tiny Tiny RSS\"/> alt=\"Tiny Tiny RSS\"/>
<h1>Subscribe to feed...</h1> <h1>Subscribe to feed...</h1>";
<div class=\"content\">";
} }
if (subscribe_to_feed($link, $feed_url, $cat_id, $auth_login, $auth_pass)) { 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"]); $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 $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]); feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
$feed_id = db_fetch_result($result, 0, "id"); $feed_id = db_fetch_result($result, 0, "id");
print "<p>";
if ($feed_id) { if ($feed_id) {
print "<a href='$tp_uri?tab=feedConfig&subop=editFeed:$feed_id'> print "<form method=\"GET\" style='display: inline'
Edit subscription options</a> | "; 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; return;
} }

4
prefs.js
View File

@ -1364,6 +1364,10 @@ function init_second_stage() {
caller_subop = getURLParam('subop'); caller_subop = getURLParam('subop');
if (getURLParam("subopparam")) {
caller_subop = caller_subop + ":" + getURLParam("subopparam");
}
if (tab) { if (tab) {
active_tab = tab; active_tab = tab;
} }

51
quicksub.css
View File

@ -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;
}