config: remove option ENABLE_UPDATE_DAEMON

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

index 972e577ca6840ee6225dda5ed9e63fb839560330..41744357077c73f71306f2be74d73ee4cea7aac2 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -24,22 +24,20 @@
  <html>
  <head>
         <title>Tiny Tiny RSS : Preferences</title>
-       <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
         <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 print_theme_includes($link) ?>
+       <?php print_user_stylesheet($link) ?>
         
-       <?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 } ?>
-
         <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" djConfig="parseOnLoad: true"></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>
  
@@ -69,11 +67,7 @@
                 <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>
+               <noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript>
         </div>
  </div> 
  
@@ -88,18 +82,16 @@
  <div id="main" dojoType="dijit.layout.BorderContainer">
  
  <div id="header" dojoType="dijit.layout.ContentPane" region="top">
-       <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> | 
-               <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a>
-               <?php if (!SINGLE_USER_MODE) { ?>
-                       | <a href="logout.php"><?php echo __('Logout') ?></a>
-               <?php } ?>
+       <img style="float : left" src="<?php echo theme_image($link, 'images/logo_wide.png') ?>" title="Tiny Tiny RSS"/>        
  
-       </div>
-       <img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/>      
+       <?php if (!SINGLE_USER_MODE) { ?>
+               <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
+       <?php } ?>
+       <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a> | 
+       <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a>
+       <?php if (!SINGLE_USER_MODE) { ?>
+               | <a href="logout.php"><?php echo __('Logout') ?></a>
+       <?php } ?>
  </div>
  
  <div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs">