blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

css-based layout + required fixes (2)

Browse source
This commit is contained in:
Andrew Dolgov 2006-09-28 13:23:28 +01:00
parent 6b4163cb46
commit 80e4dc34fd
7 changed files with 54 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend.php
View file

@ -809,7 +809,7 @@
$class = "headlinesSubToolbar"; $class = "headlinesSubToolbar";
$tid = "headlineActionsTop"; $tid = "headlineActionsTop";
} else { } else {
$class = "invisible"; $class = "headlinesSubToolbar";
$tid = "headlineActionsBottom"; $tid = "headlineActionsBottom";
} }

14
feedlist.js
View file

@ -1,4 +1,4 @@
var xmlhttp = Ajax.getTransport(); //var xmlhttp = Ajax.getTransport();
function viewCategory(cat) { function viewCategory(cat) {
getMainContext().active_feed_is_cat = true; getMainContext().active_feed_is_cat = true;
@ -7,8 +7,10 @@ function viewCategory(cat) {
function feedlist_callback() { function feedlist_callback() {
if (xmlhttp.readyState == 4) { if (xmlhttp.readyState == 4) {
debug("feedlist_callback");
var f = document.getElementById("feeds-frame"); var f = document.getElementById("feeds-frame");
f.innerHTML = xmlhttp.responseText; f.innerHTML = xmlhttp.responseText;
feedlist_init();
} }
} }
@ -144,19 +146,19 @@ function feedlist_init() {
if (arguments.callee.done) return; if (arguments.callee.done) return;
arguments.callee.done = true; arguments.callee.done = true;
parent.debug("in feedlist init"); debug("in feedlist init");
hideOrShowFeeds(document, getInitParam("hide_read_feeds") == 1); hideOrShowFeeds(document, getInitParam("hide_read_feeds") == 1);
document.onkeydown = hotkey_handler; document.onkeydown = hotkey_handler;
parent.setTimeout("timeout()", 0); setTimeout("timeout()", 0);
parent.debug("about to remove splash, OMG!"); debug("about to remove splash, OMG!");
var o = parent.document.getElementById("overlay"); var o = document.getElementById("overlay");
if (o) { if (o) {
o.style.display = "none"; o.style.display = "none";
parent.debug("removed splash!"); debug("removed splash!");
} }
} catch (e) { } catch (e) {

2
functions.js
View file

@ -1264,7 +1264,7 @@ function qafAdd() {
var feeds_doc = getFeedsContext().document; var feeds_doc = getFeedsContext().document;
feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait..."; // feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait...";
var query = Form.serialize("feed_add_form"); var query = Form.serialize("feed_add_form");

15
tt-rss.css
View file

@ -1263,7 +1263,7 @@ table.loginForm2 .innerLoginCell {
font-size : small; font-size : small;
} }
#headlines-frame { div.headlines_normal {
position : absolute; position : absolute;
border-width : 1px 0px 0px 0px; border-width : 1px 0px 0px 0px;
border-style : solid; border-style : solid;
@ -1276,6 +1276,19 @@ table.loginForm2 .innerLoginCell {
font-size : small; font-size : small;
} }
div.headlines_cdm {
position : absolute;
border-width : 1px 0px 1px 0px;
border-style : solid;
border-color : #88b0f0;
left : 260px;
bottom : 50px;
top : 85px;
right : 0px;
overflow : auto;
font-size : small;
}
#content-frame { #content-frame {
position : absolute; position : absolute;
border-width : 1px 0px 1px 0px; border-width : 1px 0px 1px 0px;

2
tt-rss.js
View file

@ -225,7 +225,7 @@ function updateFeedList(silent, fetch) {
// var feeds_frame = document.getElementById("feeds-frame"); // var feeds_frame = document.getElementById("feeds-frame");
// feeds_frame.src = query_str; // feeds_frame.src = query_str;
debug("updateFeedList"); debug("updateFeedList: " + query_str);
if (xmlhttp_ready(xmlhttp)) { if (xmlhttp_ready(xmlhttp)) {
xmlhttp.open("GET", query_str, true); xmlhttp.open("GET", query_str, true);

28
tt-rss.php
View file

@ -75,7 +75,7 @@
<body> <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"> <div id="fatal_error"><div id="fatal_error_inner">
<h1>Fatal Error</h1> <h1>Fatal Error</h1>
@ -99,7 +99,8 @@ window.onload = init;
<div id="infoBoxShadow"><div id="infoBox">&nbsp;</div></div> <div id="infoBoxShadow"><div id="infoBox">&nbsp;</div></div>
<div id="header"> <?php if (get_pref($link, 'DISPLAY_HEADER')) { ?>
<div id="header">
<?php if (!SINGLE_USER_MODE) { ?> <?php if (!SINGLE_USER_MODE) { ?>
<div style="float : right"> <div style="float : right">
Hello, <b><?php echo $_SESSION["name"] ?></b> Hello, <b><?php echo $_SESSION["name"] ?></b>
@ -107,7 +108,13 @@ window.onload = init;
</div> </div>
<?php } ?> <?php } ?>
<img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"> <img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS">
</div> </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="feeds-holder">
<div id="dispSwitch"> <div id="dispSwitch">
@ -193,13 +200,18 @@ window.onload = init;
</div> </div>
<div id="headlines-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="content-frame"> -fixme- </div> <?php if (get_pref($link, 'DISPLAY_FOOTER')) { ?>
<div id="footer">
<div id="footer">
<a href="http://tt-rss.spb.ru/">Tiny Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005-2006 Andrew Dolgov <a href="http://tt-rss.spb.ru/">Tiny Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005-2006 Andrew Dolgov
</div> </div>
<?php } ?>
<?php db_close($link); ?> <?php db_close($link); ?>

2
viewfeed.js
View file

@ -1,6 +1,6 @@
var active_post_id = false; var active_post_id = false;
var xmlhttp_rpc = Ajax.getTransport(); //var xmlhttp_rpc = Ajax.getTransport();
function headlines_callback() { function headlines_callback() {
if (xmlhttp.readyState == 4) { if (xmlhttp.readyState == 4) {