diff --git a/lib/modules/Tools.pmod/Standalone.pmod/autodoc_to_split_html.pike b/lib/modules/Tools.pmod/Standalone.pmod/autodoc_to_split_html.pike
index 845669c9f1c4bed64e8048cd87db00791c113faf..0638bd14045e2a9067aee1986f6090a475067a10 100644
--- a/lib/modules/Tools.pmod/Standalone.pmod/autodoc_to_split_html.pike
+++ b/lib/modules/Tools.pmod/Standalone.pmod/autodoc_to_split_html.pike
@@ -422,14 +422,18 @@ class Node
if(!sizeof(children)) return "";
String.Buffer res = String.Buffer(3000);
- res->add("<tr><td nowrap='nowrap'><br /><b>", what, "</b></td></tr>\n");
+ res->add("<br /><b>", what, "</b>\n"
+ "<div style='margin-left:0.5em;'>\n");
foreach(children, Node node)
{
string my_name = Parser.encode_html_entities(node->name);
- if(node->type=="method")
+ if(node->type=="method") {
my_name+="()";
- else if (node->type == "namespace") {
+ if (node == this_object()) {
+ my_name="<b>"+my_name+"</b>";
+ }
+ } else if (node->type == "namespace") {
my_name="<b>"+my_name+"::</b>";
}
else
@@ -437,11 +441,11 @@ class Node
res->add("<tr><td nowrap='nowrap'> ");
if(node==this_object())
- res->add( my_name );
+ res->add( my_name, "<br />\n" );
else
- res->add( "<a href='", make_link(node), "'>", my_name, "</a>" );
- res->add("</td></tr>\n");
+ res->add( "<a href='", make_link(node), "'>", my_name, "</a><br />\n" );
}
+ res->add("</div>\n");
return (string)res;
}
@@ -475,7 +479,7 @@ class Node
res += make_hier_list(root);
- res+="<table border='0' cellpadding='1' cellspacing='0' class='sidebar'>";
+ res+="<div class='sidebar'>";
res += make_navbar_really_low(root->module_children, "Modules");
@@ -488,7 +492,7 @@ class Node
res += make_navbar_really_low(root->method_children, "Methods");
}
- return res+"</table>";
+ return res+"</div>";
}
string make_navbar()
@@ -706,7 +710,7 @@ class TopNode {
resolve_reference = my_resolve_reference;
if(!sizeof(method_children)) return "";
- string contents = "<table class='sidebar'><tr>";
+ string contents = "<nav><table class='sidebar'><tr>";
foreach(method_children/( sizeof(method_children)/4.0 ),
array(Node) children)
contents += "<td nowrap='nowrap' valign='top'>" +
@@ -715,7 +719,7 @@ class TopNode {
contents += "</tr><tr><td colspan='4' nowrap='nowrap'>" +
parse_children(Parser.XML.Tree.parse_input(data),
"docgroup", parse_docgroup, 1) +
- "</td></tr></table>";
+ "</td></tr></table></nav>";
return contents;
}
diff --git a/refdoc/structure/modref.html b/refdoc/structure/modref.html
index c04f07cdd0e9bb03352682097d5222e8c1ab41b2..4898958cfbd7bdadaac16fcccd85975b0d876d20 100644
--- a/refdoc/structure/modref.html
+++ b/refdoc/structure/modref.html
@@ -3,100 +3,63 @@
<title>Pike Reference Manual - $title$</title>
<link rel='stylesheet' href='$style$' />
</head>
- <body topmargin='0' leftmargin='0' marginheight='0' marginwidth='0'
- bgcolor='#ffffff' text='#000000' link='#000099' alink='#002040'
- vlink='#000099'>
+ <body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0"
+ bgcolor="#ffffff" text="#000000" link="#000099" alink="#002040"
+ vlink="#000099">
<header>
- <table width="100%">
- <tr>
- <td colspan='3'></td>
- <td colspan='2' align='right'>Extracted from $version$ as of $date$.</td>
- </tr>
- <tr>
- <td width="0%">
- <img src="$imagedir$unit.gif" alt="" width="10" height="1">
- </td>
- <td width="1%">
- <a href="http://pike.lysator.liu.se/"
- ><img src="$imagedir$pike_logo.gif" border="0"
- alt="pike.lysator.liu.se" width="181" height="41"
- hspace="5"
- ></a>
- </td>
- <td width="0%">
- <img src="$imagedir$unit.gif" alt="" width="10" height="1">
- </td>
- <td width="99%">
- <table align="center" border="0" width="100%"
- cellspacing="0" cellpadding="0" valign="middle">
- <tr>
- <td width="1%" align="right">
- <img src="$imagedir$pike_line_left.gif"
- alt="" border="0" width="5" height="11">
- </td>
- <td background="$imagedir$pike_line_middle.gif"
- width="98%">
- <img src="$dotdot$/$imagedir$unit.gif" alt=""
- border="0" width="11" height="11">
- </td>
- <td width="1%"
- align="left">
- <img src="$imagedir$pike_line_right.gif"
- alt="" border="0" width="5" height="11">
- </td>
- </tr>
- </table>
- </td>
- <td width="0%">
- <img src="$imagedir$unit.gif" alt="" width="10" height="1">
- </td>
- </tr>
- <tr>
- <td colspan="5">
- <img src="$imagedir$unit.gif" alt="" width="1" height="10">
- </td>
- </tr>
- </table>
+ <div>
+ <div style="text-align:right;">Extracted from $version$ as of $date$.</div>
+ <div style="overflow:hidden;">
+ <a href="http://pike.lysator.liu.se/"
+ style="float:left; width:181px; height:41px; margin:10px;
+ margin-left:22px; margin-right:25px;
+ background-image:url('$imagedir$pike_logo.gif');"></a>
+ <div style="margin:10px; height:11px;
+ margin-top:26px; margin-right:19px;
+ overflow:hidden;
+ background-image:url('$imagedir$pike_line_middle.gif');">
+ <span style="float:left; width:5px; height:11px;
+ background-image:url('$imagedir$pike_line_left.gif');"> </span>
+ <span style="float:right; width:5px; height:11px;
+ background-image:url('$imagedir$pike_line_right.gif');"> </span>
+ </div>
+ </div>
+ </div>
</header>
- <table>
- <tr>
- <td width='180' valign='top' bgcolor='#f0f0f0'>
- <nav>$navbar$</nav>
- </td>
- <td width='520' valign='top'>
-
- <nav>
- <table border="0" width="520" bgcolor="#e0e0e0"
- cellpadding="0" cellspacing="4" class='sidebar'>
- <tr>
- <td valign="middle">
- <a href="$prev_url$"
- ><img src="$imagedir$prev.gif" hspace="3"
- border="0" alt="previous"
- >$prev_title$</a>
- <br />
- </td>
- <td align="right" valign="middle">
- <a href="$next_url$"
- >$next_title$<img src="$imagedir$next.gif" hspace="3"
- border="0" alt="next"
- ></a>
- <br />
- </td>
- </tr>
- </table>
- </nav>
-
- <article>
- <h1>$type$ $title$</h1>
- $contents$
- </article>
- <footer>
- <hr size='1' noshade='1' />
- </footer>
- </td>
- </tr>
- </table>
+ <div>
+ <div style="float:left; background:#f0f0f0;
+ min-width:180px; margin-top:3px;">
+ <nav>
+ $navbar$
+ </nav>
+ </div>
+ <div style="width:520px; overflow:hidden;">
+ <nav>
+ <div style="background:#e0e0e0; overflow:hidden; padding:3px;
+ margin:3px;" class="sidebar">
+ <a href="$prev_url$"
+ style="float:left;"
+ ><img src="$imagedir$prev.gif" hspace="3"
+ border="0" alt="previous"
+ >$prev_title$</a>
+ <a href="$next_url$"
+ style="float:right; text-align:right;"
+ >$next_title$<img src="$imagedir$next.gif" hspace="3"
+ border="0" alt="next"
+ ></a>
+ </div>
+ </nav>
+ </div>
+ <div style="width:520px; overflow:hidden;">
+ <article>
+ <h1>$type$ $title$</h1>
+ $contents$
+ </article>
+ <footer>
+ <hr size="1" noshade="1" />
+ </footer>
+ </div>
+ </div>
</body>
</html>