]> git.wh0rd.org - tt-rss.git/blobdiff - modules/popup-dialog.php
code cleanup; remove unnecessary callbacks; rework subscribtion dialog
[tt-rss.git] / modules / popup-dialog.php
index 57237823e21ab0ceadfc7ea3630535217a7a5e0b..b5aae1846dcb0c118a86bbc6a27be21f9f6c1dc1 100644 (file)
@@ -3,6 +3,33 @@
                $id = $_REQUEST["id"];
                $param = db_escape_string($_REQUEST["param"]);
 
+               if ($id == "pubUrl") {
+
+                       print "<div id=\"infoBoxTitle\">".__('Published Articles')."</div>";
+                       print "<div class=\"infoBoxContents\">";
+       
+                       $url_path = article_publish_url($link);
+
+                       print __("Your Published articles feed URL is:");
+
+                       print "<div class=\"tagCloudContainer\">";
+                       print "<a id='pub_feed_url' href='$url_path' target='_blank'>$url_path</a>";
+                       print "</div>";
+
+                       print "<div align='center'>";
+
+                       print "<button onclick=\"return pubRegenKey()\">".
+                               __('Generate new URL')."</button> ";
+
+                       print "<input class=\"button\"
+                               type=\"submit\" onclick=\"return closeInfoBox()\" 
+                               value=\"".__('Close this window')."\">";
+
+                       print "</div></div>";
+
+                       return;
+               }
+
                if ($id == "explainError") {
 
                        print "<div id=\"infoBoxTitle\">".__('Notice')."</div>";
 
                        print "<form id='feed_add_form' onsubmit='return false'>";
 
-                       print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
-                       print "<input type=\"hidden\" name=\"subop\" value=\"add\">"; 
-                       print "<input type=\"hidden\" name=\"from\" value=\"tt-rss\">"; 
+                       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 "<div class=\"dlgSec\">".__("Feed")."</div>";
                        print "<div class=\"dlgSecCont\">";
 
                        print __("URL:") . " ";
 
-                       print "<input size=\"40\" onblur=\"javascript:enableHotkeys()\" 
+                       print "<input size=\"40\"
                                        onkeypress=\"return filterCR(event, subscribeToFeed)\"
-                                       onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
-                                       onchange=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
-                                       onfocus=\"javascript:disableHotkeys()\" name=\"feed_url\"></td></tr>";
+                                       name=\"feed\" id=\"feed_url\"></td></tr>";
 
                        print "<br/>";
 
                        if (get_pref($link, 'ENABLE_FEED_CATS')) {
                                print __('Place in category:') . " ";
-                               print_feed_cat_select($link, "cat_id");                 
+                               print_feed_cat_select($link, "cat");                    
                        }
 
                        print "</div>";
 
-
-/*                     print "<tr><td colspan='2'><div class='insensitive'>";
-
-                       print __("Some feeds require authentication. If you subscribe to such
-                               feed, you will have to enter your login and password in Feed Editor");
-
-                       print "</div></td></tr>"; */
-
-/*                     print "<div id='fadd_login_prompt'><br/>
-                               <a href='javascript:appearBlockElement(\"fadd_login_container\", 
-                               \"fadd_login_prompt\")'>".__('Click here if this feed requires authentication.')."</a></div>"; */
-
                        print "<div id='fadd_login_container' style='display:none'>
        
                                        <div class=\"dlgSec\">".__("Authentication")."</div>
                                        <div class=\"dlgSecCont\">".
 
-                                       __('Login:') . " <input name='auth_login' size=\"20\" 
-                                                       onfocus=\"javascript:disableHotkeys()\" 
-                                                       onfocus=\"javascript:disableHotkeys()\" 
+                                       __('Login:') . " <input name='login' size=\"20\" 
                                                        onkeypress=\"return filterCR(event, subscribeToFeed)\"> ".
                                        __('Password:') . "<input type='password'
-                                                       name='auth_pass' size=\"20\" 
-                                                       onfocus=\"javascript:disableHotkeys()\" 
-                                                       onfocus=\"javascript:disableHotkeys()\" 
+                                                       name='pass' size=\"20\" 
                                                        onkeypress=\"return filterCR(event, subscribeToFeed)\">
                                </div></div>";
 
                        print "</form>";
 
                        print "<div class=\"dlgButtons\">
-                               <input class=\"button\"
-                                       id=\"fadd_submit_btn\" disabled=\"true\"
-                                       type=\"submit\" onclick=\"return subscribeToFeed()\" value=\"".__('Subscribe')."\">
-                               <input class=\"button\"
-                                       type=\"submit\" onclick=\"return closeInfoBox()\" 
-                                       value=\"".__('Cancel')."\"></div>";
+                               <button class=\"button\" id=\"fadd_submit_btn\"
+                                       onclick=\"return subscribeToFeed()\">".__('Subscribe')."</button>
+                               <button onclick=\"return browseFeeds()\">".__('More feeds')."</button>
+                               <button onclick=\"return closeInfoBox()\">".__('Cancel')."</button></div>";
                        
                        return;
                }
 
                        print "<div class=\"dlgSecCont\">";
 
-                       print "<input name=\"query\" size=\"20\" type=\"search\"
-                               onkeypress=\"return filterCR(event, search)\"
-                               onchange=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
-                               onkeyup=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
-                               value=\"\">";
+                       print "<input name=\"query\" size=\"20\" type=\"search\"        value=''>";
 
                        print " " . __('match on')." ";
 
                        print "</form>";
 
                        print "<div class=\"dlgButtons\">
-                       <input type=\"submit\" 
-                               class=\"button\" onclick=\"javascript:search()\" 
-                               id=\"search_submit_btn\" disabled=\"true\"
-                               value=\"".__('Search')."\">
-                       <input class=\"button\"
-                               type=\"submit\" onclick=\"javascript:searchCancel()\" 
-                               value=\"".__('Cancel')."\"></div>";
+                       <button onclick=\"javascript:search()\">".__('Search')."</button>
+                       <button onclick=\"javascript:searchCancel()\">".__('Cancel')."</button>
+                       </div>";
 
                        print "</div>";
 
                        print "&nbsp;</span>";
 
                        print "<input onkeypress=\"return filterCR(event, createFilter)\"
-                                        onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-                                        onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-                                        name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
+                                name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
 
                        print "<span id=\"filter_dlg_date_chk_box\" style=\"display : none\">";
                        print "&nbsp;<input class=\"button\"
 
                        print "<div class=\"dlgButtons\">";
 
-                       print "<input type=\"submit\" 
-                               id=\"infobox_submit\"
-                               class=\"button\" onclick=\"return createFilter()\" 
-                               disabled=\"true\" value=\"".__('Create')."\"> ";
+                       print "<button onclick=\"return createFilter()\">".
+                               __('Create')."</button> ";
 
-                       print "<input class=\"button\"
-                               type=\"submit\" onclick=\"return closeInfoBox()\" 
-                               value=\"".__('Cancel')."\">";
+                       print "<button onclick=\"return closeInfoBox()\">".__('Cancel').
+                               "</button>";
 
                        print "</div>";
 
                                        style=\"display:none\"></div>   
                        </td></tr>";
 
-/*                     print "<tr><td>".__('Add existing tag:')."</td>";
-
-                       $result = db_query($link, "SELECT DISTINCT tag_name FROM ttrss_tags 
-                               WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY tag_name");
-
-                       $found_tags = array();
-
-                       array_push($found_tags, '');
-
-                       while ($line = db_fetch_assoc($result)) {
-                               array_push($found_tags, truncate_string($line["tag_name"], 20));
-                       }
-
-                       print "<td align='right'>";
-
-                       print_select("found_tags", '', $found_tags, "onchange=\"javascript:editTagsInsert()\"");
-
-                       print "</td>"; 
-
-                       print "</tr>"; */
-
                        print "</table>";
 
                        print "</form>";
 
                        print "<div align='right'>";
 
-                       print "<input class=\"button\"
-                               type=\"submit\" onclick=\"return editTagsSave()\" 
-                               value=\"".__('Save')."\"> ";
-
-                       print "<input class=\"button\"
-                               type=\"submit\" onclick=\"return closeInfoBox()\" 
-                               value=\"".__('Cancel')."\">";
-
+                       print "<button onclick=\"return editTagsSave()\">".__('Save')."</button> ";
+                       print "<button onclick=\"return closeInfoBox()\">".__('Cancel')."</button>";
 
                        print "</div>";
 
                }
 
                if ($id == "printTagCloud") {
-                       print "<div id=\"infoBoxTitle\">".__('Tag cloud')."</div>";
+                       print "<div id=\"infoBoxTitle\">".__('Tag Cloud')."</div>";
                        print "<div class=\"infoBoxContents\">";
 
                        print __("Showing most popular tags ")." (<a 
-                       href='javascript:toggleTags(true)'>".__('browse more')."</a>):<br/>"; 
+                       href='javascript:toggleTags(true)'>".__('more tags')."</a>):<br/>"; 
 
                        print "<div class=\"tagCloudContainer\">";
 
                        print "</div>";
 
                        print "<div align='center'>";
-                       print "<input class=\"button\"
-                               type=\"submit\" onclick=\"return closeInfoBox()\" 
-                               value=\"".__('Close this window')."\">";
+                       print "<button onclick=\"return closeInfoBox()\">".
+                               __('Close this window')."</button>";
                        print "</div>";
 
                        print "</div>";