implement settings profiles (bump schema)

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

diff --git a/tt-rss.php b/tt-rss.php
index 5c216748e628bc88fe2ed4c15a741d2d31c9ddcf..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 } ?>
@@ -98,9 +98,10 @@
 
 <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>
 
@@ -167,11 +168,6 @@
        <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>
@@ -207,15 +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"/>
-
-               <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>
 
                <select name="view_mode" title="<?php echo __('Show articles') ?>" 
                                onchange="viewModeChanged()">
@@ -227,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>
@@ -237,15 +225,11 @@
                        <option value="score"><?php echo __('Score') ?></option>
                </select>
 
-               &nbsp;
-
-               <input class="button" type="submit" name="update"
-                       onclick="return viewCurrentFeed('ForceUpdate')" 
-                       value="<?php echo __('Update') ?>"/>
+               <button onclick="return viewCurrentFeed('ForceUpdate')">
+                       <?php echo __('Update') ?></button>
 
-               <input class="button" type="submit" name="update"
-                       onclick="return catchupCurrentFeed()" 
-                       value="<?php echo __('Mark as read') ?>"/>
+               <button onclick="return catchupCurrentFeed()">
+                       <?php echo __('Mark as read') ?></button>
 
                </form>
 
@@ -284,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); ?>