diff options
| -rw-r--r-- | images/logo.png | bin | 0 -> 1437 bytes | |||
| -rw-r--r-- | tt-rss.css | 37 | ||||
| -rw-r--r-- | tt-rss.php | 41 |
3 files changed, 54 insertions, 24 deletions
diff --git a/images/logo.png b/images/logo.png Binary files differnew file mode 100644 index 000000000..dfd973b3d --- /dev/null +++ b/images/logo.png diff --git a/tt-rss.css b/tt-rss.css index a5662fede..8d4c52f71 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -1043,7 +1043,21 @@ div.return a:hover { 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; cursor : pointer; } @@ -1089,6 +1103,7 @@ div.autocomplete ul li { float : right; } +/* div.topLinks { float : right; color : gray; @@ -1102,9 +1117,9 @@ div.topLinks a { div.topLinks a:hover { color : black; -} +} */ -div.topLinks a.feedback { +#header a.feedback { color : #009900; } @@ -1489,6 +1504,12 @@ div.fatalError textarea { padding : 0px; } +#header-wrap { + border-width : 0px; + margin : 0px; + padding : 0px; +} + #content-wrap { padding : 0px; border-width : 0px; @@ -1500,6 +1521,7 @@ div.fatalError textarea { border-color : #88b0f0; border-left-width : 0px; border-bottom-width : 0px; + border-top-width : 0px; } #headlines-wrap-inner { @@ -1541,8 +1563,15 @@ div.fatalError textarea { } #header { - padding : 4px 8px 0px 8px; 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 { 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"> </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"> </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> |
