]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.php
git.wh0rd.org / tt-rss.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
do not require themed images to be overridden
[tt-rss.git] / prefs.php
diff --git a/prefs.php b/prefs.php
index 8541a51af4a0d756c0935cad850aeb4d217e4a4d..7d1ff3379a53ccb4377cfdf8b6c62aa5d8cb33a4 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) { ?>
@@ -40,8 +38,8 @@
 
        <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 
-       <script type="text/javascript" src="prototype.js"></script>
-       <script type="text/javascript" src="scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
+       <script type="text/javascript" src="lib/prototype.js"></script>
+       <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
 
        <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
 
@@ -49,17 +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">');
-               }
-               if (navigator.userAgent.match("Gecko") && !navigator.userAgent.match("KHTML")) {
-                       document.write('<link rel="stylesheet" type="text/css" href="gecko.css">');
-               }
-       //]]>
+               Event.observe(window, 'load', function() {
+                       init();
+               });
        </script>
+
 </head>
 
 <body id="ttrssPrefs">
@@ -73,15 +67,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" ?>
@@ -90,20 +82,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) { ?>
@@ -114,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})">Keyboard shortcuts</a>
+                       <img src="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>
@@ -131,22 +107,14 @@ 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 __('Content Filtering') ?></div>
-               <?php if (get_pref($link, 'ENABLE_LABELS')) { ?>
+                       onclick="selectTab('filterConfig')"><?php echo __('Filters') ?></div>
                <div id="labelConfigTab" class="prefsTab" 
-                       onclick="selectTab('labelConfig')"><?php echo __('Label Editor') ?></div>
-               <?php } ?>
+                       onclick="selectTab('labelConfig')"><?php echo __('Labels') ?></div>
                <?php if ($_SESSION["access_level"] >= 10) { ?>
                <div id="userConfigTab" class="prefsTab" 
-                       onclick="selectTab('userConfig')"><?php echo __('User Manager') ?></div>
+                       onclick="selectTab('userConfig')"><?php echo __('Users') ?></div>
                <?php } ?>              
 </div>
 
@@ -165,42 +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"><?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;2008 <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>
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/