valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rework main layout a little bit

This commit is contained in:
Andrew Dolgov 2010-12-02 16:43:05 +03:00
parent 45244c40a7
commit 2b25b79d41
3 changed files with 55 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
images/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

37
tt-rss.css
View File

@ -1043,7 +1043,21 @@ div.return a:hover {
overflow : auto; overflow : auto;
} */ } */
div.topLinks img { #header .logo {
float : right;
margin-left : 10px;
border : 1px solid #88b0f0;
}
#header a {
color : #4684ff;
}
#header a:hover {
color : black;
}
#header img {
vertical-align : middle; vertical-align : middle;
cursor : pointer; cursor : pointer;
} }
@ -1089,6 +1103,7 @@ div.autocomplete ul li {
float : right; float : right;
} }
/*
div.topLinks { div.topLinks {
float : right; float : right;
color : gray; color : gray;
@ -1102,9 +1117,9 @@ div.topLinks a {
div.topLinks a:hover { div.topLinks a:hover {
color : black; color : black;
} } */
div.topLinks a.feedback { #header a.feedback {
color : #009900; color : #009900;
} }
@ -1489,6 +1504,12 @@ div.fatalError textarea {
padding : 0px; padding : 0px;
} }
#header-wrap {
border-width : 0px;
margin : 0px;
padding : 0px;
}
#content-wrap { #content-wrap {
padding : 0px; padding : 0px;
border-width : 0px; border-width : 0px;
@ -1500,6 +1521,7 @@ div.fatalError textarea {
border-color : #88b0f0; border-color : #88b0f0;
border-left-width : 0px; border-left-width : 0px;
border-bottom-width : 0px; border-bottom-width : 0px;
border-top-width : 0px;
} }
#headlines-wrap-inner { #headlines-wrap-inner {
@ -1541,8 +1563,15 @@ div.fatalError textarea {
} }
#header { #header {
padding : 4px 8px 0px 8px;
border-width : 0px; border-width : 0px;
text-align : right;
color : gray;
padding : 5px 5px 0px 0px;
margin : 0px;
position : absolute;
right : 0px;
top : 0px;
z-index : 5;
} }
#footer { #footer {

43
tt-rss.php
View File

@ -63,21 +63,9 @@
</div> </div>
</div> </div>
<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"> <div id="header">
<?php rounded_table_start("hho"); ?> <img class="logo" src="<?php echo theme_image($link, 'images/logo.png') ?>"
<?php include "help/3.php" ?> onclick="window.open('http://tt-rss.org')" title="Tiny Tiny RSS"/>
<?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">
<?php if (!SINGLE_USER_MODE) { ?> <?php if (!SINGLE_USER_MODE) { ?>
<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> | <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
@ -93,17 +81,26 @@
| <a href="logout.php"><?php echo __('Logout') ?></a> | <a href="logout.php"><?php echo __('Logout') ?></a>
<?php } ?> <?php } ?>
<img id="newVersionIcon" style="display:none;" onclick="newVersionDlg()" <img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
width="13" height="13" width="13" height="13"
src="<?php echo theme_image($link, 'images/new_version.png') ?>" src="<?php echo theme_image($link, 'images/new_version.png') ?>"
title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>"
alt="new_version_icon"/> alt="new_version_icon"/>
</div>
<img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/>
</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="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true"> <div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
<div id="feedlistLoading"> <div id="feedlistLoading">
<img src='images/indicator_tiny.gif'> <img src='images/indicator_tiny.gif'>
@ -111,9 +108,12 @@
<div id="feedTree"></div> <div id="feedTree"></div>
</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.TabContainer" region="center" id="content-tabs">
<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap" <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="toolbar" dojoType="dijit.layout.ContentPane" region="top">
<div id="main-toolbar" dojoType="dijit.Toolbar"> <div id="main-toolbar" dojoType="dijit.Toolbar">
@ -201,6 +201,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom"> <!-- <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
<a href="http://tt-rss.org/">Tiny Tiny RSS</a> <a href="http://tt-rss.org/">Tiny Tiny RSS</a>