From 2b25b79d41314239e534e09c5a10a0f6bd332f8e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 Dec 2010 16:43:05 +0300
Subject: rework main layout a little bit

---
 tt-rss.php | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'tt-rss.php')

diff --git a/tt-rss.php b/tt-rss.php
index 2801226bb..9510d0df8 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -63,21 +63,9 @@
 	</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> |
@@ -93,17 +81,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'>
@@ -111,9 +108,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">		
@@ -201,6 +201,7 @@
 	</div>
 </div>
 </div>
+</div>
 
 <!-- <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
 	<a href="http://tt-rss.org/">Tiny Tiny RSS</a>
-- 
cgit v1.2.3-54-g00ecf