implement settings profiles (bump schema)

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

diff --git a/tt-rss.php b/tt-rss.php
index 7b87c320f2bcc9ab1e3f4cb5173f952d3ed6e110..bf5575b95c56bea0ba4e1d017c58c3d238ab1934 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -27,7 +27,7 @@
 
        <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 ?>">
        <?php } ?>
@@ -51,16 +51,12 @@
        <script type="text/javascript" charset="utf-8" src="offline.js?<?php echo $dt_add ?>"></script>
 
        <script type="text/javascript" src="gears_init.js"></script>
-
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
        <script type="text/javascript">
-       //<![CDATA[
-               if (navigator.userAgent.match("Opera")) {
-                       document.write('<link rel="stylesheet" type="text/css" href="opera.css">');
-               }
-               window.onresize=resize_headlines;
-       //]]>
+               Event.observe(window, 'load', function() {
+                       init();
+               });
        </script>
 </head>
 
@@ -93,25 +89,19 @@
 
 <div id="dialog_overlay" style="display : none"> </div>
 
-<script type="text/javascript">
-if (document.addEventListener) {
-       document.addEventListener("DOMContentLoaded", init, null);
-}
-window.onload = init;
-</script>
-
 <ul id="debug_output" style='display : none'><li>&nbsp;</li></ul>
 
 <div id="infoBoxShadow" style="display : none"><div id="infoBox">&nbsp;</div></div>
 
 <div id="cmdline" style="display : none"></div>
-<div id="auxDlg" style="zdisplay : none"></div>
+<div id="auxDlg" style="display : none"></div>
 
 <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>
 
@@ -178,11 +168,6 @@ window.onload = init;
        <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>
@@ -218,26 +203,12 @@ window.onload = init;
 
                <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;
+               <button id="collapse_feeds_btn" onclick="collapse_feedlist()"
+                       title="<?php echo __('Collapse feedlist') ?>" style="display : none">
+                       &lt;&lt;</button>
 
-               <?php if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
-
-               <?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>
@@ -246,51 +217,22 @@ window.onload = init;
                        <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>
 
-               <!-- &nbsp;<input class="button" type="submit"
-                       onclick="quickMenuGo('qmcSearch')" value="Search (tmp)"> -->
-
-               <!-- <input class="button" type="submit"
-                       onclick="catchupCurrentFeed()" value="Mark as read">  -->
-
        </div>
 
 <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
@@ -326,25 +268,10 @@ window.onload = init;
        <?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); ?>
 
-<script type="text/javascript">
-       /* for IE */
-       function statechange() {
-               if (document.readyState == "interactive") init();
-       }
-
-       if (document.readyState) {      
-               if (document.readyState == "interactive" || document.readyState == "complete") {
-                       init();
-               } else {
-                       document.onreadystatechange = statechange;
-               }
-       }
-</script>
-
 </body>
 </html>