diff --git a/doc/doxygen.conf b/doc/doxygen.conf index d71d3e52f..b2e05cad9 100644 --- a/doc/doxygen.conf +++ b/doc/doxygen.conf @@ -952,7 +952,10 @@ HTML_STYLESHEET = doc/ns3_html_theme/static/ns3_stylesheet.css 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 diff --git a/doc/ns3_html_theme/layout.html b/doc/ns3_html_theme/layout.html index 7d0b4f4c3..ae00998a4 100644 --- a/doc/ns3_html_theme/layout.html +++ b/doc/ns3_html_theme/layout.html @@ -22,6 +22,9 @@ {%- endif %} + + + {% endblock %} {% block header %} @@ -30,14 +33,44 @@ - + ns-3 Logo
{{ theme_projectbrief }}
- {{ theme_projectnumber }} + + + + +
+ +
{{ docstitle }} @@ -46,9 +79,8 @@ - {% endblock %} - + {% block rootrellink %}
  • {{ theme_projectname }} 
    • {{ super() }} diff --git a/doc/ns3_html_theme/ns3_doxy_header.html b/doc/ns3_html_theme/ns3_doxy_header.html index f3a0ce75a..efdba64a0 100644 --- a/doc/ns3_html_theme/ns3_doxy_header.html +++ b/doc/ns3_html_theme/ns3_doxy_header.html @@ -14,6 +14,7 @@ $mathjax +
    @@ -44,14 +45,45 @@ $mathjax + + +
    + +
    + + + + API + $searchbox - - API Documentation - diff --git a/doc/ns3_html_theme/static/drop-down-menu.js b/doc/ns3_html_theme/static/drop-down-menu.js new file mode 100644 index 000000000..fdebf7bb4 --- /dev/null +++ b/doc/ns3_html_theme/static/drop-down-menu.js @@ -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; diff --git a/doc/ns3_html_theme/static/menu-bgr-400.png b/doc/ns3_html_theme/static/menu-bgr-400.png new file mode 100644 index 000000000..f7696b602 Binary files /dev/null and b/doc/ns3_html_theme/static/menu-bgr-400.png differ diff --git a/doc/ns3_html_theme/static/ver.png b/doc/ns3_html_theme/static/ver.png new file mode 100644 index 000000000..5b95d25ec Binary files /dev/null and b/doc/ns3_html_theme/static/ver.png differ diff --git a/doc/ns3_html_theme/theme.conf b/doc/ns3_html_theme/theme.conf index 25bb707d7..0b28c22db 100644 --- a/doc/ns3_html_theme/theme.conf +++ b/doc/ns3_html_theme/theme.conf @@ -5,7 +5,21 @@ pygments_style = sphinx [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 diff --git a/wscript b/wscript index 15a05a901..484622d2c 100644 --- a/wscript +++ b/wscript @@ -1097,6 +1097,8 @@ class Ns3SphinxContext(Context.Context): 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)