summaryrefslogtreecommitdiff
path: root/tt-rss.php
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2006-09-28 13:23:28 +0100
committerAndrew Dolgov <[email protected]>2006-09-28 13:23:28 +0100
commit80e4dc34fd6673ab789560b6b8cee74293aa2401 (patch)
treecca5655f9e684037f1d0fcffbe12de15a63554f8 /tt-rss.php
parent6b4163cb464534e827b4282f84541d86c8e19ec5 (diff)
css-based layout + required fixes (2)
Diffstat (limited to 'tt-rss.php')
-rw-r--r--tt-rss.php44
1 files changed, 28 insertions, 16 deletions
diff --git a/tt-rss.php b/tt-rss.php
index a3a7f465c..b985867bb 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -75,7 +75,7 @@
<body>
-<!-- <div id="overlay"><div id="overlay_inner">Loading, please wait...</div></div> -->
+<div id="overlay"><div id="overlay_inner">Loading, please wait...</div></div>
<div id="fatal_error"><div id="fatal_error_inner">
<h1>Fatal Error</h1>
@@ -99,15 +99,22 @@ window.onload = init;
<div id="infoBoxShadow"><div id="infoBox">&nbsp;</div></div>
-<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 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="feeds-holder">
<div id="dispSwitch">
@@ -193,13 +200,18 @@ window.onload = init;
</div>
-<div id="headlines-frame"> -fixme- </div>
-
-<div id="content-frame"> -fixme- </div>
+<?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
+ <div id="headlines-frame" class="headlines_normal">&nbsp;</div>
+ <div id="content-frame">&nbsp;</div>
+<?php } else { ?>
+ <div id="headlines-frame" class="headlines_cdm">&nbsp;</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 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 } ?>
<?php db_close($link); ?>