diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/popup-dialog.php | 16 | ||||
-rw-r--r-- | modules/pref-feeds.php | 15 |
2 files changed, 12 insertions, 19 deletions
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index 671774195..ec41ec4ee 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -6,10 +6,8 @@ print "<dlg id=\"$id\">"; if ($id == "importOpml") { - print "<title>".__('OPML Import')."</title>"; - print "<content><![CDATA["; - - print "<div class=\"prefFeedCatHolder\">"; + print "<div class=\"prefFeedOPMLHolder\">"; + header("Content-Type: text/html"); # required for iframe $owner_uid = $_SESSION["uid"]; @@ -50,18 +48,12 @@ print "</div>"; print "<div align='center'>"; - - print "<button onclick=\"return opmlImportDone()\">". + print "<button dojoType=\"dijit.form.Button\" + onclick=\"dijit.byId('opmlImportDlg').hide()\">". __('Close this window')."</button>"; - print "</div>"; - print "<script type=\"text/javascript\">"; - print "parent.opmlImportHandler(this)"; - print "</script>"; - print "</div>"; - print "]]></content>"; //return; } diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 2b279d2d7..859b11ee9 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -601,12 +601,12 @@ print "</div>"; print "<div class='dlgButtons'> - <input type=\"submit\" class=\"button\" - onclick=\"return dijit.byId('feedEditDlg').execute()\" - value=\"".__('Save')."\"> - <input type='submit' class='button' - onclick=\"return dijit.byId('feedEditDlg').hide()\" - value=\"".__('Cancel')."\"> + <button dojoType=\"dijit.form.Button\" + onclick=\"return dijit.byId('feedEditDlg').execute()\">". + __('Save')."</button> + <button dojoType=\"dijit.form.Button\" + onclick=\"return dijit.byId('feedEditDlg').hide()\">". + __('Cancel')."</button> </div>"; return; @@ -1246,7 +1246,8 @@ print "</p>"; - print "<iframe name=\"upload_iframe\" + print "<iframe id=\"upload_iframe\" + name=\"upload_iframe\" onload=\"opmlImportComplete(this)\" style=\"width: 400px; height: 100px; display: none;\"></iframe>"; print "<form style='display : block' target=\"upload_iframe\" |