obsolete DISPLAY_HEADER/FOOTER options

diff --git a/tt-rss.css b/tt-rss.css
index 67b93adf55b16640270c09cba04d3f83a2b175b4..0b2d9de0004b42869d7adf2aea75203479ce4739 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1347,6 +1347,10 @@ div.headlines_cdm {
 
 }
 
+#footer a {
+       color : gray;
+}
+
 #headlinesContainer {
        margin-left : 1px;
        background-color : white;

diff --git a/tt-rss.php b/tt-rss.php
index 69a3bec881342089702f7b95cdefac50be3a0ba6..2d5ad87e63a111389f99da15d560cbe0473e8b58 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -108,22 +108,15 @@ window.onload = init;
 
 <div id="infoBoxShadow"><div id="infoBox">&nbsp;</div></div>
 
-<?php if (get_pref($link, 'DISPLAY_HEADER')) { ?>
-       <div id="header">
-               <?php if (!SINGLE_USER_MODE) { ?>
-                       <div style="float : right">
-                               Hello, <b><?php echo $_SESSION["name"] ?></b>
-                               (<a href="logout.php">Logout</a>)
-                       </div>
-               <?php } ?>
-               <img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS">    
-       </div>
-<?php } else if (!SINGLE_USER_MODE) { ?>
-       <div style="float : right">
-               Hello, <b><?php echo $_SESSION["name"] ?></b>
-               (<a href="logout.php">Logout</a>)
-       </div>
-<?php } ?>
+<div id="header">
+       <?php if (!SINGLE_USER_MODE) { ?>
+               <div style="float : right">
+                       Hello, <b><?php echo $_SESSION["name"] ?></b>
+                       (<a href="logout.php">Logout</a>)
+               </div>
+       <?php } ?>
+       <img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS">    
+</div>
 
 <div id="feeds-holder">
        <div id="dispSwitch"> 
@@ -216,11 +209,9 @@ window.onload = init;
        <div id="headlines-frame" class="headlines_cdm"><div class="whiteBox">No feed selected.</div></div>
 <?php } ?>
 
-<?php if (get_pref($link, 'DISPLAY_FOOTER')) { ?>
-       <div id="footer">
-               <a href="http://tt-rss.spb.ru/">Tiny Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005-2006 Andrew Dolgov
-       </div>
-<?php } ?>
+<div id="footer">
+       <a href="http://tt-rss.spb.ru/">Tiny Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005-2006 Andrew Dolgov
+</div>
 
 <?php db_close($link); ?>