]> git.wh0rd.org - tt-rss.git/blobdiff - prefs.php
modify include path order (closes #514)
[tt-rss.git] / prefs.php
index 9d2d0a846766c034f8e77cb1d3cefdc4daf98327..d83e2ddf3491b9248e139c900e5f85a4afce01eb 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -1,53 +1,55 @@
 <?php
-       error_reporting(E_ERROR | E_WARNING | E_PARSE);
+       set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+               get_include_path());
 
-       require_once "functions.php"; 
+       require_once "functions.php";
        require_once "sessions.php";
        require_once "sanity_check.php";
-       require_once "version.php"; 
+       require_once "version.php";
        require_once "config.php";
        require_once "db-prefs.php";
 
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
+       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+
+       if (!init_connection($link)) return;
 
        login_sequence($link);
 
-       $dt_add = get_script_dt_add();
+       $dt_add = time();
 
        no_cache_incantation();
-       
+
        header('Content-Type: text/html; charset=utf-8');
-       
+
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-       <title>Tiny Tiny RSS : Preferences</title>
+       <title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
+       <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
        <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
 
-       <?php   $user_theme = get_user_theme_path($link);
-               if ($user_theme) { ?>
-               <link rel="stylesheet" type="text/css" href="<?php echo $user_theme ?>/theme.css"/>
-       <?php } ?>
-       
-       <?php $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?>
-       <?php if ($user_css_url) { ?>
-               <link type="text/css" href="<?php echo $user_css_url ?>"/> 
-       <?php } ?>
+       <?php print_theme_includes($link) ?>
+       <?php print_user_stylesheet($link) ?>
 
        <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 
        <script type="text/javascript" src="lib/prototype.js"></script>
+       <script type="text/javascript" src="lib/position.js"></script>
        <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
+       <script type="text/javascript" src="lib/dojo/dojo.js"></script>
+       <script type="text/javascript" src="lib/dijit/dijit.js"></script>
+       <script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
 
        <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
 
-       <script type="text/javascript" charset="utf-8" src="functions.js?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" charset="utf-8" src="prefs.js?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="js/functions.js?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="js/deprecated.js?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="js/prefs.js?<?php echo $dt_add ?>"></script>
 
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-               
+
        <script type="text/javascript">
                Event.observe(window, 'load', function() {
                        init();
 
 </head>
 
-<body id="ttrssPrefs">
+<body id="ttrssPrefs" class="claro">
+
+<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
+<div id="cmdline" style="display : none"></div>
 
 <div id="overlay">
        <div id="overlay_inner">
-               <?php echo __("Loading, please wait...") ?>
-
-               <div id="l_progress_o">
-                       <div id="l_progress_i"></div>
+               <div class="insensitive"><?php echo __("Loading, please wait...") ?></div>
+               <div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar"
+            progress="0" maximum="100">
                </div>
-
-       <noscript>
-               <p><?php print_error(__("Your browser doesn't support Javascript, which is required
-               for this application to function properly. Please check your
-               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" ?>
-       <?php rounded_table_end(); ?>
-</div>
-
-<img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
-
-<ul id="debug_output" style='display : none'><li>&nbsp;</li></ul>
-
-<div id="prefHeader">
-       <div class="topLinks">
-               <?php if (!SINGLE_USER_MODE) { ?>
-                       <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
-               <?php } ?>
-               <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
-               <?php if (!SINGLE_USER_MODE) { ?>
-                       | <a href="logout.php"><?php echo __('Logout') ?></a>
-               <?php } ?>
+               <noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript>
        </div>
-       <img src="<?php echo $user_theme ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/> 
 </div>
 
-<div id="prefTabs">
-               <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>
+<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"></div>
 
-               <div class="firstTab">&nbsp;</div>
-
-               <div id="genConfigTab" class="prefsTab" 
-                       onclick="selectTab('genConfig')"><?php echo __('Preferences') ?></div>
-               <div id="feedConfigTab" class="prefsTab" 
-                       onclick="selectTab('feedConfig')"><?php echo __('Feeds') ?></div>
-               <div id="filterConfigTab" class="prefsTab" 
-                       onclick="selectTab('filterConfig')"><?php echo __('Filters') ?></div>
-               <div id="labelConfigTab" class="prefsTab" 
-                       onclick="selectTab('labelConfig')"><?php echo __('Labels') ?></div>
-               <?php if ($_SESSION["access_level"] >= 10) { ?>
-               <div id="userConfigTab" class="prefsTab" 
-                       onclick="selectTab('userConfig')"><?php echo __('Users') ?></div>
-               <?php } ?>              
-</div>
+<img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
 
-<div id="prefContentOuter">
-<div id="prefContent">
-       <p><?php echo __('Loading, please wait...') ?></p>
-       <noscript>
-               <div class="error">
-               <?php echo __("Your browser doesn't support Javascript, which is required
-               for this application to function properly. Please check your
-               browser settings.") ?></div>
-       </noscript>
+<div id="header" dojoType="dijit.layout.ContentPane" region="top">
+       <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> |
+       <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
 </div>
-</div>
-
-<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="main" dojoType="dijit.layout.BorderContainer">
+
+<div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs">
+<div id="genConfigTab" dojoType="dijit.layout.ContentPane"
+       href="backend.php?op=pref-prefs"
+       title="<?php echo __('Preferences') ?>"></div>
+<div id="feedConfigTab" dojoType="dijit.layout.ContentPane"
+       href="backend.php?op=pref-feeds"
+       title="<?php echo __('Feeds') ?>"></div>
+<div id="filterConfigTab" dojoType="dijit.layout.ContentPane"
+       href="backend.php?op=pref-filters"
+       title="<?php echo __('Filters') ?>"></div>
+<div id="labelConfigTab" dojoType="dijit.layout.ContentPane"
+       href="backend.php?op=pref-labels"
+       title="<?php echo __('Labels') ?>"></div>
+<?php if ($_SESSION["access_level"] >= 10) { ?>
+       <div id="userConfigTab" dojoType="dijit.layout.ContentPane"
+               href="backend.php?op=pref-users"
+               title="<?php echo __('Users') ?>"></div>
+<?php } ?>
+<?php if ($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) { ?>
+       <div id="instanceConfigTab" dojoType="dijit.layout.ContentPane"
+               href="backend.php?op=pref-instances"
+               title="<?php echo __('Linked') ?>"></div>
+<?php } ?>
 
-<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="footer" dojoType="dijit.layout.ContentPane" region="bottom">
+       <a class="insensitive" target="_blank" href="http://tt-rss.org/">
+       Tiny Tiny RSS</a> &copy; 2005-<?php echo date('Y') ?>
+       <a class="insensitive" target="_blank"
+       href="http://fakecake.org/">Andrew Dolgov</a>
+</div> <!-- footer -->
 
-<div id="prefFooter">
-       <a href="http://tt-rss.org/">Tiny Tiny RSS</a>
-       <?php if (!defined('HIDE_VERSION')) { ?>
-                v<?php echo VERSION ?> 
-       <?php } ?>
-       &copy; 2005&ndash;2010 <a href="http://bah.org.ru/">Andrew Dolgov</a>
 </div>
 
 <?php db_close($link); ?>