--- a/doc/doxygen.conf Sun Jul 29 21:07:16 2012 -0700
+++ b/doc/doxygen.conf Wed Jul 18 13:39:20 2012 -0700
@@ -952,7 +952,10 @@
HTML_EXTRA_FILES = doc/ns3_html_theme/static/doxygen.css \
doc/ns3_html_theme/static/bar-top.png \
- doc/ns3_html_theme/static/favicon.ico
+ doc/ns3_html_theme/static/favicon.ico \
+ doc/ns3_html_theme/static/drop-down-menu.js \
+ doc/ns3_html_theme/static/menu-bgr-400.png \
+ doc/ns3_html_theme/static/ver.png
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
# Doxygen will adjust the colors in the style sheet and background images
--- a/doc/ns3_html_theme/layout.html Sun Jul 29 21:07:16 2012 -0700
+++ b/doc/ns3_html_theme/layout.html Wed Jul 18 13:39:20 2012 -0700
@@ -22,6 +22,9 @@
<link rel="icon" type="image/ico"
href="{{ pathto('_static/'+theme_favicon, 1) }}" />
{%- endif %}
+
+ <script type="text/javascript" src="_static/drop-down-menu.js"></script>
+
{% endblock %}
{% block header %}
@@ -30,14 +33,44 @@
<tbody>
<tr style="height: 56px;">
<td id="projectlogo">
- <a href="{{ theme_homepage }}">
+ <a href="{{theme_site + theme_homepage}}">
<img alt="ns-3 Logo"
src="{{ pathto('_static/' + theme_logo, 1)}}"/>
</a>
</td>
<td id="projecttext">
<div id="projectbrief">{{ theme_projectbrief }} </div>
- <span id="projectnumber">{{ theme_projectnumber }}</span>
+ <span id="projectnumber"><script type="text/javascript">document.write(rev)</script></span>
+ </td>
+
+ <td id="ns3-menu">
+ <div class="menu">
+ <ul >
+ <li><a href="{{theme_site + theme_homepage}}"> Home</a>
+ </li>
+ <li><a href="{{theme_site + theme_wiki}}">Wiki</a>
+ </li>
+ <li><span onmouseover="mopen('mDocs')"
+ onmouseout="mclosetime()">Docs ▼</span>
+ <div id="mDocs"
+ onmouseover="mcancelclosetime()"
+ onmouseout="mclosetime()">
+ <a href="{{theme_site + theme_release + theme_manual}}">Manual</a><br/>
+ <a href="{{theme_site + theme_release + theme_models}}">Models</a><br/>
+ <a href="{{theme_site + theme_release + theme_doxygen}}">API</a><br/>
+ </li>
+ <li><span onmouseover="mopen('mTuts')"
+ onmouseout="mclosetime()">Tutorials ▼</span>
+ <div id="mTuts"
+ onmouseover="mcancelclosetime()"
+ onmouseout="mclosetime()">
+ <a href="{{theme_site + theme_release + theme_tutorial}}">English</a><br/>
+ <a href="{{theme_site + theme_release + theme_tutport}}">Portuguese</a><br/>
+ </li>
+ <li><a href="{{theme_site + theme_bugzilla}}">Bugs</a>
+ </li>
+ </ul>
+ </div>
</td>
<td id="projectsection">
<span style="margin-right:10px">{{ docstitle }}</span>
@@ -46,9 +79,8 @@
</tbody>
</table>
</div>
+{% endblock %}
-{% endblock %}
-
{% block rootrellink %}
<li class="navelem"><a href="{{ theme_homepage }}">{{ theme_projectname }}</a><span class="navelem"> </span></li>
{{ super() }}
--- a/doc/ns3_html_theme/ns3_doxy_header.html Sun Jul 29 21:07:16 2012 -0700
+++ b/doc/ns3_html_theme/ns3_doxy_header.html Wed Jul 18 13:39:20 2012 -0700
@@ -14,6 +14,7 @@
<link href="$relpath$doxygen.css" rel="stylesheet" type="text/css"/>
<link href="$relpath$ns3_stylesheet.css" rel="stylesheet" type="text/css" />
<link href="$relpath$favicon.ico" rel="shortcut icon" type="image/ico" />
+<script type="text/javascript" src="$relpath$drop-down-menu.js"></script>
</head>
<body>
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
@@ -44,14 +45,45 @@
</td>
<!--END PROJECT_BRIEF-->
<!--END !PROJECT_NAME-->
+
+ <td id="ns3-menu">
+ <div class="menu">
+ <ul >
+ <li><a href="http://www.nsnam.org/"> Home</a>
+ </li>
+ <li><a href="http://www.nsnam.org/developers/tools/wiki/">Wiki</a>
+ </li>
+ <li><span onmouseover="mopen('mDocs')"
+ onmouseout="mclosetime()">Docs ▼</span>
+ <div id="mDocs"
+ onmouseover="mcancelclosetime()"
+ onmouseout="mclosetime()">
+ <a href="http://www.nsnam.org/docs/release/3.14/manual/html/index.html">Manual</a><br/>
+ <a href="http://www.nsnam.org/docs/release/3.14/models/html/index.html">Models</a><br/>
+ <a href="http://www.nsnam.org/docs/release/3.14/theme_doxygen">API</a><br/>
+ </li>
+ <li><span onmouseover="mopen('mTuts')"
+ onmouseout="mclosetime()">Tutorials ▼</span>
+ <div id="mTuts"
+ onmouseover="mcancelclosetime()"
+ onmouseout="mclosetime()">
+ <a href="http://www.nsnam.org/docs/release/3.14/tutorial/html/index.html">English</a><br/>
+ <a href="http://www.nsnam.org/docs/release/3.14/tutorial-pt-br/html/index.html">Portuguese</a><br/>
+ </li>
+ <li><a href="http://www.nsnam.org/developers/tools/bugzilla/">Bugs</a>
+ </li>
+ </ul>
+ </div>
+ </td>
+
+ <td id="projectsection">
+ <span style="margin-right:10px">API</span>
+ </td>
<!--BEGIN DISABLE_INDEX-->
<!--BEGIN SEARCHENGINE-->
<td>$searchbox</td>
<!--END SEARCHENGINE-->
<!--END DISABLE_INDEX-->
- <td id="projectsection">
- <span style="margin-right:10px">API Documentation</span>
- </td>
</tr>
</tbody>
</table>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/ns3_html_theme/static/drop-down-menu.js Wed Jul 18 13:39:20 2012 -0700
@@ -0,0 +1,45 @@
+// Copyright 2006-2007 javascript-array.com
+// http://javascript-array.com/scripts/simple_drop_down_menu/
+
+var timeout = 250;
+var closetimer = 0;
+var ddmenuitem = 0;
+
+// open hidden layer
+function mopen(id)
+{
+ // cancel close timer
+ mcancelclosetime();
+
+ // close old layer
+ if(ddmenuitem) ddmenuitem.style.visibility = 'hidden';
+
+ // get new layer and show it
+ ddmenuitem = document.getElementById(id);
+ ddmenuitem.style.visibility = 'visible';
+
+}
+// close showed layer
+function mclose()
+{
+ if(ddmenuitem) ddmenuitem.style.visibility = 'hidden';
+}
+
+// go close timer
+function mclosetime()
+{
+ closetimer = window.setTimeout(mclose, timeout);
+}
+
+// cancel close timer
+function mcancelclosetime()
+{
+ if(closetimer)
+ {
+ window.clearTimeout(closetimer);
+ closetimer = null;
+ }
+}
+
+// close layer when click-out
+document.onclick = mclose;
Binary file doc/ns3_html_theme/static/menu-bgr-400.png has changed
Binary file doc/ns3_html_theme/static/ver.png has changed
--- a/doc/ns3_html_theme/theme.conf Sun Jul 29 21:07:16 2012 -0700
+++ b/doc/ns3_html_theme/theme.conf Wed Jul 18 13:39:20 2012 -0700
@@ -5,7 +5,21 @@
[options]
projectname = ns-3
-homepage = http://www.nsnam.org/
+
+site = http://www.nsnam.org/
+
+homepage =
+wiki = developers/tools/wiki/
+bugzilla = developers/tools/bugzilla/
+
+# prefix for the following pages
+release = docs/release/3.14/
+doxygen = doxygen/index.html
+manual = manual/html/index.html
+models = models/html/index.html
+tutorial = tutorial/html/index.html
+tutport = tutorial-pt-br/html/index.html
+
customstylesheet = ns3_stylesheet.css
logo = ns-3-inverted-notext-small.png
logoalt = ns-3 Logo
--- a/wscript Sun Jul 29 21:07:16 2012 -0700
+++ b/wscript Wed Jul 18 13:39:20 2012 -0700
@@ -1097,6 +1097,8 @@
cmd = 'sphinx'
def sphinx_build(self, path):
+ print
+ print "[waf] Building sphinx docs for " + path
if subprocess.Popen(["make", "-k", "html"], cwd=path).wait() :
raise SystemExit(1)
