From 1044fcc0598ae428f8e5c4cd25600fcee84158bd Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sun, 9 May 2021 15:38:20 +0200 Subject: Reverted the layout change introduced in a9d29861fe6ad3c182d6cded2e3636a20086fc96 - Caused issues with existing projects that customized the page header to add own navigation tabs (e.g. CGAL). --- doc/layout_noindex_and_treeview.png | Bin 11914 -> 11847 bytes src/htmlgen.cpp | 16 ++++++++-------- templates/html/header.html | 15 +++++---------- templates/html/navtree.js | 2 +- templates/html/resize.js | 4 ++-- templates/html/search_nomenu.css | 4 ++++ 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/doc/layout_noindex_and_treeview.png b/doc/layout_noindex_and_treeview.png index f0cd225..90e6608 100644 Binary files a/doc/layout_noindex_and_treeview.png and b/doc/layout_noindex_and_treeview.png differ diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index c15b205..fe00948 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -385,9 +385,9 @@ static QCString substituteHtmlKeywords(const QCString &str, if (treeView) { treeViewCssJs = "\n" - "\n" + // "\n" "\n" "\n" "\n"; @@ -2559,11 +2559,11 @@ QCString HtmlGenerator::writeSplitBarAsString(const QCString &name,const QCStrin // write split bar if (generateTreeView) { - if (!Config_getBool(DISABLE_INDEX)) - { - result += QCString( - "
\n"); - } + //if (!Config_getBool(DISABLE_INDEX)) + //{ + result += QCString( + "
\n"); + //} result+= QCString( "
\n" "
\n" diff --git a/templates/html/header.html b/templates/html/header.html index 7c5d14c..fd44048 100644 --- a/templates/html/header.html +++ b/templates/html/header.html @@ -17,11 +17,6 @@ $mathjax $extrastylesheet - - -
- -
@@ -46,13 +41,13 @@ $extrastylesheet + + + $searchbox + + - - - $searchbox - -
diff --git a/templates/html/navtree.js b/templates/html/navtree.js index 254169f..2798368 100644 --- a/templates/html/navtree.js +++ b/templates/html/navtree.js @@ -326,7 +326,7 @@ function selectAndHighlight(hash,n) $(n.itemDiv).attr('id','selected'); } var topOffset=5; - if (page_layout==1) { + if (typeof page_layout!=='undefined' && page_layout==1) { topOffset+=$('#top').outerHeight(); } if ($('#nav-tree-contents .item:first').hasClass('selected')) { diff --git a/templates/html/resize.js b/templates/html/resize.js index 699d15c..315b2ff 100644 --- a/templates/html/resize.js +++ b/templates/html/resize.js @@ -53,7 +53,7 @@ function initResizable() date.setTime(date.getTime()+(10*365*24*60*60*1000)); // default expiration is one week expiration = date.toGMTString(); } - document.cookie = cookie_namespace + "_" + cookie + "=" + val + "; expires=" + expiration+"; path=/"; + document.cookie = cookie_namespace + "_" + cookie + "=" + val + "; SameSite=Lax; expires=" + expiration+"; path=/"; } function resizeWidth() @@ -77,7 +77,7 @@ function initResizable() var footerHeight = footer.outerHeight(); var windowHeight = $(window).height(); var contentHeight,navtreeHeight,sideNavHeight; - if (page_layout==0) { /* DISABLE_INDEX=NO */ + if (typeof page_output==='undefined' || page_layout==0) { /* DISABLE_INDEX=NO */ contentHeight = windowHeight - headerHeight - footerHeight; navtreeHeight = contentHeight; sideNavHeight = contentHeight; diff --git a/templates/html/search_nomenu.css b/templates/html/search_nomenu.css index c7efd64..a169d65 100644 --- a/templates/html/search_nomenu.css +++ b/templates/html/search_nomenu.css @@ -8,8 +8,12 @@ white-space : nowrap; float: none; margin-top: 0px; + right: 0px; width: 161px; height: 24px; + z-index: 102; + display: inline; + position: absolute; } #MSearchBox .left -- cgit v0.12