js: misc fixes, code cleanup

[tt-rss.git] / functions.php

diff --git a/functions.php b/functions.php
index 2102836f8ddb9fe8d40addc75d7ec5db80615150..7ab6fabb37800db756a4b86e5ca4fb6836aacbe9 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -4137,30 +4137,14 @@
                        $archive_sel_link = "javascript:archiveSelection()";
                        $delete_sel_link = "javascript:deleteSelection()";
 
-                       if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+                       $sel_all_link = "javascript:selectArticles('all')";
+                       $sel_unread_link = "javascript:selectArticles('unread')";
+                       $sel_none_link = "javascript:selectArticles('none')";
+                       $sel_inv_link = "javascript:selectArticles('invert')";
 
-                               $sel_all_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)";
-                               $sel_unread_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)";
-                               $sel_none_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)";
-                               $sel_inv_link = "javascript:invertHeadlineSelection()";
-
-                               $tog_unread_link = "javascript:selectionToggleUnread()";
-                               $tog_marked_link = "javascript:selectionToggleMarked()";
-                               $tog_published_link = "javascript:selectionTogglePublished()";
-
-                       } else {
-
-                               $sel_all_link = "javascript:cdmSelectArticles('all')";
-                               $sel_unread_link = "javascript:cdmSelectArticles('unread')";
-                               $sel_none_link = "javascript:cdmSelectArticles('none')";
-
-                               $sel_inv_link = "javascript:invertHeadlineSelection()";
-
-                               $tog_unread_link = "javascript:selectionToggleUnread()";
-                               $tog_marked_link = "javascript:selectionToggleMarked()";
-                               $tog_published_link = "javascript:selectionTogglePublished()";
-
-                       }
+                       $tog_unread_link = "javascript:selectionToggleUnread()";
+                       $tog_marked_link = "javascript:selectionToggleMarked()";
+                       $tog_published_link = "javascript:selectionTogglePublished()";
 
                        print "<div id=\"subtoolbar_ftitle\">";
 
@@ -4223,10 +4207,10 @@
                        print "</div>";
 
                        print __('Select:')."
-                               <a href=\"$sel_all_link\">".__('All')."</a>,
-                               <a href=\"$sel_unread_link\">".__('Unread')."</a>,
-                               <a href=\"$sel_inv_link\">".__('Invert')."</a>,
-                               <a href=\"$sel_none_link\">".__('None')."</a></li>";
+                               <a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>,
+                               <a href=\"#\" onclick=\"$sel_unread_link\">".__('Unread')."</a>,
+                               <a href=\"#\" onclick=\"$sel_inv_link\">".__('Invert')."</a>,
+                               <a href=\"#\" onclick=\"$sel_none_link\">".__('None')."</a></li>";
 
                        print "&nbsp;&nbsp;";
 
@@ -5269,7 +5253,6 @@
                                        print "<td class='hlMarkedPic'>$published_pic</td>";
 
                                        print "<td onclick='return hlClicked(event,$id)' 
-                                               title=\"".__("Click to select, ctrl-click selects multiple")."\"
                                                class='hlContent$hlc_suffix' valign='middle' id='HLC-$id'>";
 
                                        print "<a id=\"RTITLE-$id\" 
@@ -5392,7 +5375,6 @@
                                        print "</div>";
 
                                        print "<div class=\"cdmContent\" $content_hidden
-                                               title=\"".__("Click to select, ctrl-click selects multiple")."\"
                                                onclick=\"return cdmClicked(event, $id);\"
                                                id=\"CICD-$id\">";
 
@@ -5538,7 +5520,31 @@
                                        }
                        }
 
-                       if (!$offset) print "<div class='whiteBox'>$message</div>";
+                       if (!$offset && $message) {
+                               print "<div class='whiteBox'>$message";
+
+                               print "<p class=\"small\"><span class=\"insensitive\">";
+
+                               $result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+                                       WHERE owner_uid = " . $_SESSION['uid']);
+               
+                               $last_updated = db_fetch_result($result, 0, "last_updated");
+                               $last_updated = make_local_datetime($link, $last_updated, false);
+               
+                               printf(__("Feeds last updated at %s"), $last_updated);
+               
+                               $result = db_query($link, "SELECT COUNT(id) AS num_errors
+                                       FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
+               
+                               $num_errors = db_fetch_result($result, 0, "num_errors");
+               
+                               if ($num_errors > 0) {
+                                       print "<br/>";
+                                       print "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
+                                               __('Some feeds have update errors (click for details)')."</a>";
+                               }
+                               print "</span></p></div>";
+                       }
                }
 
                if (!$offset) {