From efae7595c4bbb47c4f86e9b142120bb3e5bc887e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Sat, 17 Nov 2007 10:59:19 +0100
Subject: [PATCH] tweak hello/prefs/logout linkbar (refs #163)

---
 prefs.php                 |  6 +++---
 themes/graycube/theme.css |  8 ++++++++
 tt-rss.css                | 14 ++++++++++++++
 tt-rss.php                | 13 +++++++++----
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/prefs.php b/prefs.php
index d1d98ea1..0544a870 100644
--- a/prefs.php
+++ b/prefs.php
@@ -87,9 +87,9 @@ window.onload = init;
 
 <div id="prefHeader">
 	<?php if (!SINGLE_USER_MODE) { ?>
-		<div style="float : right">
-			<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b>
-			(<a href="logout.php"><?php echo __('Logout') ?></a>)
+		<div class="topLinks">
+			<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
+			<a href="logout.php"><?php echo __('Logout') ?></a>
 		</div>
 	<?php } ?>
 	<img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/>	
diff --git a/themes/graycube/theme.css b/themes/graycube/theme.css
index cca6095a..fd9b24e3 100644
--- a/themes/graycube/theme.css
+++ b/themes/graycube/theme.css
@@ -458,3 +458,11 @@ ul.headlineDropdownMenu ul li:hover {
 .insensitive a:hover {
 	color : black;
 }
+
+div.topLinks a {
+	color : black;
+}
+
+div.topLinks a:hover {
+	color : gray;
+}
diff --git a/tt-rss.css b/tt-rss.css
index 267e112d..f1580b03 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1697,3 +1697,17 @@ div.autocomplete ul li {
 #feedOpToolbar {
 	float : right;
 }
+
+div.topLinks {
+	float : right;
+	margin-right : 5px;
+	color : gray;
+}
+
+div.topLinks a {
+	color : #4684ff;	
+}
+
+div.topLinks a:hover {
+	color : black;
+}
diff --git a/tt-rss.php b/tt-rss.php
index 34f11d1f..5ef24050 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -103,11 +103,16 @@ window.onload = init;
 <div id="infoBoxShadow"><div id="infoBox">&nbsp;</div></div>
 
 <div id="header">
-	<div style="float : right">
+	<div class="topLinks">
 	<?php if (!SINGLE_USER_MODE) { ?>
-			<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b>
-			(<a href="logout.php"><?php echo __('Logout') ?></a>)
+			<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
 	<?php } ?>
+	<a href="prefs.php"><?php echo __('Preferences') ?></a>
+
+	<?php if (!SINGLE_USER_MODE) { ?>
+			| <a href="logout.php"><?php echo __('Logout') ?></a>
+	<?php } ?>
+
 	<img id="newVersionIcon" style="display:none;" onclick="javascript:explainError(2)" 
 		src="images/new_version.png" title="New version is available!" 
 		alt="new_version_icon">
@@ -129,7 +134,7 @@ window.onload = init;
 			<select id="quickMenuChooser" onchange="quickMenuChange()">
 					<option value="qmcDefault" selected><?php echo __('Actions...') ?></option>
 					<option value="qmcSearch"><?php echo __('Search') ?></option>
-					<option value="qmcPrefs"><?php echo __('Preferences') ?></option>
+					<!-- <option value="qmcPrefs"><?php echo __('Preferences') ?></option> -->
 					<option disabled>--------</option>
 					<option style="color : #5050aa" disabled><?php echo __('Feed actions:') ?></option>
 					<option value="qmcAddFeed"><?php echo __('&nbsp;&nbsp;Subscribe to feed') ?></option>
-- 
2.39.5