extended search dialog placeholder, disabled for now

diff --git a/backend.php b/backend.php
index 07f6028ed37ea2cc06b32e4ac3d81129fc08d1cf..ed58fcea2c6f55451edd0eca027bd372f9bfe9f6 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -1320,7 +1320,9 @@
                $param = $_GET["param"];
 
                if ($id == "quickAddFeed") {
-                       print "Feed URL: <input id=\"qafInput\">
+                       print "Feed URL: <input 
+                       onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
+                       id=\"qafInput\">
                        <input class=\"button\"
                                type=\"submit\" onclick=\"javascript:qafAdd()\" value=\"Add feed\">
                        <input class=\"button\"
@@ -1352,6 +1354,23 @@
                        }
                }
 
+               if ($id == "search") {
+
+                       print "<input id=\"searchbox\" class=\"extSearch\"                      
+                       onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
+                       onchange=\"javascript:search()\">
+                       <select id=\"searchmodebox\">
+                               <option selected>All feeds</option>
+                               <option>This feed</option>
+                       </select>               
+                       <input type=\"submit\" 
+                               class=\"button\" onclick=\"javascript:search()\" value=\"Search\">
+                       <input class=\"button\"
+                               type=\"submit\" onclick=\"javascript:closeDlg()\" 
+                               value=\"Close\">";
+
+               }
+
        }
 
        db_close($link);

diff --git a/tt-rss.css b/tt-rss.css
index b2b5dc2f44fd9f5d5f953283c7b878a7e0318cf5..67c6b549c1882e90e7b73209193f1d681e3dc236 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -402,3 +402,7 @@ pre {
 #qafInput {
        width : 300px;
 }
+
+input.extSearch {
+       width : 200px;
+}

diff --git a/tt-rss.js b/tt-rss.js
index 637895dc95e0802fdebb9401cb43e96b445a2d00..bbd7b6955112820ba90f676c62ba15393c07596f 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -201,6 +201,9 @@ function viewCurrentFeed(skip, subop) {
 
        if (getActiveFeedId()) {
                viewfeed(getActiveFeedId(), skip, subop);
+       } else {
+               disableContainerChildren("headlinesToolbar", false, document);
+               viewfeed(-1, skip, subop); // FIXME
        }
 }
 
@@ -428,10 +431,15 @@ function quickMenuGo() {
 
        var opname = chooser[chooser.selectedIndex].text;
 
-       if (opname.match("Preferences")) {
+       if (opname == "Preferences") {
                gotoPreferences();
        }
 
+       if (opname == "Extended search") {
+               displayDlg("search");
+               return;
+       }
+
        if (opname.match("Add new feed")) {
                displayDlg("quickAddFeed");
                return;
@@ -448,7 +456,6 @@ function quickMenuGo() {
                displayDlg("quickDelFeed", actid);
                return;
        }
-
 }
 
 function qafAdd() {
@@ -505,5 +512,6 @@ function qfdDelete(feed_id) {
        xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=remove&ids=" + feed_id);
        xmlhttp.onreadystatechange=dlg_frefresh_callback;
        xmlhttp.send(null);
-
 }
+
+

diff --git a/tt-rss.php b/tt-rss.php
index 52863c1457edbc6b400d94bfd115b71f1ce3f798..e4e9ec5ef53c62a759ae351523b13bde5f24ef8c 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -76,9 +76,6 @@
        <td valign="top" class="headlinesToolbarBox">
                <table width="100%" cellpadding="0" cellspacing="0">
                
-               <!-- <tr><td id="headlinesTitle" class="headlinesTitle">
-                       &nbsp;
-               </td></tr> -->
                <tr><td class="headlinesToolbar" id="headlinesToolbar">
                        <input id="searchbox"
                        onblur="javascript:enableHotkeys()" onfocus="javascript:disableHotkeys()"
@@ -90,10 +87,10 @@
                
                <input type="submit" 
                        class="button" onclick="javascript:search()" value="Search">
-               <!-- <input type="submit" 
-                       class="button" onclick="javascript:resetSearch()" value="Reset"> -->
 
-               &nbsp;View: 
+               &nbsp; 
+               
+               View: 
                
                <select id="viewbox" onchange="javascript:viewCurrentFeed(0, '')">
                        <option>All Articles</option>