compat theme: properly reflow container height

4 files changed, 23 insertions, 82 deletions

diff --git a/functions.js b/functions.js
index 088b986ee..5bb559a72 100644
--- a/functions.js
+++ b/functions.js
@@ -261,6 +261,14 @@ function hotkey_handler(e) {
 			if (new_feed) viewfeed(new_feed, '');
 		}
 
+		if (shift_key && (keycode == 78 || keycode == 40)) { // shift - n, down
+			return catchupRelativeToArticle(1);
+		}
+
+		if (shift_key && (keycode == 80 || keycode == 38)) { // shift - p, up
+			return catchupRelativeToArticle(0);			
+		}
+
 		if (keycode == 78 || keycode == 40) { // n, down
 			if (typeof moveToPost != 'undefined') {
 				return moveToPost('next');
diff --git a/functions.php b/functions.php
index cb07c987e..1b92f9440 100644
--- a/functions.php
+++ b/functions.php
@@ -3870,7 +3870,6 @@
 							<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 "
@@ -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\" 
diff --git a/themes/compat/theme.css b/themes/compat/theme.css
index fcda0b431..971ab5db9 100644
--- a/themes/compat/theme.css
+++ b/themes/compat/theme.css
@@ -324,6 +324,11 @@ table.prefFeedList td.feedEditCat {
 	border-color : #c0c0c0;
 }
 
+table.prefFilterList td.filterEditCat {
+	font-size : large;
+	border-color : #c0c0c0;
+}
+
 table.prefFeedList td.feedIcon {
 	text-align : center;
 }
@@ -894,7 +899,7 @@ div.headlines_cdm {
 #footer {
 	position : absolute;
 	bottom : 0px;
-	height : 30px;
+	height : 20px;
 	text-align : center;
 	color : gray;
 	font-size : x-small;
diff --git a/tt-rss.js b/tt-rss.js
index 11ce57b73..0e4c153c0 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -359,9 +359,14 @@ function resize_headlines() {
 	var h_frame = document.getElementById("headlines-frame");
 	var c_frame = document.getElementById("content-frame");
 	var f_frame = document.getElementById("footer");
+	var feeds_frame = document.getElementById("feeds-holder");
 
 	if (!c_frame || !h_frame) return;
 
+	if (feeds_frame && getInitParam("theme") == "compat") {
+			feeds_frame.style.bottom = f_frame.offsetHeight + "px";		
+	}
+
 	if (getInitParam("theme") == "3pane") {
 		debug("resize_headlines: HOR-mode");