neon updates; make more icons themeable; misc fixes

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

index 99c00fd21f931bb88a7501fb7cfdb7405a088e1a..86c2110464405e6ea781bffe393c778d23ddc0a6 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -26,12 +26,10 @@
         <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"/>
+               <link rel="stylesheet" type="text/css" href="<?php echo $user_theme ?>/theme.css"/>
         <?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) { ?>
@@ -49,14 +47,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">
@@ -85,13 +82,6 @@
  
  <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="prefHeader">
@@ -104,16 +94,12 @@ window.onload = init;
                         | <a href="logout.php"><?php echo __('Logout') ?></a>
                 <?php } ?>
         </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="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>
+                       <img src="<?php echo theme_image($link, 'images/small_question.png') ?>" alt="?"/> <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a>
                 </div>
  
                 <div class="firstTab">&nbsp;</div>
@@ -147,50 +133,28 @@ 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">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 id="dialog_overlay" style="display : none"> </div>
  
  <div id="prefFooter">
-       <?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); ?>
  
-<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>