diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/dlg.php | 30 | ||||
-rw-r--r-- | classes/feeds.php | 4 | ||||
-rw-r--r-- | classes/pref/feeds.php | 4 |
3 files changed, 6 insertions, 32 deletions
diff --git a/classes/dlg.php b/classes/dlg.php index e03489505..d13a9ecb6 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -4,21 +4,15 @@ class Dlg extends Handler_Protected { function before($method) { if (parent::before($method)) { - header("Content-Type: text/xml; charset=utf-8"); + header("Content-Type: text/html"); # required for iframe + $this->param = db_escape_string($this->link, $_REQUEST["param"]); - print "<dlg>"; return true; } return false; } - function after() { - print "</dlg>"; - } - function importOpml() { - header("Content-Type: text/html"); # required for iframe - print __("If you have imported labels and/or filters, you might need to reload preferences to see your new data.") . "</p>"; print "<div class=\"prefFeedOPMLHolder\">"; @@ -165,9 +159,6 @@ class Dlg extends Handler_Protected { } function pubOPMLUrl() { - print "<title>".__('Public OPML URL')."</title>"; - print "<content><![CDATA["; - $url_path = Opml::opml_publish_url($this->link); print __("Your Public OPML URL is:"); @@ -185,15 +176,11 @@ class Dlg extends Handler_Protected { __('Close this window')."</button>"; print "</div>"; - print "]]></content>"; //return; } function explainError() { - print "<title>".__('Notice')."</title>"; - print "<content><![CDATA["; - print "<div class=\"errorExplained\">"; if ($this->param == 1) { @@ -222,7 +209,6 @@ class Dlg extends Handler_Protected { __('Close this window')."</button>"; print "</div>"; - print "]]></content>"; //return; } @@ -442,9 +428,6 @@ class Dlg extends Handler_Protected { } function printTagCloud() { - print "<title>".__('Tag Cloud')."</title>"; - print "<content><![CDATA["; - print "<div class=\"tagCloudContainer\">"; // from here: http://www.roscripts.com/Create_tag_cloud-71.html @@ -506,14 +489,10 @@ class Dlg extends Handler_Protected { __('Close this window')."</button>"; print "</div>"; - print "]]></content>"; } function printTagSelect() { - print "<title>" . __('Select item(s) by tags') . "</title>"; - print "<content><![CDATA["; - print __("Match:"). " " . "<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>"; @@ -541,14 +520,10 @@ class Dlg extends Handler_Protected { __('Close this window') . "</button>"; print "</div>"; - print "]]></content>"; } function generatedFeed() { - print "<title>".__('View as RSS')."</title>"; - print "<content><![CDATA["; - $this->params = explode(":", $this->param, 3); $feed_id = db_escape_string($this->link, $this->params[0]); $is_cat = (bool) $this->params[1]; @@ -572,7 +547,6 @@ class Dlg extends Handler_Protected { __('Close this window')."</button>"; print "</div>"; - print "]]></content>"; //return; } diff --git a/classes/feeds.php b/classes/feeds.php index 2826f175e..a80ae4b3c 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -81,7 +81,7 @@ class Feeds extends Handler_Protected { $reply .= " <a href=\"#\" title=\"".__("View as RSS feed")."\" - onclick=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\"> + onclick=\"displayDlg('".__("View as RSS")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\"> <img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/pub_set.svg\"></a>"; $reply .= "</span>"; @@ -135,7 +135,7 @@ class Feeds extends Handler_Protected { //$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>"; - $reply .= "<option value=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>"; + $reply .= "<option value=\"displayDlg('".__("View as RSS")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>"; $reply .= "</select>"; diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 7895a0396..1983987ab 100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1399,7 +1399,7 @@ class Pref_Feeds extends Handler_Protected { print __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>"; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('pubOPMLUrl')\">". + print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">". __('Display published OPML URL')."</button> "; global $pluginhost; @@ -1436,7 +1436,7 @@ class Pref_Feeds extends Handler_Protected { $rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() . "/public.php?op=rss&id=-2&view-mode=all_articles");; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('generatedFeed', '$rss_url')\">". + print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('".__("View as RSS")."','generatedFeed', '$rss_url')\">". __('Display URL')."</button> "; print "<button dojoType=\"dijit.form.Button\" onclick=\"return clearFeedAccessKeys()\">". |