compat theme: properly reflow container height

[tt-rss.git] / functions.php

diff --git a/functions.php b/functions.php
index a815d4947b09270e4be6a582a92c5073b3838f00..1b92f94409ef62065c8d5e2c361f35a4b6437457 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3296,7 +3296,6 @@
                                        WHERE
                                        $group_limit_part
                                        ttrss_feeds.hidden = false AND 
-                                       score >= -500 AND
                                        ttrss_user_entries.feed_id = ttrss_feeds.id AND
                                        ttrss_user_entries.ref_id = ttrss_entries.id AND
                                        ttrss_user_entries.owner_uid = '$owner_uid' AND
@@ -3328,7 +3327,6 @@
                                                ttrss_entries,ttrss_user_entries,ttrss_tags
                                        WHERE
                                                ref_id = ttrss_entries.id AND 
-                                               score >= -500 AND
                                                ttrss_user_entries.owner_uid = '$owner_uid' AND
                                                post_int_id = int_id AND tag_name = '$feed' AND
                                                $view_query_part
@@ -3868,10 +3866,10 @@
                                                        <li onclick=\"$tog_unread_link\">&nbsp;&nbsp;".__('Unread')."</li>
                                                        <li onclick=\"$tog_marked_link\">&nbsp;&nbsp;".__('Starred')."</li>
                                                        <li onclick=\"$tog_published_link\">&nbsp;&nbsp;".__('Published')."</li>
+                                                       <li><span class=\"insensitive\">--------</span></li>
                                                        <li><span class=\"insensitive\">".__('Mark as read:')."</span></li>
                                                        <li onclick=\"$catchup_sel_link\">&nbsp;&nbsp;".__('Selection')."</li>";
 
-
 /*                             if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
        
                                        print "
@@ -3886,6 +3884,7 @@
 
                                print "<li onclick=\"$catchup_feed_link\">&nbsp;&nbsp;".__('Entire feed')."</li>";
 
+                               print "<li><span class=\"insensitive\">--------</span></li>";
                                print "<li><span class=\"insensitive\">".__('Other actions:')."</span></li>";
                
 
@@ -3900,62 +3899,10 @@
                                }
                                
                                print   "</ul></li></ul>";
-
-/*                                     print "<td class=\"headlineActions$rtl_cpart\">
-                                               <ul class=\"headlineDropdownMenu\">
-                                               <li class=\"top2\">
-                                               ".__('Select:')."
-                                                       <a href=\"$sel_all_link\">".__('All')."</a>,
-                                                       <a href=\"$sel_unread_link\">".__('Unread')."</a>,
-                                                       <a href=\"$sel_none_link\">".__('None')."</a></li>
-                                               <li class=\"vsep\">&nbsp;</li>
-                                               <li class=\"top\">".__('Toggle')."<ul>
-                                                       <li onclick=\"$tog_unread_link\">".__('Unread')."</li>
-                                                       <li onclick=\"$tog_marked_link\">".__('Starred')."</li>
-                                                       <li onclick=\"$tog_published_link\">".__('Published')."</li>
-                                                       </ul></li>
-                                               <li class=\"vsep\">&nbsp;</li>
-                                               <li class=\"top\">".__('Mark as read')."<ul>
-                                                       <li onclick=\"$catchup_sel_link\">".__('Selection')."</li>
-                                                       <!-- <li onclick=\"$catchup_page_link\">".__('This page')."</li> -->";
-       
-                                       if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
-       
-                                       print "
-                                                       <li><span class=\"insensitive\">--------</span></li>
-                                                       <li onclick=\"catchupRelativeToArticle(0)\">".__("Above active article")."</li>
-                                                       <li onclick=\"catchupRelativeToArticle(1)\">".__("Below active article")."</li>
-                                                       <li><span class=\"insensitive\">--------</span></li>";
-                                       }
-       
-                                       print "
-                                                       <li onclick=\"$catchup_feed_link\">".__('Entire feed')."</li></ul></li>
-                                               ";
-       
-                                               $enable_pagination = get_pref($link, "_PREFS_ENABLE_PAGINATION");
-       
-                                               if ($limit != 0 && !$search && $enable_pagination) {
-                                                       print "
-                                                       <li class=\"vsep\">&nbsp;</li>
-                                                       <li class=\"top\"><a href=\"$page_next_link\">".__('Next page')."</a><ul>
-                                                               <li onclick=\"$page_prev_link\">".__('Previous page')."</li>
-                                                               <li onclick=\"$page_first_link\">".__('First page')."</li></ul></li>
-                                                               </ul>";
-                                                       }
-       
-                                               if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
-                                                       print "
-                                                               <li class=\"vsep\">&nbsp;</li>
-                                                               <li class=\"top3\">
-                                                               <a href=\"javascript:labelFromSearch('$search', '$search_mode',
-                                                                       '$match_on', '$feed_id', '$is_cat');\">
-                                                                       ".__('Convert to label')."</a></td>";
-                                               } */
-
-                                               print "</td>"; 
+                               print "</td>"; 
        
                                } else {
-                               // old style subtoolbar:
+                                       // old style subtoolbar:
        
                                        print "<td class=\"headlineActions$rtl_cpart\">".
                                                __('Select:')."
@@ -3983,34 +3930,10 @@
                                }
                        } else { // dashboard menu actions
 
-                                       print "<td class=\"headlineActions$rtl_cpart\">
-                                               <ul class=\"headlineDropdownMenu\">
-                                               <li class=\"top2\">
-                                                       <a href=\"#\" onclick=\"return displayDlg('quickAddFeed');\">".
-                                                               __('Subscribe to feed')."</a>
-                                               </li>
-                                               <li class=\"vsep\">&nbsp;</li>
-                                               <li class=\"top\">".__('Placeholder')."<ul>
-                                                       <li onclick=\"\">".__('Placeholder')."</li>
-                                                       <li onclick=\"\">".__('Placeholder')."</li>
-                                                       <li onclick=\"\">".__('Placeholder')."</li>
-                                                       </ul></li>
-                                               <li class=\"vsep\">&nbsp;</li>
-                                               <li class=\"top\">".__('Show')."<ul>
-                                                       <li onclick=\"\">".__('Update errors')."</li>
-                                                       </ul></li></ul>";
-
-                                       print "</td>";
-
+                               // not implemented
+                               print "</td>";
                        }
 
-/*                     if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
-                               print "<td class=\"headlineActions$rtl_cpart\">
-                                       <a href=\"javascript:labelFromSearch('$search', '$search_mode',
-                                                       '$match_on', '$feed_id', '$is_cat');\">
-                                               ".__('Convert to Label')."</a></td>";
-} */
-
                        print "<td class=\"headlineTitle$rtl_cpart\">";
 
                        print "<span id=\"subtoolbar_search\"