switch pref tabs back to old-style due to compatibility issues

[tt-rss.git] / prefs.php

diff --git a/prefs.php b/prefs.php
index 337b7b690c76fc396ceeb020e46464a7f7dfd64e..4893aa618e027af206da770c0b3708fea519863a 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -2,9 +2,6 @@
        error_reporting(E_ERROR | E_WARNING | E_PARSE);
 
        require_once "functions.php"; 
-       
-       startup_gettext();
-
        require_once "sessions.php";
        require_once "sanity_check.php";
        require_once "version.php"; 
@@ -42,16 +39,20 @@
        <link rel="shortcut icon" type="image/png" href="images/favicon.png">
 
        <script type="text/javascript" src="prototype.js"></script>
+       <script type="text/javascript" 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>
 
-       <div id="infoBoxShadow"><div id="infoBox">BAH</div></div>
-
-       <!--[if gte IE 5.5000]>
+       <!--[if lt IE 7]>
                <script type="text/javascript" src="pngfix.js"></script>
-               <link rel="stylesheet" type="text/css" href="tt-rss-ie.css">
+               <link rel="stylesheet" type="text/css" href="ie6.css">
        <![endif]-->
+
+       <!--[if IE 7]>          
+               <link rel="stylesheet" type="text/css" href="ie7.css">
+       <![endif]-->
+
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
        <script type="text/javascript">
@@ -68,8 +69,6 @@
 
 <div id="piggie">&nbsp;</div>
 
-<iframe id="backReqBox"></iframe>
-
 <script type="text/javascript">
 if (document.addEventListener) {
        document.addEventListener("DOMContentLoaded", init, null);
@@ -79,8 +78,6 @@ window.onload = init;
 
 <ul id="debug_output"></ul>
 
-<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
-
 <div id="fatal_error"><div id="fatal_error_inner">
        <h1>Fatal Error</h1>
        <div id="fatal_error_msg"><?php echo __('Unknown Error') ?></div>
@@ -90,14 +87,15 @@ window.onload = init;
        <?php if (!SINGLE_USER_MODE) { ?>
                <div style="float : right">
                        <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b>
-                       (<a href="logout.php">Logout</a>)
+                       (<a href="logout.php"><?= __('Logout') ?></a>)
                </div>
        <?php } ?>
        <img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/>   
 </div>
 
+<div id="prefTabs">
                <div class="return">
-                       <a href="#" onclick="gotoMain()">Exit preferences</a>
+                       <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
                </div>
 
                <div class="firstTab">&nbsp;</div>
@@ -120,6 +118,7 @@ window.onload = init;
                <div id="userConfigTab" class="prefsTab" 
                        onclick="selectTab('userConfig')"><?php echo __('User Manager') ?></div>
                <?php } ?>              
+</div>
 
 <div id="prefContent">
        <p><?php echo __('Loading, please wait...') ?></p>
@@ -131,6 +130,11 @@ window.onload = init;
        </noscript>
 </div>
 
+<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
+<div id="infoBoxShadow"><div id="infoBox">BAH</div></div>
+
+<div id="dialog_overlay"> </div>
+
 <div id="prefFooter">
        <?php if (defined('_DEBUG_USER_SWITCH')) { ?>
                <select id="userSwitch" onchange="userSwitch()">