search toolbar ui change

diff --git a/functions.js b/functions.js
index 72d35dbbd92d83ecc48226d0e26e09730fe92250..cc8a5fbdf6b619df0d6ac315739671a5b4bdfd42 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -128,7 +128,8 @@ function cleanSelectedList(element) {
        var content = document.getElementById(element);
 
        for (i = 0; i < content.childNodes.length; i++) {
-               content.childNodes[i].className = content.childNodes[i].className.replace("Selected", "");
+               content.childNodes[i].className = 
+                       content.childNodes[i].className.replace("Selected", "");
        }
 
 }

diff --git a/tt-rss.js b/tt-rss.js
index 422cd6aa64a1ca112ca4e6bcb1fc7973a74061b5..3725ab43c3795454673079e290ba61e9055ce853 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -274,12 +274,7 @@ function resetSearch() {
 }
 
 function search() {
-       checkActiveFeedId();
-       if (getActiveFeedId()) {
-               viewfeed(getActiveFeedId(), 0, "");
-       } else {
-               notify("Please select some feed first.");
-       }
+       viewCurrentFeed(0, "");
 }
 
 function localPiggieFunction(enable) {

diff --git a/tt-rss.php b/tt-rss.php
index de1bec37dea834107f5ff1899e87171f3e616004..89ff4076265d21b3d0efc1c9014fe8ef4e294c84 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -72,11 +72,13 @@
                         
                </td></tr> -->
                <tr><td class="headlinesToolbar" id="headlinesToolbar">
-                       Search: <input id="searchbox"
+                       <input id="searchbox"
                        onblur="javascript:enableHotkeys()" onfocus="javascript:disableHotkeys()"
                        onchange="javascript:search()">
                <input type="submit" 
-                       class="button" onclick="javascript:resetSearch()" value="Reset">
+                       class="button" onclick="javascript:search()" value="Search">
+               <!-- <input type="submit" 
+                       class="button" onclick="javascript:resetSearch()" value="Reset"> -->
 
                &nbsp;View: