From 442d77f1ccd670c0fde1db0038d3388e64f885e6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 14 May 2007 06:41:04 +0100 Subject: [PATCH] help uses popup window, recolor infoBox, use subscribe dialog in prefs --- functions.js | 16 +++++++++++++++ modules/help.php | 14 +++----------- modules/popup-dialog.php | 3 ++- modules/pref-feeds.php | 13 +++++++++---- prefs.js | 42 ++++++++++++++++++++++++++++++++++++---- tt-rss.css | 39 ++++++++++++++++++++++++++----------- tt-rss.js | 11 ++++++++--- utility.css | 15 ++++++++++++++ 8 files changed, 119 insertions(+), 34 deletions(-) diff --git a/functions.js b/functions.js index 1f031f14..21a0da79 100644 --- a/functions.js +++ b/functions.js @@ -1389,6 +1389,22 @@ function infobox_callback() { } } +function helpbox_callback() { + if (xmlhttp.readyState == 4) { + var box = document.getElementById('helpBox'); + var shadow = document.getElementById('helpBoxShadow'); + if (box) { + box.innerHTML=xmlhttp.responseText; + if (shadow) { + shadow.style.display = "block"; + } else { + box.style.display = "block"; + } + } + notify(""); + } +} + function addFilter() { if (!xmlhttp_ready(xmlhttp)) { diff --git a/modules/help.php b/modules/help.php index 751d6082..3f6968db 100644 --- a/modules/help.php +++ b/modules/help.php @@ -4,30 +4,22 @@ if (!$_GET["noheaders"]) { print " Tiny Tiny RSS : Help - - - + "; } $tid = sprintf("%d", $_GET["tid"]); - print "
".__('Help')."
"; - - print "
"; - if (file_exists("help/$tid.php")) { include("help/$tid.php"); } else { print "

".__("Help topic not found.")."

"; } - - print "
"; - print "
"; + onclick=\"javascript:window.close()\" + value=\"".__('Close this window')."\">"; if (!$_GET["noheaders"]) { print ""; diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index 7eab1bae..56ba9f19 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -47,8 +47,9 @@ print "
"; print ""; - print ""; + print ""; print ""; + print ""; print "
Feed URL: diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 78a2cff2..dbd61071 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -479,6 +479,7 @@ print ""; return; } + } } @@ -589,8 +590,6 @@ } } - set_pref($link, "_PREFS_ACTIVE_TAB", "feedConfig"); - print "
"; - print " "; + onclick=\"addFeed()\" value=\"".__('Subscribe')."\">"; */ + + print ""; if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { print "