implement settings profiles (bump schema)

[tt-rss.git] / prefs.php
diff --git a/prefs.php b/prefs.php

index bd29bd8b299cb01dab29afa8e4469a604eee3bb7..8a0b5237aac7b6cb5084dde0512094dc677c2b95 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -26,7 +26,7 @@
         <title>Tiny Tiny RSS : Preferences</title>
         <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 } ?>
@@ -49,14 +49,13 @@
         <script type="text/javascript" charset="utf-8" src="prefs.js?<?php echo $dt_add ?>"></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">');
-               }
-       //]]>
+               Event.observe(window, 'load', function() {
+                       init();
+               });
         </script>
+
  </head>
  
  <body id="ttrssPrefs">
@@ -70,15 +69,13 @@
                 </div>
  
         <noscript>
-               <div class="error"><?php echo
-               __("Your browser doesn't support Javascript, which is required
+               <p><?php print_error(__("Your browser doesn't support Javascript, which is required
                 for this application to function properly. Please check your
-               browser settings.") ?></div>
+               browser settings.")) ?></p>
         </noscript>
         </div>
  </div> 
  
-
  <div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
         <?php rounded_table_start("hho"); ?>
         <?php include "help/4.php" ?>
@@ -87,20 +84,8 @@
  
  <img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
  
-<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="fatal_error"><div id="fatal_error_inner">
-       <h1>Fatal Error</h1>
-       <div id="fatal_error_msg"><?php echo __('Unknown Error') ?></div>
-</div></div>
-
  <div id="prefHeader">
         <div class="topLinks">
                 <?php if (!SINGLE_USER_MODE) { ?>
@@ -115,10 +100,6 @@ window.onload = init;
  </div>
  
  <div id="prefTabs">
-               <!-- <div class="return">
-                       <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
-               </div> -->
-
                 <div class='prefKbdHelp'>
                         <img src="images/small_question.png" alt="?"/> <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a>
                 </div>
@@ -128,13 +109,7 @@ window.onload = init;
                 <div id="genConfigTab" class="prefsTab" 
                         onclick="selectTab('genConfig')"><?php echo __('Preferences') ?></div>
                 <div id="feedConfigTab" class="prefsTab" 
-                       onclick="selectTab('feedConfig')"><?php echo __('My Feeds') ?></div>
-               <?php if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { ?>
-               <div id="feedBrowserTab" class="prefsTab" 
-                       onclick="selectTab('feedBrowser')"><?php echo __('Other Feeds') ?></div>
-               <?php } ?>
-               <!-- <div id="pubItemsTab" class="prefsTab" 
-                       onclick="selectTab('pubItems')"><?php echo __('Published Articles') ?></div> -->
+                       onclick="selectTab('feedConfig')"><?php echo __('Feeds') ?></div>
                 <div id="filterConfigTab" class="prefsTab" 
                         onclick="selectTab('filterConfig')"><?php echo __('Filters') ?></div>
                 <div id="labelConfigTab" class="prefsTab" 
@@ -160,6 +135,17 @@ window.onload = init;
  <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
  <div id="infoBoxShadow"><div id="infoBox">BAH</div></div>
  
+<div id="cmdline" style="display : none"></div>
+
+<div id="errorBoxShadow" style="display : none">
+       <div id="errorBox">
+       <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 id="dialog_overlay" style="display : none"> </div>
  
  <div id="prefFooter">
@@ -177,25 +163,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>