remove xml stuff from backend/dlg

[tt-rss.git] / classes / dlg.php

diff --git a/classes/dlg.php b/classes/dlg.php
index 5789af68437386f9982c8b3aca8f181678c6d0d8..d13a9ecb6891d8b1859ef073a7d9f76c3a7cdc04 100644 (file)
--- 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:"). "&nbsp;" .
                        "<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];
@@ -557,7 +532,7 @@ class Dlg extends Handler_Protected {
 
                $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>";
@@ -572,7 +547,6 @@ class Dlg extends Handler_Protected {
                        __('Close this window')."</button>";
 
                print "</div>";
-               print "]]></content>";
 
                //return;
        }
@@ -598,7 +572,7 @@ class Dlg extends Handler_Protected {
 
                        print "<div style='text-align : center'>";
                        print "<button dojoType=\"dijit.form.Button\"
-                               onclick=\"return window.open('$details')\">".__("Details")."</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\"
@@ -628,9 +602,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\">";