From e12184804870f08a61f671a6d6afba32ffe93fca Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 21 Nov 2010 18:01:14 +0300
Subject: rework OPML import process

---
 modules/popup-dialog.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'modules/popup-dialog.php')

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;
 		}
-- 
cgit v1.2.3