diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2011-04-26 10:48:48 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2011-04-26 10:48:48 (GMT) |
| commit | 3c0d4d412c7b6c2afa9e76fcfd5ef5ea8586ad68 (patch) | |
| tree | 5b1b526ababed94fc83b11349dd828da3bf11882 /src/htmlgen.cpp | |
| parent | da2223bed0d63aef0bb6b9e583b90f7319363586 (diff) | |
| download | Doxygen-3c0d4d412c7b6c2afa9e76fcfd5ef5ea8586ad68.zip Doxygen-3c0d4d412c7b6c2afa9e76fcfd5ef5ea8586ad68.tar.gz Doxygen-3c0d4d412c7b6c2afa9e76fcfd5ef5ea8586ad68.tar.bz2 | |
Release-1.7.4-20110426
Diffstat (limited to 'src/htmlgen.cpp')
| -rw-r--r-- | src/htmlgen.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index ebca041..f4e9c54 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -765,7 +765,10 @@ static void writeServerSearchBox(FTextStream &t,const char *relPath,bool highlig static QCString getLogoName(const char *projectLogo) { if (projectLogo==0) return ""; - if (projectLogo[0]=='$') return projectLogo; // marker is used + if (projectLogo[0]=='$') + { + return projectLogo; // marker is used + } QFileInfo fi(projectLogo); if (fi.exists()) { @@ -1017,8 +1020,8 @@ static QCString substituteHtmlKeywords(const QCString &s,const char *title, // additional HTML only keywords result = substitute(result,"$treeview",treeViewCssJs); - result = substitute(result,"$search",searchCssJs); result = substitute(result,"$searchbox",searchBox); + result = substitute(result,"$search",searchCssJs); result = substitute(result,"$mathjax",mathJaxJs); result = substitute(result,"$relpath$",relPath); //<-- must be last @@ -1275,7 +1278,7 @@ void HtmlGenerator::writeHeaderFile(QFile &file, const char *cssname) t << " <tbody>\n"; t << " <tr style=\"height: 56px;\">\n"; t << " <!--BEGIN PROJECT_LOGO-->\n"; - t << " <td id=\"projectlogo\"><img alt=\"Logo\" src=\"$relpath$$projectlogo\"></td>\n"; + t << " <td id=\"projectlogo\"><img alt=\"Logo\" src=\"$relpath$$projectlogo\"/></td>\n"; t << " <!--END PROJECT_LOGO-->\n"; t << " <!--BEGIN PROJECT_NAME-->\n"; t << " <td style=\"padding-left: 0.5em;\">\n"; |