diff options
| author | Andrew Dolgov <[email protected]> | 2007-05-14 06:41:04 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2007-05-14 06:41:04 +0100 |
| commit | 442d77f1ccd670c0fde1db0038d3388e64f885e6 (patch) | |
| tree | da60127dad7caff8b6a2f8791e30ce060d5ff875 /modules | |
| parent | 144f32d94100151ed1c0d4e22422a04d8e6068bc (diff) | |
help uses popup window, recolor infoBox, use subscribe dialog in prefs
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/help.php | 14 | ||||
| -rw-r--r-- | modules/popup-dialog.php | 3 | ||||
| -rw-r--r-- | modules/pref-feeds.php | 13 |
3 files changed, 14 insertions, 16 deletions
diff --git a/modules/help.php b/modules/help.php index 751d6082e..3f6968db7 100644 --- a/modules/help.php +++ b/modules/help.php @@ -4,30 +4,22 @@ if (!$_GET["noheaders"]) { print "<html><head> <title>Tiny Tiny RSS : Help</title> - <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\"> - <script type=\"text/javascript\" src=\"prototype.js\"></script> - <script type=\"text/javascript\" src=\"functions.js?$script_dt_add\"></script> + <link rel=\"stylesheet\" href=\"utility.css\" type=\"text/css\"> <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"> </head><body>"; } $tid = sprintf("%d", $_GET["tid"]); - print "<div id=\"infoBoxTitle\">".__('Help')."</div>"; - - print "<div class='infoBoxContents'>"; - if (file_exists("help/$tid.php")) { include("help/$tid.php"); } else { print "<p>".__("Help topic not found.")."</p>"; } - - print "</div>"; - print "<div align='center'> <input type='submit' class='button' - onclick=\"closeInfoBox()\" value=\"".__('Close this window')."\"></div>"; + onclick=\"javascript:window.close()\" + value=\"".__('Close this window')."\"></div>"; if (!$_GET["noheaders"]) { print "</body></html>"; diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index 7eab1bae7..56ba9f19c 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -47,8 +47,9 @@ print "<form id='feed_add_form' onsubmit='return false'>"; print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">"; - print "<input type=\"hidden\" name=\"quiet\" value=\"1\">"; + print "<input type=\"hidden\" name=\"quiet\" value=\"0\">"; print "<input type=\"hidden\" name=\"subop\" value=\"add\">"; + print "<input type=\"hidden\" name=\"from\" value=\"tt-rss\">"; print "<table width='100%'> <tr><td>Feed URL:</td><td> diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 78a2cff27..dbd610714 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -479,6 +479,7 @@ print "</div></body></html>"; return; } + } } @@ -589,8 +590,6 @@ } } - set_pref($link, "_PREFS_ACTIVE_TAB", "feedConfig"); - print "<div class=\"prefGenericAddBox\"> <input id=\"fadd_cat\" onkeypress=\"return filterCR(event, addFeedCat)\" @@ -732,6 +731,8 @@ if ($quiet) return; + set_pref($link, "_PREFS_ACTIVE_TAB", "feedConfig"); + $result = db_query($link, "SELECT COUNT(id) AS num_errors FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]); @@ -758,13 +759,17 @@ onclick=\"javascript:updateFeedList()\" value=\"".__('Search')."\"> </div>"; - print "<input id=\"fadd_link\" +/* print "<input id=\"fadd_link\" onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\" onchange=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\" size=\"40\"> <input type=\"submit\" class=\"button\" disabled=\"true\" id=\"fadd_submit_btn\" - onclick=\"addFeed()\" value=\"".__('Subscribe')."\">"; + onclick=\"addFeed()\" value=\"".__('Subscribe')."\">"; */ + + print "<input onclick=\"javascript:displayDlg('quickAddFeed')\" + type=\"submit\" id=\"fadd_subscribe_btn\" + class=\"button\" value=\"".__('Subscribe to feed')."\">"; if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { print " <input type=\"submit\" class=\"button\" |