Run utils/trim-trailing-whitespace.py on codebase
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
# If both a and b are true, we're building for public urls.
|
||||
# (The newer update-docs script (through ns3) sets
|
||||
# NS3_WWW_URLS=public explicitly.)
|
||||
#
|
||||
#
|
||||
# The repo version is either a tag name or a commit (short) id.
|
||||
#
|
||||
# If we're building for nsnam.org, and at a tag, we use just
|
||||
@@ -64,7 +64,7 @@ function usage
|
||||
-n pretend we are on nsnam.org
|
||||
-d pretend we are in the automated build directory
|
||||
-t pretend we are at a repo tag
|
||||
|
||||
|
||||
EOF
|
||||
exit 1
|
||||
}
|
||||
@@ -172,24 +172,24 @@ if [ $PUBLIC -eq 1 ]; then
|
||||
echo "// public urls" >> $outf
|
||||
# Generate URL relative to server root
|
||||
echo "var ns3_host = \"/\";" >> $outf
|
||||
|
||||
|
||||
if [ $distance -eq 1 ]; then
|
||||
# Like "http://www.nsnam.org/ns-3-14"
|
||||
vers_href="https://www.nsnam.org/ns-3-${version#ns-3.}"
|
||||
vers_href="<a href=\\\"$vers_href\\\">$version$dirty</a>"
|
||||
|
||||
|
||||
echo "var ns3_version = \"Release $vers_href\";" >> $outf
|
||||
echo "var ns3_release = \"docs/release/${version#ns-}/\";" >> $outf
|
||||
else
|
||||
vers_href="https://gitlab.com/nsnam/ns-3-dev/commits/$version"
|
||||
version="<a href=\\\"$vers_href\\\">$version$dirty</a>"
|
||||
|
||||
|
||||
echo "var ns3_version = \"ns-3-dev @ $version\";" >> $outf
|
||||
echo "var ns3_release = \"docs/\";" >> $outf
|
||||
fi
|
||||
echo "var ns3_local = \"\";" >> $outf
|
||||
echo "var ns3_doxy = \"doxygen/\";" >> $outf
|
||||
|
||||
|
||||
else
|
||||
repo=`basename $PWD`
|
||||
echo "// ns3_version.js: automatically generated" > $outf
|
||||
|
||||
@@ -11,15 +11,15 @@
|
||||
|
||||
{% set reldelim1 = '<span class="navelem"> </span>' %}
|
||||
{# set reldelim1 = ' @' #}
|
||||
|
||||
|
||||
{%- block extrahead %}
|
||||
{%- if theme_customstylesheet %}
|
||||
<link rel="stylesheet" type="text/css"
|
||||
href="{{ pathto('_static/'+theme_customstylesheet, 1) }}" />
|
||||
{%- endif %}
|
||||
|
||||
|
||||
{%- if theme_favicon %}
|
||||
<link rel="icon" type="image/ico"
|
||||
<link rel="icon" type="image/ico"
|
||||
href="{{ pathto('_static/'+theme_favicon, 1) }}" />
|
||||
{%- endif %}
|
||||
|
||||
@@ -27,9 +27,9 @@
|
||||
<script type="text/javascript" src="_static/ns3_version.js"></script>
|
||||
<script type="text/javascript">var ns3_builder="{{builder}}";</script>
|
||||
<script type="text/javascript" src="_static/ns3_links.js"></script>
|
||||
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block header %}
|
||||
<div id="titlearea">
|
||||
<table cellspacing="0" cellpadding="0" width="100%">
|
||||
@@ -56,11 +56,11 @@
|
||||
> Home</a>
|
||||
</li>
|
||||
<li><span
|
||||
onmouseover="mopen('mTuts')"
|
||||
onmouseover="mopen('mTuts')"
|
||||
onmouseout="mclosetime()"
|
||||
>Tutorials ▼</span>
|
||||
<div id="mTuts"
|
||||
onmouseover="mcancelclosetime()"
|
||||
<div id="mTuts"
|
||||
onmouseover="mcancelclosetime()"
|
||||
onmouseout="mclosetime()">
|
||||
<a id="ns3_tut"
|
||||
href="/docs/tutorial/html/index.html"
|
||||
@@ -68,11 +68,11 @@
|
||||
</div>
|
||||
</li>
|
||||
<li><span
|
||||
onmouseover="mopen('mDocs')"
|
||||
onmouseover="mopen('mDocs')"
|
||||
onmouseout="mclosetime()"
|
||||
>Documentation ▼</span>
|
||||
<div id="mDocs"
|
||||
onmouseover="mcancelclosetime()"
|
||||
onmouseover="mcancelclosetime()"
|
||||
onmouseout="mclosetime()">
|
||||
<a id="ns3_man"
|
||||
href="/docs/manual/html/index.html"
|
||||
@@ -89,11 +89,11 @@
|
||||
</div>
|
||||
</li>
|
||||
<li><span
|
||||
onmouseover="mopen('mDev')"
|
||||
onmouseover="mopen('mDev')"
|
||||
onmouseout="mclosetime()"
|
||||
>Development ▼</span>
|
||||
<div id="mDev"
|
||||
onmouseover="mcancelclosetime()"
|
||||
onmouseover="mcancelclosetime()"
|
||||
onmouseout="mclosetime()">
|
||||
<a id="ns3_api"
|
||||
href="/docs/doxygen/html/index.html"
|
||||
@@ -119,12 +119,12 @@
|
||||
<script type="text/javascript">ns3_write_links()</script>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block rootrellink %}
|
||||
<li class="navelem"><a href="{{ theme_homepage }}">{{ theme_projectname }}</a><span class="navelem"> </span></li>
|
||||
{{ super() }}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% if theme_collapsiblesidebar|tobool %}
|
||||
{% set script_files = script_files + ['_static/sidebar.js'] %}
|
||||
{% endif %}
|
||||
|
||||
@@ -52,11 +52,11 @@ $extrastylesheet
|
||||
> Home</a>
|
||||
</li>
|
||||
<li><span
|
||||
onmouseover="mopen('mTuts')"
|
||||
onmouseover="mopen('mTuts')"
|
||||
onmouseout="mclosetime()"
|
||||
>Tutorials ▼</span>
|
||||
<div id="mTuts"
|
||||
onmouseover="mcancelclosetime()"
|
||||
<div id="mTuts"
|
||||
onmouseover="mcancelclosetime()"
|
||||
onmouseout="mclosetime()">
|
||||
<a id="ns3_tut"
|
||||
href="/docs/tutorial/html/index.html"
|
||||
@@ -64,11 +64,11 @@ $extrastylesheet
|
||||
</div>
|
||||
</li>
|
||||
<li><span
|
||||
onmouseover="mopen('mDocs')"
|
||||
onmouseover="mopen('mDocs')"
|
||||
onmouseout="mclosetime()"
|
||||
>Documentation ▼</span>
|
||||
<div id="mDocs"
|
||||
onmouseover="mcancelclosetime()"
|
||||
onmouseover="mcancelclosetime()"
|
||||
onmouseout="mclosetime()">
|
||||
<a id="ns3_man"
|
||||
href="/docs/manual/html/index.html"
|
||||
@@ -85,11 +85,11 @@ $extrastylesheet
|
||||
</div>
|
||||
</li>
|
||||
<li><span
|
||||
onmouseover="mopen('mDev')"
|
||||
onmouseover="mopen('mDev')"
|
||||
onmouseout="mclosetime()"
|
||||
>Development ▼</span>
|
||||
<div id="mDev"
|
||||
onmouseover="mcancelclosetime()"
|
||||
onmouseover="mcancelclosetime()"
|
||||
onmouseout="mclosetime()">
|
||||
<a id="ns3_api"
|
||||
href="/docs/doxygen/html/index.html"
|
||||
|
||||
@@ -4,19 +4,19 @@
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
//
|
||||
// (1) Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
//
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
//
|
||||
// (2) Redistributions in binary form must reproduce the above copyright
|
||||
// notice, this list of conditions and the following disclaimer in
|
||||
// the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
//
|
||||
// distribution.
|
||||
//
|
||||
// (3) The name of the author may not be used to
|
||||
// endorse or promote products derived from this software without
|
||||
// specific prior written permission.
|
||||
//
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
@@ -27,8 +27,8 @@
|
||||
// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
||||
// IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
// POSSIBILITY OF SUCH DAMAGE.
|
||||
//
|
||||
// POSSIBILITY OF SUCH DAMAGE.
|
||||
//
|
||||
|
||||
var timeout = 250;
|
||||
var closetimer = 0;
|
||||
@@ -36,13 +36,13 @@ 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';
|
||||
@@ -71,4 +71,4 @@ function mcancelclosetime()
|
||||
}
|
||||
|
||||
// close layer when click-out
|
||||
document.onclick = mclose;
|
||||
document.onclick = mclose;
|
||||
|
||||
@@ -130,7 +130,7 @@ div.sphinxsidebar a {
|
||||
|
||||
/*
|
||||
ns-3 Main-menu, based on WordPress site
|
||||
|
||||
|
||||
Drop down menu based on Simple Javascript Drop-Down Menu v2.0
|
||||
http://javascript-array.com/scripts/simple_drop_down_menu/
|
||||
*/
|
||||
@@ -168,7 +168,7 @@ div.sphinxsidebar a {
|
||||
color:#ffffff;
|
||||
float:left;
|
||||
font-family: Aldo, Tahoma, Arial, sans-serif;
|
||||
font-size: 14px;
|
||||
font-size: 14px;
|
||||
/* height:40px; */
|
||||
margin:0px 0px 0px 0px;
|
||||
/* overflow:hidden; */
|
||||
@@ -184,7 +184,7 @@ div.sphinxsidebar a {
|
||||
font-weight: normal; /* default anchors are bold */
|
||||
text-decoration:none; /* default anchors are underlined */
|
||||
}
|
||||
|
||||
|
||||
#ns3-menu .menu ul li a:hover {
|
||||
color:#cadc48;
|
||||
text-decoration:none; /* don't add underline on hover */
|
||||
|
||||
Reference in New Issue
Block a user