new style exception reporting

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

index dd14d8b69002bf130b3a4e7dec7787de1f6d9e44..7223b3b3ddba396fb7914461ccb8eb53e30755b4 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -15,7 +15,9 @@
         $dt_add = get_script_dt_add();
  
         no_cache_incantation();
-
+       
+       header('Content-Type: text/html; charset=utf-8');
+       
  ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -38,13 +40,13 @@
  
         <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" src="localized_js.php?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
  
-       <script type="text/javascript" src="functions.js?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" src="prefs.js?<?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>
  
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  
@@ -53,9 +55,6 @@
                 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">');
-               }
         //]]>
         </script>
  </head>
@@ -79,7 +78,6 @@
         </div>
  </div> 
  
-
  <div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
         <?php rounded_table_start("hho"); ?>
         <?php include "help/4.php" ?>
@@ -97,11 +95,6 @@ window.onload = init;
  
  <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) { ?>
@@ -121,7 +114,7 @@ window.onload = init;
                 </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>
@@ -137,14 +130,12 @@ window.onload = init;
                 <!-- <div id="pubItemsTab" class="prefsTab" 
                         onclick="selectTab('pubItems')"><?php echo __('Published Articles') ?></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>
  
@@ -163,6 +154,14 @@ 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="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>
+</div>
+
  <div id="dialog_overlay" style="display : none"> </div>
  
  <div id="prefFooter">
@@ -180,7 +179,7 @@ window.onload = init;
         <?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;2009 <a href="http://bah.org.ru/">Andrew Dolgov</a>
  </div>
  
  <?php db_close($link); ?>