]> git.wh0rd.org - tt-rss.git/blobdiff - modules/popup-dialog.php
rework email article dialog
[tt-rss.git] / modules / popup-dialog.php
index 9ec57537639003e75bdc8d8607251704d086f063..ad3ca0c3a6d04340189a4ff1a77b19f2b7296214 100644 (file)
@@ -3,9 +3,11 @@
                $id = $_REQUEST["id"];
                $param = db_escape_string($_REQUEST["param"]);
 
+               print "<dlg id=\"$id\">";
+
                if ($id == "importOpml") {
-                       print "<div id=\"infoBoxTitle\">".__('OPML Import')."</div>";
-                       print "<div class=\"infoBoxContents\">";
+                       print "<title>".__('OPML Import')."</title>";
+                       print "<content><![CDATA[";
 
                        print "<div class=\"prefFeedCatHolder\">";
 
                        print "parent.opmlImportHandler(this)";
                        print "</script>";
 
-                       print "</div></div>";
+                       print "</div>";
+                       print "]]></content>";
 
-                       return;
+                       //return;
                }
 
                if ($id == "editPrefProfiles") {
 
-                       print "<div id=\"infoBoxTitle\">".__('Settings Profiles')."</div>";
-                       print "<div class=\"infoBoxContents\">";
+                       print "<title>".__('Settings Profiles')."</title>";
+                       print "<content><![CDATA[";
 
                        print "<div><input id=\"fadd_profile\" 
                                        onkeypress=\"return filterCR(event, addPrefProfile)\"
                        print "<button onclick=\"return closeInfoBox()\">".
                                __('Close this window')."</button>";
 
-                       print "</div></div>";
+                       print "</div>";
+                       print "]]></content>";
 
-                       return;
+                       //return;
                }
 
                if ($id == "pubOPMLUrl") {
 
-                       print "<div id=\"infoBoxTitle\">".__('Public OPML URL')."</div>";
-                       print "<div class=\"infoBoxContents\">";
+                       print "<title>".__('Public OPML URL')."</title>";
+                       print "<content><![CDATA[";
 
                        $url_path = opml_publish_url($link);
 
 
                        print "<div align='center'>";
 
-                       print "<button onclick=\"return opmlRegenKey()\">".
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"return opmlRegenKey()\">".
                                __('Generate new URL')."</button> ";
 
-                       print "<button onclick=\"return closeInfoBox()\">".
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"return closeInfoBox()\">".
                                __('Close this window')."</button>";
 
-                       print "</div></div>";
+                       print "</div>";
+                       print "]]></content>";
 
-                       return;
+                       //return;
                }
 
                if ($id == "explainError") {
 
-                       print "<div id=\"infoBoxTitle\">".__('Notice')."</div>";
-                       print "<div class=\"infoBoxContents\">";
+                       print "<title>".__('Notice')."</title>";
+                       print "<content><![CDATA[";
 
                        print "<div class=\"errorExplained\">";
 
                        print "<button onclick=\"return closeInfoBox()\"".
                                __('Close this window')."</button>";
 
-                       print "</div></div>";
+                       print "</div>";
+                       print "]]></content>";
 
-                       return;
+                       //return;
                }
 
                if ($id == "quickAddFeed") {
 
-                       print "<div id=\"infoBoxTitle\">".__('Subscribe to Feed')."</div>";
-                       print "<div class=\"infoBoxContents\">";
-
-                       print "<form id='feed_add_form' onsubmit='return false'>";
-
-                       print "<input type=\"hidden\" name=\"op\" value=\"rpc\">";
-                       print "<input type=\"hidden\" name=\"subop\" value=\"addfeed\">"; 
-                       //print "<input type=\"hidden\" name=\"from\" value=\"tt-rss\">"; 
+                       print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
+                       print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"addfeed\">"; 
 
                        print "<div class=\"dlgSec\">".__("Feed")."</div>";
                        print "<div class=\"dlgSecCont\">";
 
-                       print __("URL:") . " ";
-
-                       print "<input size=\"40\"
-                                       onkeypress=\"return filterCR(event, subscribeToFeed)\"
-                                       name=\"feed\" id=\"feed_url\">";
+                       print "<input style=\"font-size : 16px; width : 20em;\"
+                               placeHolder=\"".__("Feed URL")."\"
+                               dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"feed\" id=\"feedDlg_feedUrl\">";
 
                        print "<br/>";
 
                        if (get_pref($link, 'ENABLE_FEED_CATS')) {
                                print __('Place in category:') . " ";
-                               print_feed_cat_select($link, "cat");                    
+                               print_feed_cat_select($link, "cat", false, 'dojoType="dijit.form.Select"');                     
                        }
 
                        print "</div>";
 
-                       print '<div id="fadd_feeds_container" style="display:none">
+                       print '<div id="feedDlg_feedsContainer" style="display : none">
 
                                        <div class="dlgSec">' . __('Available feeds') . '</div>
-                                       <div class="dlgSecCont">'
-
-                                       . ' <select name="feed" id="faad_feeds_container_select" size="3"></select>'
-                               . '</div></div>';
-
-                       print "<div id='fadd_login_container' style='display:none'>
+                                       <div class="dlgSecCont">'.
+                                       '<select id="feedDlg_feedContainerSelect"
+                                               dojoType="dijit.form.Select" size="3">
+                                               <script type="dojo/method" event="onChange" args="value">
+                                                       dijit.byId("feedDlg_feedUrl").attr("value", value);
+                                               </script>
+                                       </select>'.
+                                       '</div></div>';
+
+                       print "<div id='feedDlg_loginContainer' style='display : none'>
        
                                        <div class=\"dlgSec\">".__("Authentication")."</div>
                                        <div class=\"dlgSecCont\">".
 
-                                       __('Login:') . " <input name='login' size=\"20\" 
-                                                       onkeypress=\"return filterCR(event, subscribeToFeed)\"> ".
-                                       __('Password:') . "<input type='password'
-                                                       name='pass' size=\"20\" 
-                                                       onkeypress=\"return filterCR(event, subscribeToFeed)\">
+                                       " <input dojoType=\"dijit.form.TextBox\" name='login'\" 
+                                               placeHolder=\"".__("Login")."\"
+                                               style=\"width : 10em;\"> ".
+                                       " <input 
+                                               placeHolder=\"".__("Password")."\"
+                                               dojoType=\"dijit.form.TextBox\" type='password' 
+                                               style=\"width : 10em;\" name='pass'\">
                                </div></div>";
 
 
-                       print "<div style=\"clear : both\">                             
-                               <input type=\"checkbox\" id=\"fadd_login_check\" 
-                                               onclick='checkboxToggleElement(this, \"fadd_login_container\")'>
-                                       <label for=\"fadd_login_check\">".
+                       print "<div style=\"clear : both\">             
+                               <input type=\"checkbox\" dojoType=\"dijit.form.CheckBox\" id=\"feedDlg_loginCheck\" 
+                                               onclick='checkboxToggleElement(this, \"feedDlg_loginContainer\")'>
+                                       <label for=\"feedDlg_loginCheck\">".
                                        __('This feed requires authentication.')."</div>";
 
                        print "</form>";
 
                        print "<div class=\"dlgButtons\">
-                               <button class=\"button\" id=\"fadd_submit_btn\"
-                                       onclick=\"return subscribeToFeed()\">".__('Subscribe')."</button>
-                               <button onclick=\"return displayDlg('feedBrowser')\">".__('More feeds')."</button>
-                               <button onclick=\"return closeInfoBox()\">".__('Cancel')."</button></div>";
-                       
-                       return;
+                               <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>
+                               </div>";
+
+                       //return;
                }
 
                if ($id == "feedBrowser") {
 
-                       print "<div id=\"infoBoxTitle\">".__('Feed Browser')."</div>";
-                       
-                       print "<div class=\"infoBoxContents\">";
-
                        $browser_search = db_escape_string($_REQUEST["search"]);
                        
-                       print "<form onsubmit='return false;' display='inline' 
-                               name='feed_browser' id='feed_browser'>";
+#                      print "<form onsubmit='return false;' display='inline' 
+#                              name='feed_browser' id='feed_browser'>";
 
-                       print "<input type=\"hidden\" name=\"op\" value=\"rpc\">";
-                       print "<input type=\"hidden\" name=\"subop\" value=\"updateFeedBrowser\">"; 
+                       print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
+                       print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"updateFeedBrowser\">"; 
 
-                       print "
+                       print "<div dojoType=\"dijit.Toolbar\">
                                <div style='float : right'>
                                <img style='display : none' 
                                        id='feed_browser_spinner' src='".
                                        theme_image($link, 'images/indicator_white.gif')."'>
-                               <input name=\"search\" size=\"20\" type=\"search\"
-                                       onchange=\"javascript:updateFeedBrowser()\" value=\"$browser_search\">
-                               <button onclick=\"javascript:updateFeedBrowser()\">".__('Search')."</button>
+                               <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>
                        </div>";
 
-                       print " <select name=\"mode\" onchange=\"updateFeedBrowser()\">
+                       print " <select name=\"mode\" dojoType=\"dijit.form.Select\" onchange=\"dijit.byId('feedBrowserDlg').update()\">
                                <option value='1'>" . __('Popular feeds') . "</option>
                                <option value='2'>" . __('Feed archive') . "</option>
                                </select> ";
 
                        print __("limit:");
 
-                       print " <select name=\"limit\" onchange='updateFeedBrowser()'>";
+                       print " <select dojoType=\"dijit.form.Select\" name=\"limit\" onchange=\"dijit.byId('feedBrowserDlg').update()\">";
 
                        foreach (array(25, 50, 100, 200) as $l) {
-                               $issel = ($l == $limit) ? "selected" : "";
-                               print "<option $issel>$l</option>";
+                               $issel = ($l == $limit) ? "selected=\"1\"" : "";
+                               print "<option $issel value=\"$l\">$l</option>";
                        }
                        
                        print "</select> ";
 
-                       print "<p>";
+                       print "</div>";
 
                        $owner_uid = $_SESSION["uid"];
 
                        print "</ul>";
 
                        print "<div align='center'>
-                               <button onclick=\"feedBrowserSubscribe()\">".__('Subscribe')."</button>
-                               <button style='display : none' id='feed_archive_remove' onclick=\"feedArchiveRemove()\">".__('Remove')."</button>
-                               <button onclick=\"closeInfoBox()\" >".__('Cancel')."</button></div>";
+                               <button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedBrowserDlg').execute()\">".__('Subscribe')."</button>
+                               <button dojoType=\"dijit.form.Button\" style='display : none' id='feed_archive_remove' onclick=\"dijit.byId('feedBrowserDlg').removeFromArchive()\">".__('Remove')."</button>
+                               <button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedBrowserDlg').hide()\" >".__('Cancel')."</button></div>";
 
-                       print "</div>";
-                       return;
                }
 
                if ($id == "search") {
 
-                       print "<div id=\"infoBoxTitle\">".__('Search')."</div>";
-                       print "<div class=\"infoBoxContents\">";
+                       print "<title>".__('Search')."</title>";
+                       print "<content><![CDATA[";
 
                        print "<form id='search_form'  onsubmit='return false'>";
 
 
                        print "<div class=\"dlgSecCont\">";
 
-                       print "<input onkeypress=\"return filterCR(event, search)\"
-                               name=\"query\" size=\"20\" type=\"search\"      value=''>";
+                       if (!SPHINX_ENABLE) {
 
-                       print " " . __('match on')." ";
+                               print "<input onkeypress=\"return filterCR(event, search)\"
+                                       name=\"query\" size=\"20\" type=\"search\"      value=''>";
 
-                       $search_fields = array(
-                               "title" => __("Title"),
-                               "content" => __("Content"),
-                               "both" => __("Title or content"));
+                               print " " . __('match on')." ";
 
-                       print_select_hash("match_on", 3, $search_fields); 
+                               $search_fields = array(
+                                       "title" => __("Title"),
+                                               "content" => __("Content"),
+                                       "both" => __("Title or content"));
+       
+                               print_select_hash("match_on", 3, $search_fields); 
+                       } else {
+                               print "<input onkeypress=\"return filterCR(event, search)\"
+                                       name=\"query\" size=\"50\" type=\"search\"      value=''>";
+                       }
 
 
                        print "<br/>".__('Limit search to:')." ";
                        <button onclick=\"javascript:closeInfoBox(true)\">".__('Cancel')."</button>
                        </div>";
 
-                       print "</div>";
+                       print "]]></content>";
 
-                       return;
+                       //return;
 
                }
 
 
                        $active_feed_id = db_escape_string($_REQUEST["param"]);
 
-                       print "<div id=\"infoBoxTitle\">".__('Create Filter')."</div>";
-                       print "<div class=\"infoBoxContents\">";
-
-                       print "<form id=\"filter_add_form\" onsubmit='return false'>";
-
-                       print "<input type=\"hidden\" name=\"op\" value=\"pref-filters\">";
-                       print "<input type=\"hidden\" name=\"quiet\" value=\"1\">";
-                       print "<input type=\"hidden\" name=\"subop\" value=\"add\">"; 
+                       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=\"subop\" value=\"add\">"; 
                
                        $result = db_query($link, "SELECT id,description 
                                FROM ttrss_filter_types ORDER BY description");
 
                        print "<div class=\"dlgSecCont\">";
 
-                       print "<span id=\"filter_dlg_date_mod_box\" style=\"display : none\">";
-                       print __("Date") . " ";
+                       print "<span id=\"filterDlg_dateModBox\" style=\"display : none\">";
 
                        $filter_params = array(
                                "before" => __("before"),
                                "after" => __("after"));
 
-                       print_select_hash("filter_date_modifier", "before", $filter_params);
+                       print_select_hash("filter_date_modifier", "before", 
+                               $filter_params, 'dojoType="dijit.form.Select"');
 
                        print "&nbsp;</span>";
 
-                       print "<input onkeypress=\"return filterCR(event, createFilter)\"
-                                name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
+                       print "<input dojoType=\"dijit.form.ValidationTextBox\" 
+                                required=\"true\" id=\"filterDlg_regExp\"
+                                style=\"font-size : 16px\"
+                                name=\"reg_exp\" value=\"$reg_exp\"/>";
 
-                       print "<span id=\"filter_dlg_date_chk_box\" style=\"display : none\">";
+                       print "<span id=\"filterDlg_dateChkBox\" style=\"display : none\">";
                        print "&nbsp;<button onclick=\"return filterDlgCheckDate()\">".
                                __('Check it')."</button>";
                        print "</span>";
 
-                       print "<br/> " . __("on field") . " ";
+                       print "<br/>" .  __("on field") . " ";
                        print_select_hash("filter_type", 1, $filter_types,
-                               'onchange="filterDlgCheckType(this)"');
+                               'onchange="filterDlgCheckType(this)" dojoType="dijit.form.Select"');
 
                        print "<br/>";
 
                        print __("in") . " ";
-                       print_feed_select($link, "feed_id", $active_feed_id);
+                       print_feed_select($link, "feed_id", $active_feed_id, 
+                               'dojoType="dijit.form.FilteringSelect"');
 
                        print "</div>";
 
 
                        print "<div class=\"dlgSecCont\">";
 
-                       print "<select name=\"action_id\"
+                       print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
                                onchange=\"filterDlgCheckAction(this)\">";
        
                        $result = db_query($link, "SELECT id,description FROM ttrss_filter_actions 
        
                        print "</select>";
 
-                       print "<span id=\"filter_dlg_param_box\" style=\"display : none\">";
+                       print "<span id=\"filterDlg_paramBox\" style=\"display : none\">";
                        print " " . __("with parameters:") . " ";
-                       print "<input size=\"20\"
-                                       onkeypress=\"return filterCR(event, createFilter)\"
-                                       name=\"action_param\">";
+                       print "<input dojoType=\"dijit.form.TextBox\"
+                               id=\"filterDlg_actionParam\"
+                               name=\"action_param\">";
 
-                       print_label_select($link, "action_param_label", $action_param);
+                       print_label_select($link, "action_param_label", $action_param, 
+                        'id="filterDlg_actionParamLabel" dojoType="dijit.form.Select"');
 
                        print "</span>";
 
                        print "<div class=\"dlgSec\">".__("Options")."</div>";
                        print "<div class=\"dlgSecCont\">";
 
-                       print "<div style=\"line-height : 100%\">";
-
-                       print "<input type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
+                       print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
                                        <label for=\"enabled\">".__('Enabled')."</label><br/>";
 
-                       print "<input type=\"checkbox\" name=\"inverse\" id=\"inverse\">
+                       print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\">
                                <label for=\"inverse\">".__('Inverse match')."</label>";
 
                        print "</div>";
-                       print "</div>";
-
-                       print "</form>";
 
                        print "<div class=\"dlgButtons\">";
 
-                       print "<button onclick=\"return createFilter()\">".
+                       print "<button onclick=\"return dijit.byId('filterEditDlg').execute()\">".
                                __('Create')."</button> ";
 
-                       print "<button onclick=\"return closeInfoBox()\">".__('Cancel').
-                               "</button>";
+                       print "<button onclick=\"return dijit.byId('filterEditDlg').hide()\">".
+                               __('Cancel')."</button>";
 
                        print "</div>";
 
-//                     print "</td></tr></table>"; 
-
-                       return;
+                       //return;
                }
 
                if ($id == "feedUpdateErrors") {
 
-                       print "<div id=\"infoBoxTitle\">".__('Update Errors')."</div>";
-                       print "<div class=\"infoBoxContents\">";
+                       print "<title>".__('Update Errors')."</title>";
+                       print "<content><![CDATA[";
 
                        print __("These feeds have not been updated because of errors:");
 
                        print "<button onclick=\"return closeInfoBox()\">".
                                __('Close this window')."</button>";
 
-                       print "</div>";
+                       print "]]></content>";
 
-                       return;
+                       //return;
                }
 
                if ($id == "editArticleTags") {
 
-                       print "<div id=\"infoBoxTitle\">".__('Edit Tags')."</div>";
-                       print "<div class=\"infoBoxContents\">";
+                       print "<title>".__('Edit Tags')."</title>";
+                       print "<content><![CDATA[";
 
                        print "<form id=\"tag_edit_form\" onsubmit='return false'>";
 
                        print "<button onclick=\"return editTagsSave()\">".__('Save')."</button> ";
                        print "<button onclick=\"return closeInfoBox()\">".__('Cancel')."</button>";
 
-                       print "</div>";
+                       print "]]></content>";
 
-                       return;
+                       //return;
                }
 
                if ($id == "printTagCloud") {
-                       print "<div id=\"infoBoxTitle\">".__('Tag Cloud')."</div>";
-                       print "<div class=\"infoBoxContents\">";
+                       print "<title>".__('Tag Cloud')."</title>";
+                       print "<content><![CDATA[";
 
-                       print __("Showing most popular tags ")." (<a 
-                       href='javascript:toggleTags(true)'>".__('more tags')."</a>):<br/>"; 
+#                      print __("Showing most popular tags ")." (<a 
+#                      href='javascript:toggleTags(true)'>".__('more tags')."</a>):<br/>"; 
 
                        print "<div class=\"tagCloudContainer\">";
 
                                __('Close this window')."</button>";
                        print "</div>";
 
-                       print "</div>";
+                       print "]]></content>";
 
-                       return;
+                       //return;
                }
 
                if ($id == "emailArticle") {
 
-                       print "<div id=\"infoBoxTitle\">".__('Forward article by email')."</div>";
-                       print "<div class=\"infoBoxContents\">";
-
-                       print "<form id=\"article_email_form\" onsubmit='return false'>";
-
                        $secretkey = sha1(uniqid(rand(), true));
 
                        $_SESSION['email_secretkey'] = $secretkey;
 
-                       print "<input type=\"hidden\" name=\"secretkey\" value=\"$secretkey\">";
-                       print "<input type=\"hidden\" name=\"op\" value=\"rpc\">";
-                       print "<input type=\"hidden\" name=\"subop\" value=\"sendEmail\">"; 
+                       print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"secretkey\" value=\"$secretkey\">";
+                       print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
+                       print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"sendEmail\">"; 
 
                        $result = db_query($link, "SELECT email, full_name FROM ttrss_users WHERE
                                id = " . $_SESSION["uid"]);
 
                        print "</td><td>";
 
-                       print "<input size=\"40\" disabled
-                                       onkeypress=\"return filterCR(event, false)\"
+                       print "<input dojoType=\"dijit.form.TextBox\" disabled=\"1\" style=\"width : 30em;\"
                                        value=\"$user_name <$user_email>\">";
 
                        print "</td></tr><tr><td>";
 
                        print "</td><td>";
 
-                       print "<input size=\"40\"
-                                       onkeypress=\"return filterCR(event, false)\"
-                                       name=\"destination\" id=\"destination\">";
+                       print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
+                                       style=\"width : 30em;\"
+                                       name=\"destination\" id=\"emailArticleDlg_destination\">";
 
-                       print "<div class=\"autocomplete\" id=\"destination_choices\" 
-                                       style=\"display:none\"></div>"; 
+                       print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\" 
+                                       style=\"z-index: 30; display : none\"></div>";  
 
                        print "</td></tr><tr><td>";
 
 
                        print "</td><td>";
 
-                       print "<input size=\"60\" class=\"iedit\"
-                                       onkeypress=\"return filterCR(event, false)\"
+                       print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
+                                       style=\"width : 30em;\" 
                                        name=\"subject\" value=\"$subject\" id=\"subject\">";
 
-                       print "</td></tr></table>";
+                       print "</td></tr>";
 
-                       print "<textarea rows='10' class='iedit' style='font-size : small'
+                       print "<tr><td colspan='2'><textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 100%' rows=\"20\"
                                name='content'>$content</textarea>";
 
-                       print "</form>";
+                       print "</td></tr></table>";
 
                        print "<div class='dlgButtons'>";
-
-                       print "<button onclick=\"return emailArticleDo()\">".__('Send e-mail')."</button> ";
-                       print "<button onclick=\"return closeInfoBox()\">".__('Cancel')."</button>";
-
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
                        print "</div>";
 
-                       return;
+                       //return;
                }
 
                if ($id == "generatedFeed") {
 
-                       print "<div id=\"infoBoxTitle\">".__('View as RSS')."</div>";
-                       print "<div class=\"infoBoxContents\">";
+                       print "<title>".__('View as RSS')."</title>";
+                       print "<content><![CDATA[";
        
                        $params = explode(":", $param, 3);
                        $feed_id = db_escape_string($params[0]);
 
                        print "<div align='center'>";
 
-                       print "<button onclick=\"return genUrlChangeKey('$feed_id', '$is_cat')\">".
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"return genUrlChangeKey('$feed_id', '$is_cat')\">".
                                __('Generate new URL')."</button> ";
 
-                       print "<button onclick=\"return closeInfoBox()\">".
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"return closeInfoBox()\">".
                                __('Close this window')."</button>";
 
-                       print "</div></div>";
+                       print "</div>";
+                       print "]]></content>";
 
-                       return;
+                       //return;
                }
 
-               print "<div id='infoBoxTitle'>Internal Error</div>
-                       <div id='infoBoxContents'>
-                       <p>Unknown dialog <b>$id</b></p>
-                       </div></div>";
-       
+               print "</dlg>"; 
        }
 ?>