fix fatalError() not working properly

[tt-rss.git] / tt-rss.php

diff --git a/tt-rss.php b/tt-rss.php
index 21047aa5fe3edffef616d1bcadcf793dfaba53f3..49c882db0bb52d2f36bbe281321d773cc498d534 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -41,6 +41,7 @@
        <script type="text/javascript" charset="utf-8" src="functions.js?<?php echo $dt_add ?>"></script>
        <script type="text/javascript" charset="utf-8" src="feedlist.js?<?php echo $dt_add ?>"></script>
        <script type="text/javascript" charset="utf-8" src="viewfeed.js?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
 
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
@@ -59,30 +60,13 @@
                <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> 
 
-<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
-       <?php rounded_table_start("hho"); ?>
-       <?php include "help/3.php" ?>
-       <?php rounded_table_end(); ?>
-</div>
-
-<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
-<div id="cmdline" style="display : none"></div>
-<div id="auxDlg" style="display : none"></div>
-<div id="headlines-tmp" style="display : none"></div>
-
-<div id="main" dojoType="dijit.layout.BorderContainer">
-
-<div id="header" dojoType="dijit.layout.ContentPane" region="top">
-       <div class="topLinks" id="topLinks">
+<div id="header">
+       <!-- <img class="logo" src="<?php echo theme_image($link, 'images/logo.png') ?>" 
+               onclick="window.open('http://tt-rss.org')" title="Tiny Tiny RSS"/> -->
 
        <?php if (!SINGLE_USER_MODE) { ?>
                        <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
@@ -98,17 +82,26 @@
                        | <a href="logout.php"><?php echo __('Logout') ?></a>
        <?php } ?>
 
-       <img id="newVersionIcon" style="display:none;" onclick="newVersionDlg()" 
+       <img id="newVersionIcon" style="display:none" onclick="newVersionDlg()" 
                width="13" height="13" 
                src="<?php echo theme_image($link, 'images/new_version.png') ?>"
                title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" 
                alt="new_version_icon"/>
+</div>
 
-       </div>
-
-       <img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/>      
+<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
+       <?php rounded_table_start("hho"); ?>
+       <?php include "help/3.php" ?>
+       <?php rounded_table_end(); ?>
 </div>
 
+<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
+<div id="cmdline" style="display : none"></div>
+<div id="auxDlg" style="display : none"></div>
+<div id="headlines-tmp" style="display : none"></div>
+
+<div id="main" dojoType="dijit.layout.BorderContainer">
+
 <div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
        <div id="feedlistLoading">
                <img src='images/indicator_tiny.gif'>
@@ -116,9 +109,12 @@
        <div id="feedTree"></div>
 </div>
 
+<div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false">
+<div dojoType="dijit.layout.ContentPane" region="top">
+</div>
 <div dojoType="dijit.layout.TabContainer" region="center" id="content-tabs">
 <div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap"
-       title="News">
+       title="<?php echo __("News") ?>">
 
 <div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
        <div id="main-toolbar" dojoType="dijit.Toolbar">                
@@ -132,7 +128,7 @@
 
                <select name="view_mode" title="<?php echo __('Show articles') ?>" 
                        onchange="viewModeChanged()"
-                       dojoType="dijit.form.Select" style="width : 100px">
+                       dojoType="dijit.form.Select">
                        <option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
                        <option value="all_articles"><?php echo __('All Articles') ?></option>
                        <option value="marked"><?php echo __('Starred') ?></option>
@@ -144,7 +140,7 @@
 
                <select title="<?php echo __('Sort articles') ?>"
                        onchange="viewModeChanged()" 
-                       dojoType="dijit.form.Select" name="order_by" style="width : 100px">
+                       dojoType="dijit.form.Select" name="order_by">
                        <option selected="selected" value="default"><?php echo __('Default') ?></option>
                        <option value="date"><?php echo __('Date') ?></option>
                        <option value="title"><?php echo __('Title') ?></option>
@@ -206,6 +202,7 @@
        </div>
 </div>
 </div>
+</div>
 
 <!-- <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
        <a href="http://tt-rss.org/">Tiny Tiny RSS</a>