headlines toolbar: move selection links into the dropdown

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index 61b1f738e58958bccb948b497d36d80a0559bf77..8f101e5cb774e46c74f027fd9100665d1d2bb423 100755 (executable)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -86,17 +86,23 @@ class Feeds extends Handler_Protected {
                $reply .= "<span class=\"main\">";
                $reply .= "<span id='selected_prompt'></span>";
 
-               $reply .= "<span class=\"sel_links\">
+               /*$reply .= "<span class=\"sel_links\">
                        <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>";
 
-               $reply .= "</span> ";
+               $reply .= "</span> "; */
 
                $reply .= "<select dojoType=\"dijit.form.Select\"
                        onchange=\"headlineActionsChange(this)\">";
-               $reply .= "<option value=\"false\">".__('More...')."</option>";
+
+               $reply .= "<option value=\"0\" disabled='1'>".__('Select...')."</option>";
+
+               $reply .= "<option value=\"$sel_all_link\">".__('All')."</option>";
+               $reply .= "<option value=\"$sel_unread_link\">".__('Unread')."</option>";
+               $reply .= "<option value=\"$sel_inv_link\">".__('Invert')."</option>";
+               $reply .= "<option value=\"$sel_none_link\">".__('None')."</option>";
 
                $reply .= "<option value=\"0\" disabled=\"1\">".__('Selection toggle:')."</option>";
 
@@ -203,6 +209,9 @@ class Feeds extends Handler_Protected {
                                                                WHERE id = '$feed'");
                                        }
                                }
+                       } else {
+                               $this->dbh->query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
+                                                               WHERE id = '$feed'");
                        }
                }
 
@@ -462,7 +471,7 @@ class Feeds extends Handler_Protected {
 
                                                        $vf_catchup_link = "<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
 
-                                                       $reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
+                                                       $reply['content'] .= "<div data-feed-id='$feed_id' id='FTITLE-$feed_id' class='cdmFeedTitle'>".
                                                                "<div style='float : right'>$feed_icon_img</div>".
                                                                "<a class='title' href=\"#\" onclick=\"viewfeed({feed:$feed_id})\">".
                                                                $line["feed_title"]."</a>
@@ -475,7 +484,7 @@ class Feeds extends Handler_Protected {
                                        $mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
                                                onmouseout='postMouseOut($id)'";
 
-                                       $reply['content'] .= "<div class='hl $class' orig-feed-id='$feed_id' id='RROW-$id' $mouseover_attrs>";
+                                       $reply['content'] .= "<div class='hl $class' data-orig-feed-id='$feed_id' data-article-id='$id' id='RROW-$id' $mouseover_attrs>";
 
                                        $reply['content'] .= "<div class='hlLeft'>";
 
@@ -567,7 +576,7 @@ class Feeds extends Handler_Protected {
                                                                //$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
                                                        }
 
-                                                       $reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
+                                                       $reply['content'] .= "<div data-feed-id='$feed_id' id='FTITLE-$feed_id' class='cdmFeedTitle'>".
                                                                "<div style=\"float : right\">$feed_icon_img</div>".
                                                                "<a href=\"#\" class='title' onclick=\"viewfeed({feed:$feed_id})\">".
                                                                $line["feed_title"]."</a> $vf_catchup_link</div>";
@@ -581,7 +590,7 @@ class Feeds extends Handler_Protected {
                                        $expanded_class = $expand_cdm ? "expanded" : "expandable";
 
                                        $reply['content'] .= "<div class=\"cdm $hlc_suffix $expanded_class $class\"
-                                               id=\"RROW-$id\" orig-feed-id='$feed_id' $mouseover_attrs>";
+                                               id=\"RROW-$id\" data-article-id='$id' data-orig-feed-id='$feed_id' $mouseover_attrs>";
 
                                        $reply['content'] .= "<div class=\"cdmHeader\">";
                                        $reply['content'] .= "<div style=\"vertical-align : middle\">";
@@ -1069,10 +1078,12 @@ class Feeds extends Handler_Protected {
 
                                " <input dojoType=\"dijit.form.TextBox\" name='login'\"
                                        placeHolder=\"".__("Login")."\"
+                                       autocomplete=\"new-password\"
                                        style=\"width : 10em;\"> ".
                                " <input
                                        placeHolder=\"".__("Password")."\"
                                        dojoType=\"dijit.form.TextBox\" type='password'
+                                       autocomplete=\"new-password\"
                                        style=\"width : 10em;\" name='pass'\">
                        </div></div>";