implement settings profiles (bump schema)

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

diff --git a/tt-rss.php b/tt-rss.php
index 6e40333ca5c07b2a1749ad8461075a839e94693b..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 } ?>
@@ -203,11 +203,9 @@
 
                <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"/>
-
-               &nbsp;
+               <button id="collapse_feeds_btn" onclick="collapse_feedlist()"
+                       title="<?php echo __('Collapse feedlist') ?>" style="display : none">
+                       &lt;&lt;</button>
 
                <select name="view_mode" title="<?php echo __('Show articles') ?>" 
                                onchange="viewModeChanged()">
@@ -219,8 +217,6 @@
                        <option value="updated"><?php echo __('Updated') ?></option>
                </select>
 
-               &nbsp;
-
                <select title="<?php echo __('Sort articles') ?>" 
                                name="order_by" onchange="viewModeChanged()">
                        <option selected="selected" value="default"><?php echo __('Default') ?></option>
@@ -229,8 +225,6 @@
                        <option value="score"><?php echo __('Score') ?></option>
                </select>
 
-               &nbsp;
-
                <button onclick="return viewCurrentFeed('ForceUpdate')">
                        <?php echo __('Update') ?></button>
 
@@ -274,7 +268,7 @@
        <?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); ?>