rework OPML import process

[tt-rss.git] / modules / pref-feeds.php

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 2923f33492bcda41c47064349d6e03afdcfa6185..859b11ee948715a87a9195931c42aa00cc753c07 100644 (file)
--- 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;
@@ -1145,16 +1145,6 @@
 
                print "<div dojoType=\"dijit.Toolbar\">";
 
-               /* 
-               print "<div style='float : right'> 
-                       <input id=\"feed_search\" size=\"20\" type=\"search\"
-                               onfocus=\"disableHotkeys();\" 
-                               onblur=\"enableHotkeys();\"
-                               onchange=\"updateFeedList()\" value=\"$feed_search\">
-                       <button onclick=\"updateFeedList()\">".
-                               __('Search')."</button>
-                               </div>"; */
-
                print "<div dojoType=\"dijit.form.DropDownButton\">".
                                "<span>" . __('Select')."</span>";
                print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
@@ -1256,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\"