";
-
- print "";
- print "";
+ generate_dashboard_feed($link);
} else {
diff --git a/functions.php b/functions.php
index 71b613bef..25ecec1c2 100644
--- a/functions.php
+++ b/functions.php
@@ -3755,7 +3755,8 @@
function print_headline_subtoolbar($link, $feed_site_url, $feed_title,
$bottom = false, $rtl_content = false, $feed_id = 0,
$is_cat = false, $search = false, $match_on = false,
- $search_mode = false, $offset = 0, $limit = 0) {
+ $search_mode = false, $offset = 0, $limit = 0,
+ $dashboard_menu = 0, $disable_feed = 0, $feed_small_icon = 0) {
$user_page_offset = $offset + 1;
@@ -3806,86 +3807,110 @@
}
- if (strpos($_SESSION["client.userAgent"], "MSIE") === false) {
+ if (!$dashboard_menu) {
- print "
- | ";
-
- } else {
- // old style subtoolbar:
-
- print "".
- __('Select:')."
- ".__('All').",
- ".__('Unread').",
- ".__('None')."
- ".
- __('Toggle:')." ".__('Unread').",
- ".__('Starred')."
- ".
- __('Mark as read:')."
- ".__('Page').",
- ".__('Feed')."";
-
- if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
-
- print "
-
- ".__('Convert to label')."";
+
+ print "
+ ".__('Entire feed')."
+ ";
+
+ $enable_pagination = get_pref($link, "_PREFS_ENABLE_PAGINATION");
+
+ if ($limit != 0 && !$search && $enable_pagination) {
+ print "
+
+ ".__('Next page')."
+ - ".__('Previous page')."
+ - ".__('First page')."
+ ";
+ }
+
+ if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
+ print "
+
+
+
+ ".__('Convert to label')." | ";
+ }
+ print "
+ ";
+
+ } else {
+ // old style subtoolbar:
+
+ print "".
+ __('Select:')."
+ ".__('All').",
+ ".__('Unread').",
+ ".__('None')."
+ ".
+ __('Toggle:')." ".__('Unread').",
+ ".__('Starred')."
+ ".
+ __('Mark as read:')."
+ ".__('Page').",
+ ".__('Feed')."";
+
+ if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
+
+ print "
+
+ ".__('Convert to label')."";
+ }
+
+ print " | ";
+
}
+ } else { // dashboard menu actions
- print "";
+ print "
+ ";
+
+ print " | ";
}
@@ -3920,13 +3945,15 @@
print "";
- if (!$bottom) {
+ if (!$bottom && !$disable_feed) {
print "
";
+ } else if ($feed_small_icon) {
+ print "";
}
print "";
@@ -5329,4 +5356,27 @@
} // function update_daemon_common
+ function generate_dashboard_feed($link) {
+
+ print "";
+
+ print_headline_subtoolbar($link, "", "Dashboard",
+ false, false, -4, false, false, false,
+ false, 0, 0, true, true, "tag.png");
+
+ print "
";
+ print "
There is 666 unread articles in 666 feeds.
";
+ print "
";
+
+ print "
";
+
+ print "]]>";
+ print "";
+ print "";
+ print "";
+
+ print "";
+ print "";
+ }
+
?>
diff --git a/tt-rss.css b/tt-rss.css
index 1d8ff2f89..3c75196bb 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1730,3 +1730,6 @@ div.topLinks a.feedback {
color : #009900;
}
+div.dashboard {
+ margin-left : 3px;
+}