]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.php
neon updates; make more icons themeable; misc fixes
[tt-rss.git] / tt-rss.php
index fd3c88d4e9d7585b80926ddc0aa2b026b5211ae0..0d3186d3499342c06e27ed04ae73e01564d83fde 100644 (file)
 
        <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
 
-       <?php   $user_theme = $_SESSION["theme"];
+       <?php   $user_theme = get_user_theme_path($link);
                if ($user_theme) { ?>
-                       <link rel="stylesheet" type="text/css" href="themes/<?php echo $user_theme ?>/theme.css?<?php echo $dt_add ?>">
+                       <link rel="stylesheet" type="text/css" href="<?php echo $user_theme ?>/theme.css?<?php echo $dt_add ?>">
        <?php } ?>
 
-       <?php if ($user_theme) { $theme_image_path = "themes/$user_theme/"; } ?>
-
        <?php $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?>
        <?php if ($user_css_url) { ?>
                <link rel="stylesheet" type="text/css" href="<?php echo $user_css_url ?>"/> 
 
 <div id="errorBoxShadow" style="display : none">
        <div id="errorBox">
-               <div id="xebTitle">Fatal Exception</div><div id="xebContent">&nbsp;</div>
-               <div id="xebBtn" align='center'><input type="submit" 
-                       onclick="closeErrorBox()" value="Close this window"/></div>
+       <div id="xebTitle"><?php echo __('Fatal Exception') ?></div><div id="xebContent">&nbsp;</div>
+               <div id="xebBtn" align='center'>
+                       <button onclick="closeErrorBox()"><?php echo __('Close this window') ?></button>
+               </div>
        </div>
 </div>
 
        </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"/>
 
 
        </div>
 
-       <img src="<?php echo $theme_image_path ?>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">
        <div id="dispSwitch"> 
                <a id="dispSwitchPrompt" 
                        href="javascript:toggleTags()"><?php echo __("tag cloud") ?></a>
-               <?php if (!SINGLE_USER_MODE && ENABLE_FEED_BROWSER) { ?>
-               <br/>
-               <a id="feedBrowserPrompt" onclick="return browseFeeds()" href="#"
-                       title="<?php echo __('More feeds...') ?>">+</a>
-               <?php } ?>
        </div>
        <div id="feeds-frame">&nbsp;</div>
 </div>
 
                <form id="main_toolbar_form" action="" onsubmit='return false'>
 
-               <input type="submit" value="&lt;&lt;" 
-                       id="collapse_feeds_btn" onclick="collapse_feedlist()" class="button"
-                       title="<?php echo __('Collapse feedlist') ?>" style="display : none"/>
-
-               <input type="submit" value="<?php echo __("Toggle Feedlist") ?>" 
-                       id="toggle_feeds_btn" class="button"
-                       onclick="toggle_feedlist()" style="display : none"/>
-
-               &nbsp;
-
-               <?php if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
+               <button id="collapse_feeds_btn" onclick="collapse_feedlist()"
+                       title="<?php echo __('Collapse feedlist') ?>" style="display : none">
+                       &lt;&lt;</button>
 
-               <?php echo __('Search:') ?>
-               <input name="query" type="text"
-                       onkeypress="return filterCR(event, viewCurrentFeed)"
-                       onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();"/>
-
-               <?php } ?>
-
-               <select name="view_mode" onchange="viewModeChanged()">
+               <select name="view_mode" title="<?php echo __('Show articles') ?>" 
+                               onchange="viewModeChanged()">
                        <option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
                        <option value="all_articles"><?php echo __('All Articles') ?></option>
                        <option value="marked"><?php echo __('Starred') ?></option>
                        <option value="updated"><?php echo __('Updated') ?></option>
                </select>
 
-               <?php echo __('Order:') ?>
-
-               <select name="order_by" onchange="viewModeChanged()">
+               <select title="<?php echo __('Sort articles') ?>" 
+                               name="order_by" onchange="viewModeChanged()">
                        <option selected="selected" value="default"><?php echo __('Default') ?></option>
                        <option value="date"><?php echo __('Date') ?></option>
                        <option value="title"><?php echo __('Title') ?></option>
                        <option value="score"><?php echo __('Score') ?></option>
                </select>
 
+               <button onclick="return viewCurrentFeed('ForceUpdate')">
+                       <?php echo __('Update') ?></button>
 
-               <?php echo __('Limit:') ?>
-               <?php
-               $limits = array(15 => 15, 30 => 30, 60 => 60, 0 => __("All"));
-                       
-               $def_art_limit = get_pref($link, 'DEFAULT_ARTICLE_LIMIT');
-
-               if ($def_art_limit >= 0 && !array_key_exists($def_art_limit, $limits)) {
-                       $limits[$def_art_limit] = $def_art_limit; 
-               }
-
-               asort($limits);
-
-               if (!$def_art_limit) {
-                       $def_art_limit = 30;
-               }
-
-               print_select_hash("limit", $def_art_limit, $limits, 
-                       'onchange="viewLimitChanged()"');
-       
-               ?>              
-
-               &nbsp;
-
-               <input class="button" type="submit" name="update"
-                       onclick="return viewCurrentFeed('ForceUpdate')" 
-                       value="<?php echo __('Update') ?>"/>
+               <button onclick="return catchupCurrentFeed()">
+                       <?php echo __('Mark as read') ?></button>
 
                </form>
 
        <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>
 <?php } ?>
 
 <div id="footer">
-       <?php if (defined('_DEBUG_USER_SWITCH')) { ?>
-               <select id="userSwitch" onchange="userSwitch()">
-               <?php 
-                       foreach (array('admin', 'fox', 'test') as $u) {
-                               $op_sel = ($u == $_SESSION["name"]) ? "selected" : "";
-                               print "<option $op_sel>$u</option>";
-                       }
-               ?>
-               </select>
-       <?php } ?>
        <a href="http://tt-rss.org/">Tiny Tiny RSS</a>
        <?php if (!defined('HIDE_VERSION')) { ?>
                 v<?php echo VERSION ?> 
        <?php } ?>
-       &copy; 2005&ndash;2009 <a href="http://bah.org.ru/">Andrew Dolgov</a>
+       &copy; 2005&ndash;2010 <a href="http://bah.org.ru/">Andrew Dolgov</a>
 </div>
 
 <?php db_close($link); ?>