add schema 104 upgrade files

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index 0d0646c79b7e42a029f95dff096a53ecc1a620cd..70ded3670f9e06ad69fd100505890db11e5b2544 100644 (file)
--- a/index.php
+++ b/index.php
@@ -117,20 +117,6 @@
                title="<?php echo __("Communication problem with server.") ?>"
                src="<?php echo theme_image($link, 'images/alert.png') ?>"/>
 
-       <?php if (!$_SESSION["hide_hello"]) { ?>
-                       <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
-       <?php } ?>
-       <a href="prefs.php"><?php echo __('Preferences') ?></a>
-
-       <?php if (defined('FEEDBACK_URL') && FEEDBACK_URL) { ?>
-               | <a target="_blank" class="feedback" href="<?php echo FEEDBACK_URL ?>">
-                               <?php echo __('Comments?') ?></a>
-       <?php } ?>
-
-       <?php if (!$_SESSION["hide_logout"]) { ?>
-                       | <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
-       <?php } ?>
-
        <img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
                width="13" height="13"
                src="<?php echo theme_image($link, 'images/new_version.png') ?>"
@@ -153,9 +139,7 @@
 </div>
 
 <div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false">
-<div dojoType="dijit.layout.TabContainer" region="center" id="content-tabs">
-<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap"
-       title="<?php echo __("News") ?>">
+<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap">
 
 <div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
        <div id="main-toolbar" dojoType="dijit.Toolbar">
@@ -199,9 +183,24 @@
                </form>
 
                <div class="actionChooser">
+
+                       <button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
+                               title="<?php echo __("Communication problem with server.") ?>">
+                       <img
+                               src="<?php echo theme_image($link, 'images/alert.png') ?>" />
+                       </button>
+
+                       <button id="newVersionIcon" dojoType="dijit.form.Button" style="display : none">
+                       <img onclick="newVersionDlg()"
+                               src="<?php echo theme_image($link, 'images/new_version.png') ?>"
+                               title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" />
+                       </button>
+
+
                        <div dojoType="dijit.form.DropDownButton">
                                <span><?php echo __('Actions...') ?></span>
                                <div dojoType="dijit.Menu" style="display: none">
+                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcPrefs')"><?php echo __('Preferences...') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcSearch')"><?php echo __('Search...') ?></div>
                                        <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
@@ -216,12 +215,16 @@
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div>
                                        <?php } ?>
                                                <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div>
-                                               <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
-
+                                       <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
+                                                       <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
+                                       <?php } ?>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagSelect')"><?php echo __('Select by tags...') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div>
                                        <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
+                                       <?php if (!$_SESSION["hide_logout"]) { ?>
+                                               <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcLogout')"><?php echo __('Logout') ?></div>
+                                       <?php } ?>
                                </div>
                        </div>
                </div>
@@ -249,7 +252,6 @@
 </div>
 </div>
 </div>
-</div>
 
 <?php db_close($link); ?>