]> git.wh0rd.org - tt-rss.git/blobdiff - classes/dlg.php
remove dialogNotice; tweak dialog appearance a bit
[tt-rss.git] / classes / dlg.php
index 008518a8aa5c0f528a76ca7e644724d9f72f1f67..e03489505a8bab301ad8af2f73c37196d1a6e1e7 100644 (file)
@@ -5,7 +5,7 @@ class Dlg extends Handler_Protected {
        function before($method) {
                if (parent::before($method)) {
                        header("Content-Type: text/xml; charset=utf-8");
-                       $this->param = db_escape_string($_REQUEST["param"]);
+                       $this->param = db_escape_string($this->link, $_REQUEST["param"]);
                        print "<dlg>";
                        return true;
                }
@@ -16,24 +16,6 @@ class Dlg extends Handler_Protected {
                print "</dlg>";
        }
 
-       function exportData() {
-
-               print "<p style='text-align : center' id='export_status_message'>You need to prepare exported data first by clicking the button below.</p>";
-
-               print "<div align='center'>";
-               print "<button dojoType=\"dijit.form.Button\"
-                       onclick=\"dijit.byId('dataExportDlg').prepare()\">".
-                       __('Prepare data')."</button>";
-
-               print "<button dojoType=\"dijit.form.Button\"
-                       onclick=\"dijit.byId('dataExportDlg').hide()\">".
-                       __('Close this window')."</button>";
-
-               print "</div>";
-
-
-       }
-
        function importOpml() {
                header("Content-Type: text/html"); # required for iframe
 
@@ -50,6 +32,8 @@ class Dlg extends Handler_Protected {
 
                $opml->opml_import($_SESSION["uid"]);
 
+               db_query($this->link, "COMMIT");
+
                print "</ul>";
                print "</div>";
 
@@ -184,7 +168,7 @@ class Dlg extends Handler_Protected {
                print "<title>".__('Public OPML URL')."</title>";
                print "<content><![CDATA[";
 
-               $url_path = opml_publish_url($this->link);
+               $url_path = Opml::opml_publish_url($this->link);
 
                print __("Your Public OPML URL is:");
 
@@ -247,16 +231,15 @@ class Dlg extends Handler_Protected {
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"addfeed\">";
 
-               print "<div class=\"dlgSec\">".__("Feed")."</div>";
+               print "<div class=\"dlgSec\">".__("Feed or site URL")."</div>";
                print "<div class=\"dlgSecCont\">";
 
                print "<div style='float : right'>
                        <img style='display : none'
-                               id='feed_add_spinner' src='".
-                               theme_image($this->link, 'images/indicator_white.gif')."'></div>";
+                               id='feed_add_spinner' src='images/indicator_white.gif'></div>";
 
                print "<input style=\"font-size : 16px; width : 20em;\"
-                       placeHolder=\"".__("Feed URL")."\"
+                       placeHolder=\"".__("Feed or site URL")."\"
                        dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"feed\" id=\"feedDlg_feedUrl\">";
 
                print "<hr/>";
@@ -291,8 +274,7 @@ class Dlg extends Handler_Protected {
                                " <input
                                        placeHolder=\"".__("Password")."\"
                                        dojoType=\"dijit.form.TextBox\" type='password'
-                                       style=\"width : 10em;\" name='pass'\">".
-                               " <p class='insensitive'>".__("OAuth will be used automatically for Twitter feeds.")."</p>
+                                       style=\"width : 10em;\" name='pass'\">
                        </div></div>";
 
 
@@ -305,16 +287,22 @@ class Dlg extends Handler_Protected {
                print "</form>";
 
                print "<div class=\"dlgButtons\">
-                       <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedAddDlg').execute()\">".__('Subscribe')."</button>
-                       <button dojoType=\"dijit.form.Button\" onclick=\"return feedBrowser()\">".__('More feeds')."</button>
-                       <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedAddDlg').hide()\">".__('Cancel')."</button>
+                       <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedAddDlg').execute()\">".__('Subscribe')."</button>";
+
+               if (!(defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER)) {
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"return feedBrowser()\">".__('More feeds')."</button>";
+               }
+
+               print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedAddDlg').hide()\">".__('Cancel')."</button>
                        </div>";
 
                //return;
        }
 
        function feedBrowser() {
-               $browser_search = db_escape_string($_REQUEST["search"]);
+               if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
+
+               $browser_search = db_escape_string($this->link, $_REQUEST["search"]);
 
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"updateFeedBrowser\">";
@@ -322,8 +310,7 @@ class Dlg extends Handler_Protected {
                print "<div dojoType=\"dijit.Toolbar\">
                        <div style='float : right'>
                        <img style='display : none'
-                               id='feed_browser_spinner' src='".
-                               theme_image($this->link, 'images/indicator_white.gif')."'>
+                               id='feed_browser_spinner' src='images/indicator_white.gif'>
                        <input name=\"search\" dojoType=\"dijit.form.TextBox\" size=\"20\" type=\"search\"
                                onchange=\"dijit.byId('feedBrowserDlg').update()\" value=\"$browser_search\">
                        <button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedBrowserDlg').update()\">".__('Search')."</button>
@@ -349,6 +336,8 @@ class Dlg extends Handler_Protected {
 
                $owner_uid = $_SESSION["uid"];
 
+               require_once "feedbrowser.php";
+
                print "<ul class='browseFeedList' id='browseFeedList'>";
                print make_feed_browser($this->link, $search, 25);
                print "</ul>";
@@ -361,7 +350,7 @@ class Dlg extends Handler_Protected {
        }
 
        function search() {
-               $this->params = explode(":", db_escape_string($_REQUEST["param"]), 2);
+               $this->params = explode(":", db_escape_string($this->link, $_REQUEST["param"]), 2);
 
                $active_feed_id = sprintf("%d", $this->params[0]);
                $is_cat = $this->params[1] != "false";
@@ -370,27 +359,9 @@ class Dlg extends Handler_Protected {
 
                print "<div class=\"dlgSecCont\">";
 
-               if (!SPHINX_ENABLED) {
-
-                       print "<input dojoType=\"dijit.form.ValidationTextBox\"
-                               style=\"font-size : 16px; width : 12em;\"
-                               required=\"1\" name=\"query\" type=\"search\" value=''>";
-
-                       print " " . __('match on')." ";
-
-                       $search_fields = array(
-                               "title" => __("Title"),
-                                       "content" => __("Content"),
-                               "both" => __("Title or content"));
-
-                       print_select_hash("match_on", 3, $search_fields,
-                               'dojoType="dijit.form.Select"');
-               } else {
-                       print "<input dojoType=\"dijit.form.ValidationTextBox\"
-                               style=\"font-size : 16px; width : 20em;\"
-                               required=\"1\" name=\"query\" type=\"search\" value=''>";
-               }
-
+               print "<input dojoType=\"dijit.form.ValidationTextBox\"
+                       style=\"font-size : 16px; width : 20em;\"
+                       required=\"1\" name=\"query\" type=\"search\" value=''>";
 
                print "<hr/>".__('Limit search to:')." ";
 
@@ -429,7 +400,7 @@ class Dlg extends Handler_Protected {
 
                if (!SPHINX_ENABLED) {
                        print "<div style=\"float : left\">
-                               <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/redmine/wiki/tt-rss/SearchSyntax\">Search syntax</a>
+                               <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/wiki/SearchSyntax\">Search syntax</a>
                                </div>";
                }
 
@@ -438,285 +409,6 @@ class Dlg extends Handler_Protected {
                </div>";
        }
 
-       function quickAddFilter() {
-               $active_feed_id = db_escape_string($_REQUEST["param"]);
-
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-filters\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"quiet\" value=\"1\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"add\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"csrf_token\" value=\"".$_SESSION['csrf_token']."\">";
-
-               $result = db_query($this->link, "SELECT id,description
-                       FROM ttrss_filter_types ORDER BY description");
-
-               $filter_types = array();
-
-               while ($line = db_fetch_assoc($result)) {
-                       //array_push($filter_types, $line["description"]);
-                       $filter_types[$line["id"]] = __($line["description"]);
-               }
-
-               print "<div class=\"dlgSec\">".__("Match")."</div>";
-
-               print "<div class=\"dlgSecCont\">";
-
-               print "<span id=\"filterDlg_dateModBox\" style=\"display : none\">";
-
-               $filter_params = array(
-                       "before" => __("before"),
-                       "after" => __("after"));
-
-               print_select_hash("filter_date_modifier", "before",
-                       $filter_params, 'dojoType="dijit.form.Select"');
-
-               print "&nbsp;</span>";
-
-               print "<input dojoType=\"dijit.form.ValidationTextBox\"
-                        required=\"true\" id=\"filterDlg_regExp\"
-                        style=\"font-size : 16px\"
-                        name=\"reg_exp\" value=\"$reg_exp\"/>";
-
-               print "<span id=\"filterDlg_dateChkBox\" style=\"display : none\">";
-               print "&nbsp;<button dojoType=\"dijit.form.Button\"
-                       onclick=\"return filterDlgCheckDate()\">".
-                       __('Check it')."</button>";
-               print "</span>";
-
-               print "<hr/>" .  __("on field") . " ";
-               print_select_hash("filter_type", 1, $filter_types,
-                       'onchange="filterDlgCheckType(this)" dojoType="dijit.form.Select"');
-
-               print "<hr/>";
-
-               print __("in") . " ";
-
-               print "<span id='filterDlg_feeds'>";
-               print_feed_select($this->link, "feed_id", $active_feed_id,
-                       'dojoType="dijit.form.FilteringSelect"');
-               print "</span>";
-
-               print "<span id='filterDlg_cats' style='display : none'>";
-               print_feed_cat_select($this->link, "cat_id", $active_cat_id,
-                       'dojoType="dijit.form.FilteringSelect"');
-               print "</span>";
-
-               print "</div>";
-
-               print "<div class=\"dlgSec\">".__("Perform Action")."</div>";
-
-               print "<div class=\"dlgSecCont\">";
-
-               print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
-                       onchange=\"filterDlgCheckAction(this)\">";
-
-               $result = db_query($this->link, "SELECT id,description FROM ttrss_filter_actions
-                       ORDER BY name");
-
-               while ($line = db_fetch_assoc($result)) {
-                       printf("<option value='%d'>%s</option>", $line["id"], __($line["description"]));
-               }
-
-               print "</select>";
-
-               print "<span id=\"filterDlg_paramBox\" style=\"display : none\">";
-               print " " . __("with parameters:") . " ";
-               print "<input dojoType=\"dijit.form.TextBox\"
-                       id=\"filterDlg_actionParam\"
-                       name=\"action_param\">";
-
-               print_label_select($this->link, "action_param_label", $action_param,
-                'id="filterDlg_actionParamLabel" dojoType="dijit.form.Select"');
-
-               print "</span>";
-
-               print "&nbsp;"; // tiny layout hack
-
-               print "</div>";
-
-               print "<div class=\"dlgSec\">".__("Options")."</div>";
-               print "<div class=\"dlgSecCont\">";
-
-               print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
-                               <label for=\"enabled\">".__('Enabled')."</label><hr/>";
-
-               print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\">
-                       <label for=\"inverse\">".__('Inverse match')."</label><hr/>";
-
-               print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"cat_filter\" id=\"cat_filter\" onchange=\"filterDlgCheckCat(this)\">
-                               <label for=\"cat_filter\">".__('Apply to category')."</label><hr/>";
-
-
-               print "</div>";
-
-               print "<div class=\"dlgButtons\">";
-
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">".
-                       __('Test')."</button> ";
-
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
-                       __('Create')."</button> ";
-
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">".
-                       __('Cancel')."</button>";
-
-               print "</div>";
-       }
-
-       function inactiveFeeds() {
-
-               if (DB_TYPE == "pgsql") {
-                       $interval_qpart = "NOW() - INTERVAL '3 months'";
-               } else {
-                       $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
-               }
-
-               $result = db_query($this->link, "SELECT ttrss_feeds.title, ttrss_feeds.site_url,
-                               ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article
-                       FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE
-                               (SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
-                                       ttrss_entries.id = ref_id AND
-                                               ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart
-                       AND ttrss_feeds.owner_uid = ".$_SESSION["uid"]." AND
-                               ttrss_user_entries.feed_id = ttrss_feeds.id AND
-                               ttrss_entries.id = ref_id
-                       GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url
-                       ORDER BY last_article");
-
-               print "<div class=\"dialogNotice\">" . __("These feeds have not been updated with new content for 3 months (oldest first):") . "</div>";
-
-               print "<div dojoType=\"dijit.Toolbar\">";
-               print "<div dojoType=\"dijit.form.DropDownButton\">".
-                               "<span>" . __('Select')."</span>";
-               print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-               print "<div onclick=\"selectTableRows('prefInactiveFeedList', 'all')\"
-                       dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-               print "<div onclick=\"selectTableRows('prefInactiveFeedList', 'none')\"
-                       dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-               print "</div></div>";
-               print "</div>"; #toolbar
-
-               print "<div class=\"inactiveFeedHolder\">";
-
-               print "<table width=\"100%\" cellspacing=\"0\" id=\"prefInactiveFeedList\">";
-
-               $lnum = 1;
-
-               while ($line = db_fetch_assoc($result)) {
-
-                       $class = ($lnum % 2) ? "even" : "odd";
-                       $feed_id = $line["id"];
-                       $this_row_id = "id=\"FUPDD-$feed_id\"";
-
-                       # class needed for selectTableRows()
-                       print "<tr class=\"placeholder\" $this_row_id>";
-
-                       $edit_title = htmlspecialchars($line["title"]);
-
-                       # id needed for selectTableRows()
-                       print "<td width='5%' align='center'><input
-                               onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
-                               type=\"checkbox\" id=\"FUPDC-$feed_id\"></td>";
-                       print "<td>";
-
-                       print "<a class=\"visibleLink\" href=\"#\" ".
-                               "title=\"".__("Click to edit feed")."\" ".
-                               "onclick=\"editFeed(".$line["id"].")\">".
-                               htmlspecialchars($line["title"])."</a>";
-
-                       print "</td><td class=\"insensitive\" align='right'>";
-                       print make_local_datetime($this->link, $line['last_article'], false);
-                       print "</td>";
-                       print "</tr>";
-
-                       ++$lnum;
-               }
-
-               print "</table>";
-               print "</div>";
-
-               print "<div class='dlgButtons'>";
-               print "<div style='float : left'>";
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
-                       .__('Unsubscribe from selected feeds')."</button> ";
-               print "</div>";
-
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').hide()\">".
-                       __('Close this window')."</button>";
-
-               print "</div>";
-
-       }
-
-       function feedsWithErrors() {
-               print "<div class=\"dialogNotice\">" . __("These feeds have not been updated because of errors:") . "</div>";
-
-               $result = db_query($this->link, "SELECT id,title,feed_url,last_error,site_url
-               FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
-
-               print "<div dojoType=\"dijit.Toolbar\">";
-               print "<div dojoType=\"dijit.form.DropDownButton\">".
-                               "<span>" . __('Select')."</span>";
-               print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-               print "<div onclick=\"selectTableRows('prefErrorFeedList', 'all')\"
-                       dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-               print "<div onclick=\"selectTableRows('prefErrorFeedList', 'none')\"
-                       dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-               print "</div></div>";
-               print "</div>"; #toolbar
-
-               print "<div class=\"inactiveFeedHolder\">";
-
-               print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">";
-
-               $lnum = 1;
-
-               while ($line = db_fetch_assoc($result)) {
-
-                       $class = ($lnum % 2) ? "even" : "odd";
-                       $feed_id = $line["id"];
-                       $this_row_id = "id=\"FUPDD-$feed_id\"";
-
-                       # class needed for selectTableRows()
-                       print "<tr class=\"placeholder\" $this_row_id>";
-
-                       $edit_title = htmlspecialchars($line["title"]);
-
-                       # id needed for selectTableRows()
-                       print "<td width='5%' align='center'><input
-                               onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
-                               type=\"checkbox\" id=\"FUPDC-$feed_id\"></td>";
-                       print "<td>";
-
-                       print "<a class=\"visibleLink\" href=\"#\" ".
-                               "title=\"".__("Click to edit feed")."\" ".
-                               "onclick=\"editFeed(".$line["id"].")\">".
-                               htmlspecialchars($line["title"])."</a>: ";
-
-                       print "<span class=\"insensitive\">";
-                       print htmlspecialchars($line["last_error"]);
-                       print "</span>";
-
-                       print "</td>";
-                       print "</tr>";
-
-                       ++$lnum;
-               }
-
-               print "</table>";
-               print "</div>";
-
-               print "<div class='dlgButtons'>";
-               print "<div style='float : left'>";
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
-                       .__('Unsubscribe from selected feeds')."</button> ";
-               print "</div>";
-
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">".
-                       __('Close this window')."</button>";
-
-               print "</div>";
-       }
-
        function editArticleTags() {
 
                print __("Tags for this article (separated by commas):")."<br>";
@@ -823,9 +515,11 @@ class Dlg extends Handler_Protected {
                print "<content><![CDATA[";
 
                print __("Match:"). "&nbsp;" .
-                         "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" checked value=\"any\" name=\"tag_mode\">&nbsp;Any&nbsp;";
-               print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" value=\"all\" name=\"tag_mode\">&nbsp;All&nbsp;";
-               print "&nbsp;tags.";
+                       "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" checked value=\"any\" name=\"tag_mode\" id=\"tag_mode_any\">";
+               print "<label for=\"tag_mode_any\">".__("Any")."</label>";
+               print "&nbsp;";
+               print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" value=\"all\" name=\"tag_mode\" id=\"tag_mode_all\">";
+               print "<label for=\"tag_mode_all\">".__("All tags.")."</input>";
 
                print "<select id=\"all_tags\" name=\"all_tags\" title=\"" . __('Which Tags?') . "\" multiple=\"multiple\" size=\"10\" style=\"width : 100%\">";
                $result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
@@ -856,14 +550,14 @@ class Dlg extends Handler_Protected {
                print "<content><![CDATA[";
 
                $this->params = explode(":", $this->param, 3);
-               $feed_id = db_escape_string($this->params[0]);
+               $feed_id = db_escape_string($this->link, $this->params[0]);
                $is_cat = (bool) $this->params[1];
 
                $key = get_feed_access_key($this->link, $feed_id, $is_cat);
 
                $url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
 
-               print "<div class=\"dialogNotice\">" .  __("You can view this feed as RSS using the following URL:") . "</div>";
+               print "<h2>".__("You can view this feed as RSS using the following URL:")."</h2>";
 
                print "<div class=\"tagCloudContainer\">";
                print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
@@ -889,24 +583,42 @@ class Dlg extends Handler_Protected {
                $version = $version_data['version'];
                $id = $version_data['version_id'];
 
-               print "<div class='tagCloudContainer'>";
+               if ($version && $id) {
+                       print "<div class='tagCloudContainer'>";
 
-               print T_sprintf("New version of Tiny Tiny RSS is available (%s).",
-                       "<b>$version</b>");
+                       print T_sprintf("New version of Tiny Tiny RSS is available (%s).",
+                               "<b>$version</b>");
 
-               print "</div>";
+                       print "</div>";
 
-               $details = "http://tt-rss.org/redmine/versions/show/$id";
-               $download = "http://tt-rss.org/#Download";
+                       $details = "http://tt-rss.org/redmine/versions/$id";
+                       $download = "http://tt-rss.org/#Download";
 
-               print "<div style='text-align : center'>";
-               print "<button dojoType=\"dijit.form.Button\"
-                       onclick=\"return window.open('$details')\">".__("Details")."</button>";
-               print "<button dojoType=\"dijit.form.Button\"
-                       onclick=\"return window.open('$download')\">".__("Download")."</button>";
-               print "<button dojoType=\"dijit.form.Button\"
-                       onclick=\"return dijit.byId('newVersionDlg').hide()\">".
-                       __('Close this window')."</button>";
+                       print "<p align='center'>".__("You can update using built-in updater in the Preferences or by using update.php")."</p>";
+
+                       print "<div style='text-align : center'>";
+                       print "<button dojoType=\"dijit.form.Button\"
+                               onclick=\"return window.open('$details')\">".__("See the release notes")."</button>";
+                       print "<button dojoType=\"dijit.form.Button\"
+                               onclick=\"return window.open('$download')\">".__("Download")."</button>";
+                       print "<button dojoType=\"dijit.form.Button\"
+                               onclick=\"return dijit.byId('newVersionDlg').hide()\">".
+                               __('Close this window')."</button>";
+
+               } else {
+                       print "<div class='tagCloudContainer'>";
+
+                       print "<p align='center'>".__("Error receiving version information or no new version available.")."</p>";
+
+                       print "</div>";
+
+                       print "<div style='text-align : center'>";
+                       print "<button dojoType=\"dijit.form.Button\"
+                               onclick=\"return dijit.byId('newVersionDlg').hide()\">".
+                               __('Close this window')."</button>";
+                       print "</div>";
+
+               }
                print "</div>";
 
        }
@@ -916,9 +628,7 @@ class Dlg extends Handler_Protected {
 
                $value = str_replace("<br/>", "\n", $value);
 
-               print "<div class=\"dialogNotice\">";
-               print T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline.", "tt-rss.css");
-               print "</div>";
+               print_notice(T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline.", "tt-rss.css"));
 
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"setpref\">";
@@ -990,29 +700,6 @@ class Dlg extends Handler_Protected {
                return;
        }
 
-       function dataImport() {
-               header("Content-Type: text/html"); # required for iframe
-
-               print "<div style='text-align : center'>";
-
-               if (is_file($_FILES['export_file']['tmp_name'])) {
-
-                       perform_data_import($this->link, $_FILES['export_file']['tmp_name'], $_SESSION['uid']);
-
-               } else {
-                       print "<p>" . T_sprintf("Could not upload file. You might need to adjust upload_max_filesize
-                               in PHP.ini (current value = %s)", ini_get("upload_max_filesize")) . " or use CLI import tool.</p>";
-
-               }
-
-               print "<button dojoType=\"dijit.form.Button\"
-                       onclick=\"dijit.byId('dataImportDlg').hide()\">".
-                       __('Close this window')."</button>";
-
-               print "</div>";
-
-       }
-
        function batchSubscribe() {
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"batchaddfeeds\">";
@@ -1041,8 +728,7 @@ class Dlg extends Handler_Protected {
                                        placeHolder=\"".__("Password")."\"
                                        dojoType=\"dijit.form.TextBox\" type='password'
                                        style=\"width : 10em;\" name='pass'\">".
-                               " <p class='insensitive'>".__("OAuth will be used automatically for Twitter feeds.")."</p>
-                               </div>";
+                               "</div>";
 
                print "</td></tr><tr><td colspan='2'>";