summaryrefslogtreecommitdiffstats
path: root/templates/html
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2016-07-31 07:51:51 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2016-07-31 07:51:51 (GMT)
commit0faf45600c6c640bfaf11b017d43a4b9de193ebf (patch)
tree6411096fe03f9fec56d701f4f458a52611a55b62 /templates/html
parent646302c93b65f7584f73b739e7aff2eee70583b7 (diff)
downloadDoxygen-0faf45600c6c640bfaf11b017d43a4b9de193ebf.zip
Doxygen-0faf45600c6c640bfaf11b017d43a4b9de193ebf.tar.gz
Doxygen-0faf45600c6c640bfaf11b017d43a4b9de193ebf.tar.bz2
Fix for HTML output when using server side search and the the new menu bar
Diffstat (limited to 'templates/html')
-rw-r--r--templates/html/menu.js8
-rw-r--r--templates/html/search.css2
2 files changed, 7 insertions, 3 deletions
diff --git a/templates/html/menu.js b/templates/html/menu.js
index 8ea4097..97db4c2 100644
--- a/templates/html/menu.js
+++ b/templates/html/menu.js
@@ -1,4 +1,4 @@
-function initMenu(relPath,searchEnabled,search) {
+function initMenu(relPath,searchEnabled,serverSide,searchPage,search) {
function makeTree(data,relPath) {
var result='';
if ('children' in data) {
@@ -16,7 +16,11 @@ function initMenu(relPath,searchEnabled,search) {
$('#main-nav').append(makeTree(menudata,relPath));
$('#main-nav').children(':first').addClass('sm sm-dox').attr('id','main-menu');
if (searchEnabled) {
- $('#main-menu').append('<li style="float:right"><div id="MSearchBox" class="MSearchBoxInactive"><span class="left"><img id="MSearchSelect" src="'+relPath+'search/mag_sel.png" onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" alt=""/><input type="text" id="MSearchField" value="'+search+'" accesskey="S" onfocus="searchBox.OnSearchFieldFocus(true)" onblur="searchBox.OnSearchFieldFocus(false)" onkeyup="searchBox.OnSearchFieldChange(event)"/></span><span class="right"><a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="'+relPath+'search/close.png" alt=""/></a></span></div></li>');
+ if (serverSide) {
+ $('#main-menu').append('<li style="float:right"><div id="MSearchBox" class="MSearchBoxInactive"><div class="left"><form id="FSearchBox" action="'+searchPage+'" method="get"><img id="MSearchSelect" src="'+relPath+'search/mag.png" alt=""/><input type="text" id="MSearchField" name="query" value="'+search+'" size="20" accesskey="S" onfocus="searchBox.OnSearchFieldFocus(true)" onblur="searchBox.OnSearchFieldFocus(false)"></form></div><div class="right"></div></div></li>');
+ } else {
+ $('#main-menu').append('<li style="float:right"><div id="MSearchBox" class="MSearchBoxInactive"><span class="left"><img id="MSearchSelect" src="'+relPath+'search/mag_sel.png" onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" alt=""/><input type="text" id="MSearchField" value="'+search+'" accesskey="S" onfocus="searchBox.OnSearchFieldFocus(true)" onblur="searchBox.OnSearchFieldFocus(false)" onkeyup="searchBox.OnSearchFieldChange(event)"/></span><span class="right"><a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="'+relPath+'search/close.png" alt=""/></a></span></div></li>');
+ }
}
$('#main-menu').smartmenus();
}
diff --git a/templates/html/search.css b/templates/html/search.css
index e3cb50d..859cf6a 100644
--- a/templates/html/search.css
+++ b/templates/html/search.css
@@ -46,7 +46,7 @@
height:19px;
background:url('search_m.png') repeat-x;
border:none;
- width:111px;
+ width:115px;
margin-left:20px;
padding-left:4px;
color: #909090;