]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.php
git.wh0rd.org / tt-rss.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update_daemon2: import single-file version from landure
[tt-rss.git] / tt-rss.php
diff --git a/tt-rss.php b/tt-rss.php
index 8e785569ef4e0bd010867dcc2c136eba2567d0c2..163686d702e3bc5f25c1815f5d8fae48c8882f08 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -23,11 +23,11 @@
 <head>
        <title>Tiny Tiny RSS</title>
 
-       <link rel="stylesheet" type="text/css" href="tt-rss.css">
+       <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>">
 
        <?php   $user_theme = $_SESSION["theme"];
                if ($user_theme) { ?>
-               <link rel="stylesheet" type="text/css" href="themes/<?php echo $user_theme ?>/theme.css">
+                       <link rel="stylesheet" type="text/css" href="themes/<?php echo $user_theme ?>/theme.css?<?php echo $dt_add ?>">
        <?php } ?>
 
        <?php if ($user_theme) { $theme_image_path = "themes/$user_theme/"; } ?>
@@ -49,7 +49,7 @@
        <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"></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>
@@ -103,12 +103,22 @@ window.onload = init;
 <div id="infoBoxShadow"><div id="infoBox">&nbsp;</div></div>
 
 <div id="header">
-       <div style="float : right">
+       <div class="topLinks">
        <?php if (!SINGLE_USER_MODE) { ?>
-                       <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b>
-                       (<a href="logout.php"><?= __('Logout') ?></a>)
+                       <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
        <?php } ?>
-       <img id="newVersionIcon" onclick="javascript:explainError(2)" 
+       <a href="prefs.php"><?php echo __('Preferences') ?></a>
+
+       <?php if (defined('FEEDBACK_URL')) { ?>
+               | <a target="_blank" class="feedback" href="<?php echo FEEDBACK_URL ?>">
+                               <?php echo __('Comments?') ?></a>
+       <?php } ?>
+
+       <?php if (!SINGLE_USER_MODE) { ?>
+                       | <a href="logout.php"><?php echo __('Logout') ?></a>
+       <?php } ?>
+
+       <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>
@@ -129,18 +139,15 @@ window.onload = init;
                        <select id="quickMenuChooser" onchange="quickMenuChange()">
                                        <option value="qmcDefault" selected><?php echo __('Actions...') ?></option>
                                        <option value="qmcSearch"><?php echo __('Search') ?></option>
-                                       <option value="qmcPrefs"><?php echo __('Preferences') ?></option>
+                                       <!-- <option value="qmcPrefs"><?php echo __('Preferences') ?></option> -->
                                        <option disabled>--------</option>
                                        <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>
@@ -154,7 +161,7 @@ window.onload = init;
                <?php if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
 
                <?php echo __('Search:') ?>
-               <input name="query"
+               <input name="query" type="search"
                        onKeyPress="return filterCR(event, viewCurrentFeed)"
                        onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();">
 
@@ -225,7 +232,7 @@ window.onload = init;
                ?>
                </select>
        <?php } ?>
-       <a href="http://tt-rss.spb.ru/">Tiny Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005-2007 <a href="http://bah.org.ru/">Andrew Dolgov</a>
+       <a href="http://tt-rss.org/">Tiny Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005&ndash;2007 <a href="http://bah.org.ru/">Andrew Dolgov</a>
 </div>
 
 <?php db_close($link); ?>
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/