add catchup button to main toolbar

diff --git a/functions.php b/functions.php
index 3d71566c6dcd9f000535e2f84d4111f8b69fc1a0..d7ebef3fc143fdcb978e739a8000ffb0133bb5d9 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -4115,23 +4115,20 @@
                                <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 class=\"insensitive\">".__('Mark as read:')."</li>
-                               <li onclick=\"$catchup_sel_link\">&nbsp;&nbsp;".__('Selection')."</li>";
+                               <li class=\"insensitive\">".__('Selection:')."</li>
+                               <li onclick=\"$catchup_sel_link\">&nbsp;&nbsp;".__('Mark as read')."</li>";
 
-                       print "<li onclick=\"$catchup_feed_link\">&nbsp;&nbsp;".__('Entire feed').
-                               "</li>";
+//                     print "<li onclick=\"$catchup_feed_link\">&nbsp;&nbsp;".__('Entire feed').
+//                             "</li>";
 
                        if ($feed_id != "0") {
-                               print "<li class=\"insensitive\">".__('Selection:')."</li>
-                                       <li onclick=\"$archive_sel_link\">&nbsp;&nbsp;".__('Archive')."</li>
-                                       <li onclick=\"$delete_sel_link\">&nbsp;&nbsp;".__('Delete')."</li>";
+                               print "<li onclick=\"$archive_sel_link\">&nbsp;&nbsp;".__('Archive')."</li>";
                        } else {
-                               print "<li class=\"insensitive\">".__('Selection:')."</li>
-                                       <li onclick=\"$archive_sel_link\">&nbsp;&nbsp;".__('Move back')."</li>
-                                       <li onclick=\"$delete_sel_link\">&nbsp;&nbsp;".__('Delete')."</li>";
+                               print "<li onclick=\"$archive_sel_link\">&nbsp;&nbsp;".__('Move back')."</li>";
                        } 
 
+                       print "<li onclick=\"$delete_sel_link\">&nbsp;&nbsp;".__('Delete')."</li>";
+
                        //print "<li><span class=\"insensitive\">--------</span></li>";
                        print "<li class=\"insensitive\">".__('Assign label:')."</li>";
 

diff --git a/tt-rss.php b/tt-rss.php
index fd3c88d4e9d7585b80926ddc0aa2b026b5211ae0..de08e7a9cff5a5b0c7d8eb50fd0d99ded069aec2 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -244,7 +244,6 @@
                        <option value="score"><?php echo __('Score') ?></option>
                </select>
 
-
                <?php echo __('Limit:') ?>
                <?php
                $limits = array(15 => 15, 30 => 30, 60 => 60, 0 => __("All"));
@@ -263,7 +262,7 @@
 
                print_select_hash("limit", $def_art_limit, $limits, 
                        'onchange="viewLimitChanged()"');
-       
+
                ?>              
 
                &nbsp;
@@ -272,6 +271,10 @@
                        onclick="return viewCurrentFeed('ForceUpdate')" 
                        value="<?php echo __('Update') ?>"/>
 
+               <input class="button" type="submit" name="update"
+                       onclick="return catchupCurrentFeed()" 
+                       value="<?php echo __('Mark as read') ?>"/>
+
                </form>
 
        </div>