diff options
author | Andrew Dolgov <[email protected]> | 2008-02-20 10:06:09 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2008-02-20 10:06:09 +0100 |
commit | 58daed52b6494d81f5646e29edf2273f32e7ee9f (patch) | |
tree | 0ec38ebc308650891d464f6f5a2f3bbf04a62dfc | |
parent | 22936abb76a5e321f40fc04ebc186204fbb7fa36 (diff) |
enable collapsing feedlist for compact theme
-rw-r--r-- | feedlist.js | 18 | ||||
-rw-r--r-- | tt-rss.js | 8 | ||||
-rw-r--r-- | tt-rss.php | 2 |
3 files changed, 21 insertions, 7 deletions
diff --git a/feedlist.js b/feedlist.js index 486409ae9..2e6e9e891 100644 --- a/feedlist.js +++ b/feedlist.js @@ -345,12 +345,12 @@ function feedlist_init() { if (getInitParam("theme") == "") { setTimeout("hide_footer()", 5000); + } - if (getInitParam("hide_feedlist") == 1) { - init_hidden_feedlist(); - } else { - init_collapsable_feedlist(); - } + if (getInitParam("hide_feedlist") == 1) { + init_hidden_feedlist(getInitParam("theme")); + } else { + init_collapsable_feedlist(getInitParam("theme")); } } catch (e) { @@ -387,10 +387,12 @@ function hide_footer() { } } -function init_hidden_feedlist() { +function init_hidden_feedlist(theme) { try { debug("init_hidden_feedlist"); + if (theme != "") return; + var fl = document.getElementById("feeds-holder"); var fh = document.getElementById("headlines-frame"); var fc = document.getElementById("content-frame"); @@ -415,10 +417,12 @@ function init_hidden_feedlist() { } } -function init_collapsable_feedlist() { +function init_collapsable_feedlist(theme) { try { debug("init_collapsable_feedlist"); + if (theme != "" && theme != "compact") return; + var fbtn = document.getElementById("collapse_feeds_btn"); if (fbtn) Element.show(fbtn); @@ -764,12 +764,16 @@ function toggle_feedlist() { function collapse_feedlist() { try { debug("toggle_feedlist"); + + var theme = getInitParam("theme"); + if (theme != "" && theme != "compact") return; var fl = document.getElementById("feeds-holder"); var fh = document.getElementById("headlines-frame"); var fc = document.getElementById("content-frame"); var ft = document.getElementById("toolbar"); var ff = document.getElementById("footer"); + var fhdr = document.getElementById("header"); var fbtn = document.getElementById("collapse_feeds_btn"); if (!Element.visible(fl)) { @@ -781,6 +785,8 @@ function collapse_feedlist() { if (fc) fc.style.left = fl.offsetWidth + "px"; if (ff) ff.style.left = (fl.offsetWidth-1) + "px"; + if (theme == "compact") fhdr.style.left = (fl.offsetWidth + 10) + "px"; + setCookie("ttrss_vf_fclps", "0"); } else { @@ -792,6 +798,8 @@ function collapse_feedlist() { if (fc) fc.style.left = "0px"; if (ff) ff.style.left = "0px"; + if (theme == "compact") fhdr.style.left = "10px"; + setCookie("ttrss_vf_fclps", "1"); } } catch (e) { diff --git a/tt-rss.php b/tt-rss.php index 6778bf958..aad306f0a 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -166,6 +166,8 @@ window.onload = init; id="toggle_feeds_btn" onclick="toggle_feedlist()" style="display : none"> + + <?php if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?> <?php echo __('Search:') ?> |