diff options
Diffstat (limited to 'templates/html')
-rw-r--r-- | templates/html/doxygen.css | 4 | ||||
-rw-r--r-- | templates/html/header.html | 18 | ||||
-rw-r--r-- | templates/html/navtree.css | 1 | ||||
-rw-r--r-- | templates/html/navtree.js | 9 | ||||
-rw-r--r-- | templates/html/resize.js | 18 | ||||
-rw-r--r-- | templates/html/search.js | 2 | ||||
-rw-r--r-- | templates/html/search_nomenu.css | 9 |
7 files changed, 38 insertions, 23 deletions
diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css index 29dafbe..b54be20 100644 --- a/templates/html/doxygen.css +++ b/templates/html/doxygen.css @@ -1347,14 +1347,14 @@ dl.section dd { #projectname { - font: 300% Tahoma, Arial,sans-serif; + font: 200% Tahoma, Arial,sans-serif; margin: 0px; padding: 2px 0px; } #projectbrief { - font: 120% Tahoma, Arial,sans-serif; + font: 90% Tahoma, Arial,sans-serif; margin: 0px; padding: 0px; } diff --git a/templates/html/header.html b/templates/html/header.html index 9527936..7c5d14c 100644 --- a/templates/html/header.html +++ b/templates/html/header.html @@ -17,6 +17,11 @@ $mathjax $extrastylesheet </head> <body> +<!--BEGIN DISABLE_INDEX--> +<!--BEGIN GENERATE_TREEVIEW--> +<div id="side-nav" class="ui-resizable side-nav-resizable"> +<!--END GENERATE_TREEVIEW--> +<!--END DISABLE_INDEX--> <div id="top"><!-- do not remove this div, it is closed by doxygen! --> <!--BEGIN TITLEAREA--> @@ -29,8 +34,7 @@ $extrastylesheet <!--END PROJECT_LOGO--> <!--BEGIN PROJECT_NAME--> <td id="projectalign" style="padding-left: 0.5em;"> - <div id="projectname">$projectname - <!--BEGIN PROJECT_NUMBER--> <span id="projectnumber">$projectnumber</span><!--END PROJECT_NUMBER--> + <div id="projectname">$projectname<!--BEGIN PROJECT_NUMBER--><span id="projectnumber"> $projectnumber</span><!--END PROJECT_NUMBER--> </div> <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">$projectbrief</div><!--END PROJECT_BRIEF--> </td> @@ -42,13 +46,13 @@ $extrastylesheet </td> <!--END PROJECT_BRIEF--> <!--END !PROJECT_NAME--> - <!--BEGIN DISABLE_INDEX--> - <!--BEGIN SEARCHENGINE--> - <td>$searchbox</td> - <!--END SEARCHENGINE--> - <!--END DISABLE_INDEX--> </tr> </tbody> +<!--BEGIN DISABLE_INDEX--> + <!--BEGIN SEARCHENGINE--> + <td colspan="2" style="padding-top: 4px;">$searchbox</td> + <!--END SEARCHENGINE--> +<!--END DISABLE_INDEX--> </table> </div> <!--END TITLEAREA--> diff --git a/templates/html/navtree.css b/templates/html/navtree.css index 81c54c2..585ecad 100644 --- a/templates/html/navtree.css +++ b/templates/html/navtree.css @@ -87,6 +87,7 @@ position: absolute; left: 0px; width: $width; + overflow : hidden; } .ui-resizable .ui-resizable-handle { diff --git a/templates/html/navtree.js b/templates/html/navtree.js index 1e272d3..254169f 100644 --- a/templates/html/navtree.js +++ b/templates/html/navtree.js @@ -325,11 +325,14 @@ function selectAndHighlight(hash,n) $(n.itemDiv).addClass('selected'); $(n.itemDiv).attr('id','selected'); } + var topOffset=5; + if (page_layout==1) { + topOffset+=$('#top').outerHeight(); + } if ($('#nav-tree-contents .item:first').hasClass('selected')) { - $('#nav-sync').css('top','30px'); - } else { - $('#nav-sync').css('top','5px'); + topOffset+=25; } + $('#nav-sync').css('top',topOffset+'px'); showRoot(); } diff --git a/templates/html/resize.js b/templates/html/resize.js index e1ad0fe..699d15c 100644 --- a/templates/html/resize.js +++ b/templates/html/resize.js @@ -75,10 +75,20 @@ function initResizable() { var headerHeight = header.outerHeight(); var footerHeight = footer.outerHeight(); - var windowHeight = $(window).height() - headerHeight - footerHeight; - content.css({height:windowHeight + "px"}); - navtree.css({height:windowHeight + "px"}); - sidenav.css({height:windowHeight + "px"}); + var windowHeight = $(window).height(); + var contentHeight,navtreeHeight,sideNavHeight; + if (page_layout==0) { /* DISABLE_INDEX=NO */ + contentHeight = windowHeight - headerHeight - footerHeight; + navtreeHeight = contentHeight; + sideNavHeight = contentHeight; + } else if (page_layout==1) { /* DISABLE_INDEX=YES */ + contentHeight = windowHeight - footerHeight; + navtreeHeight = windowHeight - headerHeight; + sideNavHeight = windowHeight; + } + content.css({height:contentHeight + "px"}); + navtree.css({height:navtreeHeight + "px"}); + sidenav.css({height:sideNavHeight + "px"}); var width=$(window).width(); if (width!=collapsedWidth) { if (width<desktop_vp && collapsedWidth>=desktop_vp) { diff --git a/templates/html/search.js b/templates/html/search.js index fb226f7..54ad133 100644 --- a/templates/html/search.js +++ b/templates/html/search.js @@ -146,6 +146,7 @@ function SearchBox(name, resultsPath, inFrame, label, extension) // show search selection popup searchSelectWindow.style.display='block'; left -= searchSelectWindow.offsetWidth; + if (left<10) left=10; searchSelectWindow.style.left = left + 'px'; searchSelectWindow.style.top = top + 'px'; } @@ -383,6 +384,7 @@ function SearchBox(name, resultsPath, inFrame, label, extension) var top = getYPos(domSearchBox) + 20; // domSearchBox.offsetHeight + 1; domPopupSearchResultsWindow.style.display = 'block'; left -= domPopupSearchResults.offsetWidth; + if (left<10) left=10; domPopupSearchResultsWindow.style.top = top + 'px'; domPopupSearchResultsWindow.style.left = left + 'px'; } diff --git a/templates/html/search_nomenu.css b/templates/html/search_nomenu.css index bb50b44..c7efd64 100644 --- a/templates/html/search_nomenu.css +++ b/templates/html/search_nomenu.css @@ -8,12 +8,8 @@ white-space : nowrap; float: none; margin-top: 0px; - right: 0px; - width: 170px; + width: 161px; height: 24px; - z-index: 102; - display: inline; - position: absolute; } #MSearchBox .left @@ -64,8 +60,7 @@ #MSearchBox .right { display:block; position:absolute; - right:10px; - top:0px; + left:141px; width:20px; height:19px; background:url('search_r.png') no-repeat; |