daemon2: check proper lockfile location in reap_children()

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

diff --git a/tt-rss.php b/tt-rss.php
index 6226c05b8319baf0c1e3d80290261011e3c3fc91..0d98c987110b6c6eec8f78a0194f4f8963bd9349 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -26,6 +26,7 @@
        <title>Tiny Tiny RSS</title>
 
        <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
+       <link rel="stylesheet" type="text/css" href="infobox.css?<?php echo $dt_add ?>"/>
 
        <?php   $user_theme = get_user_theme_path($link);
                if ($user_theme) { ?>
@@ -146,7 +147,8 @@
        </div>
 
        <img id="newVersionIcon" style="display:none;" onclick="javascript:explainError(2)" 
-               width="13" height="13" src="images/new_version.png" 
+               width="13" height="13" 
+               src="<?php echo theme_image($link, 'images/new_version.png') ?>"
                title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" 
                alt="new_version_icon"/>
 
@@ -159,7 +161,7 @@
 
        </div>
 
-       <img src="<?php echo $user_theme ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/> 
+       <img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/>      
 </div>
 
 <div id="feeds-holder">
@@ -179,7 +181,6 @@
                                        <optgroup label="<?php echo __('Feed actions:') ?>">
                                        <option value="qmcAddFeed"><?php echo __('Subscribe to feed...') ?></option>
                                        <option value="qmcEditFeed"><?php echo __('Edit this feed...') ?></option>
-                                       <!-- <option value="qmcClearFeed"><?php echo __('Clear articles') ?></option> -->
                                        <option value="qmcRescoreFeed"><?php echo __('Rescore feed') ?></option>
                                        <option value="qmcRemoveFeed"><?php echo __('Unsubscribe') ?></option>
                                        </optgroup>
@@ -187,13 +188,18 @@
                                        <option value="qmcCatchupAll"><?php echo __('Mark as read') ?></option>
                                        <option value="qmcShowOnlyUnread"><?php echo __('(Un)hide read feeds') ?></option>
                                        </optgroup>
+                                       <optgroup label="<?php echo __('Categories:') ?>">
+
+                                       <option value="qmcToggleReorder"><?php echo __('Toggle reordering mode') ?></option>
+                                       <option value="qmcResetCats"><?php echo __('Reset order') ?></option>
+                                       </optgroup>
+
                                        <optgroup label="<?php echo __('Other actions:') ?>">
 
                                        <option value="qmcAddLabel"><?php echo __('Create label...') ?></option>
                                        <option value="qmcAddFilter"><?php echo __('Create filter...') ?></option>
                                        <option value="qmcResetUI"><?php echo __('Reset UI layout') ?></option>
-                                       <option value="qmcResetCats"><?php echo __('Reset category order') ?></option>
-                                       <option value="qmcHKhelp"><?php echo __('Keyboard shortcuts') ?></option>
+                                       <option value="qmcHKhelp"><?php echo __('Keyboard shortcuts help') ?></option>
                                        </optgroup>
 
                        </select>
@@ -223,7 +229,7 @@
                        <option value="score"><?php echo __('Score') ?></option>
                </select>
 
-               <button onclick="return viewCurrentFeed('ForceUpdate')">
+               <button name="update" onclick="return viewCurrentFeed('ForceUpdate')">
                        <?php echo __('Update') ?></button>
 
                <button onclick="return catchupCurrentFeed()">
@@ -240,7 +246,8 @@
        <div id="resize-grabber"
                onmouseover="enable_resize(true)" onmouseout="enable_resize(false)"
                title="<?php echo __('Drag me to resize panels') ?>"> 
-               <img src="images/resize_handle_horiz.png" id="resize-handle" 
+               <img src="<?php echo theme_image($link, 
+                       'images/resize_handle_horiz.png') ?>" id="resize-handle" 
                        onmouseover="enable_resize(true)" onmouseout="enable_resize(false)"
                        alt=""/>
                </div>
@@ -256,7 +263,7 @@
        <?php if (!defined('HIDE_VERSION')) { ?>
                 v<?php echo VERSION ?> 
        <?php } ?>
-       &copy; 2005&ndash;2010 <a href="http://bah.org.ru/">Andrew Dolgov</a>
+       &copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
 </div>
 
 <?php db_close($link); ?>