rework feed-prefs ops toolbar

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

diff --git a/tt-rss.php b/tt-rss.php
index c43cb5d81ac104937d2a32950d923487c0c90fed..caf8f9c4e4275c32fcc80c797fef96c446a54038 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -49,17 +49,13 @@
        <link rel="shortcut icon" type="image/png" href="images/favicon.png">
 
        <script type="text/javascript" src="prototype.js"></script>
+       <script type="text/javascript" src="scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
        <script type="text/javascript" src="localized_js.php?<?php echo $dt_add ?>"></script>
-
        <script type="text/javascript" src="tt-rss.js?<?php echo $dt_add ?>"></script>
        <script type="text/javascript" src="functions.js?<?php echo $dt_add ?>"></script>
        <script type="text/javascript" src="feedlist.js?<?php echo $dt_add ?>"></script>
        <script type="text/javascript" src="viewfeed.js?<?php echo $dt_add ?>"></script>
 
-       <!--[if gte IE 5.5000]>
-               <script type="text/javascript" src="pngfix.js"></script>
-               <link rel="stylesheet" type="text/css" href="tt-rss-ie.css">
-       <![endif]-->
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
        <script type="text/javascript">
@@ -110,9 +106,9 @@ window.onload = init;
        <div style="float : right">
        <?php if (!SINGLE_USER_MODE) { ?>
                        <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b>
-                       (<a href="logout.php"><?= __('Logout') ?></a>)
+                       (<a href="logout.php"><?php echo __('Logout') ?></a>)
        <?php } ?>
-       <img id="newVersionIcon" onclick="javascript:explainError(2)" 
+       <img id="newVersionIcon" style="display:none;" onclick="javascript:explainError(2)" 
                src="images/new_version.png" title="New version is available!" 
                alt="new_version_icon">
        </div>
@@ -138,13 +134,10 @@ window.onload = init;
                                        <option style="color : #5050aa" disabled><?php echo __('Feed actions:') ?></option>
                                        <option value="qmcAddFeed"><?php echo __('&nbsp;&nbsp;Subscribe to feed') ?></option>
                                        <option value="qmcEditFeed"><?php echo __('&nbsp;&nbsp;Edit this feed') ?></option>
+                                       <!-- <option value="qmcClearFeed"><?php echo __('&nbsp;&nbsp;Clear articles') ?></option> -->
                                        <option value="qmcRemoveFeed"><?php echo __('&nbsp;&nbsp;Unsubscribe') ?></option>
-                                       <!-- <option>Edit this feed</option> -->
                                        <option disabled>--------</option>
                                        <option style="color : #5050aa" disabled><?php echo __('All feeds:') ?></option>
-                                       <?php if (!ENABLE_UPDATE_DAEMON && !DAEMON_REFRESH_ONLY) { ?>
-                                       <option value="qmcUpdateFeeds"><?php echo __('&nbsp;&nbsp;Update') ?></option>
-                                       <?php } ?>
                                        <option value="qmcCatchupAll"><?php echo __('&nbsp;&nbsp;Mark as read') ?></option>
                                        <option value="qmcShowOnlyUnread"><?php echo __('&nbsp;&nbsp;(Un)hide read feeds') ?></option>
                                        <option disabled>--------</option>