summaryrefslogtreecommitdiff
path: root/cpp/src/slice2html
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/slice2html')
-rw-r--r--cpp/src/slice2html/Gen.cpp91
-rw-r--r--cpp/src/slice2html/Gen.h6
2 files changed, 55 insertions, 42 deletions
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 49ae1cbd617..f1e9e5b02e0 100644
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -250,7 +250,6 @@ Slice::GeneratorBase::openDoc(const string& file, const string& title, const str
{
_out << h2;
}
- _indexFooter = getFooter(footer);
_out.inc();
_out.inc();
}
@@ -291,11 +290,11 @@ Slice::GeneratorBase::openDoc(const ContainedPtr& c)
// Close an open HTML file after writing the footer.
//
void
-Slice::GeneratorBase::closeDoc()
+Slice::GeneratorBase::closeDoc(const string& footer)
{
_out.dec();
_out.dec();
- _out << nl << (!_indexFooter.empty() ? _indexFooter : _footer);
+ _out << nl << (!footer.empty() ? footer : _footer);
_out << nl;
}
@@ -738,23 +737,24 @@ Slice::GeneratorBase::printHeaderFooter(const ContainedPtr& c)
}
path += imageDir + "/";
- prevImage = "<img class=\"" + prevClass + "\" src=\"" + path + prevImage + "\" alt=\"Previous\"/>";
- nextImage = "<img class=\"" + nextClass + "\" src=\"" + path + nextImage + "\" alt=\"Next\"/>";
- upImage = "<img class=\"" + upClass + "\" src=\"" + path + upImage + "\" alt=\"Up\"/>";
- homeImage = "<img class=\"Button\" src=\"" + path + homeImage + "\" alt=\"Home\"/>";
- indexImage = "<img class=\"Button\" src=\"" + path + indexImage + "\" alt=\"Index\"/>";
+ prevImage = "<img class=\"" + prevClass + "\" src=\"" + path + prevImage + "\" alt=\"Previous\">";
+ nextImage = "<img class=\"" + nextClass + "\" src=\"" + path + nextImage + "\" alt=\"Next\">";
+ upImage = "<img class=\"" + upClass + "\" src=\"" + path + upImage + "\" alt=\"Up\">";
+ homeImage = "<img class=\"Button\" src=\"" + path + homeImage + "\" alt=\"Home\">";
+ indexImage = "<img class=\"Button\" src=\"" + path + indexImage + "\" alt=\"Index\">";
}
_out << nl << "<!-- SwishCommand noindex -->";
- start("div", "HeaderFooter");
-
- start("table", "ButtonTable");
+ start("table", "HeaderFooter");
start("tr");
+ start("td align=\"left\"");
+ start("table");
+ start("tr");
start("td");
_out << "<a href=\"" << homeLink << "\">" << homeImage << "</a>";
- end();
+ end(); // td
if(!imageDir.empty() || !isFirst)
{
@@ -805,16 +805,22 @@ Slice::GeneratorBase::printHeaderFooter(const ContainedPtr& c)
_out << "<a href=\"" << indexLink << "\">" << indexImage << "</a>";
end();
- end();
- end();
+ end(); // tr
+ end(); // table
+ end(); // td
+ start("td align=\"center\"");
printSearch();
+ end();
+ start("td align=\"right\"");
printLogo(c, container, onEnumPage);
+ end();
- _out << nl << "<!-- SwishCommand index -->";
+ end(); // tr
+ end(); // table
- end();
+ _out << nl << "<!-- SwishCommand index -->" << nl;
}
void
@@ -822,9 +828,7 @@ Slice::GeneratorBase::printSearch()
{
if(!_searchAction.empty())
{
- _out << nl << "<div style=\"text-align: center;\">";
- _out.inc();
- start("table", "SearchTable");
+ start("table");
start("tr");
start("td");
_out << nl << "<form method=\"get\" action=\"" << _searchAction << "\""
@@ -833,14 +837,12 @@ Slice::GeneratorBase::printSearch()
start("div");
_out << nl << "<input maxlength=\"100\" value=\"\" type=\"text\" name=\"query\">";
_out << nl << "<input type=\"submit\" value=\"Search\" name=\"submit\">";
- end();
_out.dec();
- _out << nl << "</form>";
- end();
- end();
end();
- _out.dec();
- _out << nl << "</div>";
+ _out << nl << "</form>";
+ end(); // td
+ end(); // tr
+ end(); // table
}
}
@@ -863,7 +865,7 @@ Slice::GeneratorBase::printLogo(const ContainedPtr& c, const ContainerPtr& conta
{
_out << "<a href=\"" + _logoURL + "\">";
}
- _out << "<img class=\"Logo\" src=\"" + path + "\" alt=\"Logo\"/>";
+ _out << "<img class=\"Logo\" src=\"" + path + "\" alt=\"Logo\">";
if(!_logoURL.empty())
{
_out << "</a>";
@@ -1646,9 +1648,10 @@ Slice::StartPageGenerator::generate(const ModulePtr& m)
void
Slice::StartPageGenerator::printHeaderFooter()
{
- start("div", "HeaderFooter");
-
- start("table", "ButtonTable");
+ start("table", "HeaderFooter");
+ start("tr");
+ start("td align=\"left\"");
+ start("table");
start("tr");
start("td");
string imageDir = getImageDir();
@@ -1659,17 +1662,21 @@ Slice::StartPageGenerator::printHeaderFooter()
else
{
string src = imageDir + "/index.gif";
- _out << "<a href=\"_sindex.html\"><img class=\"Button\" src=\"" + src + "\" alt=\"Index Button\"/></a>";
+ _out << "<a href=\"_sindex.html\"><img class=\"Button\" src=\"" + src + "\" alt=\"Index Button\"></a>";
}
- end();
- end();
- end();
+ end(); // td
+ end(); // tr
+ end(); // table
+ end(); // td
+ start("td align=\"center\"");
printSearch();
+ end(); // td
if(!imageDir.empty())
{
- start("table", "LogoTable");
+ start("td align=\"right\"");
+ start("table");
start("tr");
start("td");
string logoURL = getLogoURL();
@@ -1677,17 +1684,19 @@ Slice::StartPageGenerator::printHeaderFooter()
{
_out << "<a href=\"" + logoURL + "\">";
}
- _out << "<img class=\"Logo\" src=\"" + imageDir + "/logo.gif\" alt=\"Logo\"/>";
+ _out << "<img class=\"Logo\" src=\"" + imageDir + "/logo.gif\" alt=\"Logo\">";
if(!logoURL.empty())
{
_out << "</a>";
}
- end();
- end();
- end();
+ end(); // td
+ end(); // tr
+ end(); // table
+ end(); // td
}
- end();
+ end(); // tr
+ end(); // table
}
Slice::FileVisitor::FileVisitor(Files& files)
@@ -1774,6 +1783,7 @@ Slice::StartPageVisitor::visitModuleStart(const ModulePtr& m)
TOCGenerator::TOCGenerator(const Files& files, const string& header, const string& footer)
: GeneratorBase(_out, files)
{
+ _footer = footer;
openDoc("_sindex.html", "Slice API Index", header, footer);
start("h1");
@@ -1820,7 +1830,8 @@ TOCGenerator::writeTOC()
_symbols.sort();
_symbols.unique();
- closeDoc();
+ string f = getFooter(_footer);
+ closeDoc(getFooter(_footer));
}
const ContainedList&
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
index 3709c515495..9a474e5f302 100644
--- a/cpp/src/slice2html/Gen.h
+++ b/cpp/src/slice2html/Gen.h
@@ -45,7 +45,7 @@ protected:
void openDoc(const ::std::string&, const std::string&, const std::string& = "", const std::string& = "");
void openDoc(const ContainedPtr&);
- void closeDoc();
+ void closeDoc(const std::string& = "");
void start(const ::std::string&, const ::std::string& = ::std::string());
void end();
@@ -70,6 +70,8 @@ protected:
static ::std::string getImageDir();
static ::std::string getLogoURL();
+ static ::std::string getFooter(const ::std::string&);
+
::IceUtilInternal::XMLOutput& _out;
static size_t _indexCount;
@@ -89,7 +91,6 @@ private:
static ::std::string readFile(const ::std::string&);
static void readFile(const ::std::string&, ::std::string&, ::std::string&);
static void getHeaders(const ::std::string&, ::std::string&, ::std::string&);
- static ::std::string getFooter(const ::std::string&);
::std::string _indexFooter;
const Files _files;
@@ -171,6 +172,7 @@ private:
void writeEntry(const ContainedPtr&);
+ ::std::string _footer;
ModuleList _modules;
ContainedList _symbols;
::IceUtilInternal::XMLOutput _out;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 09:14:45 +0000