]> git.wh0rd.org Git - tt-rss.git/commitdiff
prefs: small usability improvements, feed panel allows searching for category
authorAndrew Dolgov <fox@bah.org.ru>
Tue, 6 Oct 2009 09:37:24 +0000 (13:37 +0400)
committerAndrew Dolgov <fox@bah.org.ru>
Tue, 6 Oct 2009 09:37:24 +0000 (13:37 +0400)
modules/pref-feeds.php
modules/pref-filters.php
modules/pref-labels.php
modules/pref-users.php

index 0a5db475f17d386a0ec941f5d8ae7a72756572a5..6aec173361e51dbd3c7f8801adeb1827115d9a8c 100644 (file)
 
                if ($feed_search) {
                        $search_qpart = "(UPPER(F1.title) LIKE UPPER('%$feed_search%') OR
+                               UPPER(C1.title) LIKE UPPER('%$feed_search%') OR
                                UPPER(F1.feed_url) LIKE UPPER('%$feed_search%')) AND";
                } else {
                        $search_qpart = "";
                                }
 
                        print "</select>";
+               } else {
+
+                       print "<p>";
+
+                       if (!$feed_search) { 
+                               print_warning(__("You don't have any subscribed feeds."));
+                       } else {
+                               print_warning(__('No matching feeds found.'));
+                       }
+                       print "</p>";
+
                }
 
                print "<h3>".__('OPML')."</h3>
index e8e1cd60e4ebf6eee1027748aa54812c433ee6e7..c85751adb8b1f81453454dfb42e6ff83520bd58c 100644 (file)
 
                        print "<p>";
                        if (!$filter_search) {
-                               print __('No filters defined.');
+                               print_warning(__('No filters defined.'));
                        } else {
-                               print __('No matching filters found.');
+                               print_warning(__('No matching filters found.'));
                        }
                        print "</p>";
 
index dd44c78659a75b96d096a57665e3d9c0eb1d1e98..165765b89dcd2d4552789b3a534c7db1745bd536 100644 (file)
                } else {
                        print "<p>";
                        if (!$label_search) {
-                               print __('No labels defined.');
+                               print_warning(__('No labels defined.'));
                        } else {
-                               print __('No matching labels found.');
+                               print_warning(__('No matching labels found.'));
                        }
                        print "</p>";
 
index 73313a8ad4eb3205819d8aef4929c790c817e991..7e38fd5d43e81a69778ff9c15531ab7f43ca3bbd 100644 (file)
                } else {
                        print "<p>";
                        if (!$user_search) {
-                               print __('No users defined.');
+                               print_warning(__('No users defined.'));
                        } else {
-                               print __('No matching users found.');
+                               print_warning(__('No matching users found.'));
                        }
                        print "</p>";