summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-11-21 20:00:58 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-11-21 20:00:58 +0100
commitbf0e04ec0d8d87c1c9c888219c3722d07a1bb9bb (patch)
tree02cd35ad5b2ac718b2d4016c7784589df06a9673
parent1d5cac34a73ff18ea4c1e002efc85bfbd9ca389f (diff)
parent216f0ab095b72a30024ca25a4dc47feaada634c8 (diff)
downloadweb-common-bf0e04ec0d8d87c1c9c888219c3722d07a1bb9bb.tar.gz
web-common-bf0e04ec0d8d87c1c9c888219c3722d07a1bb9bb.tar.bz2
web-common-bf0e04ec0d8d87c1c9c888219c3722d07a1bb9bb.zip
Merge branch 'master' of ssh://taler.net/web-common
Conflicts: dropdown-navbar.html
-rw-r--r--dropdown-navbar.html15
1 files changed, 7 insertions, 8 deletions
diff --git a/dropdown-navbar.html b/dropdown-navbar.html
index 35a81c5..9d2cb60 100644
--- a/dropdown-navbar.html
+++ b/dropdown-navbar.html
@@ -16,29 +16,28 @@
@author Marcello Stanisci
-->
<div>
- <link rel="stylesheet" type="text/css" href="/static/web-common/dropdown-navbar_style.css">
- <!-- FIXME: get rid of this hardcoded include path-->
- <script src="/static/web-common/dropdown-navbar_script.js" type="application/javascript"></script>
+ <link rel="stylesheet" type="text/css" href="<!--# echo var="envroot" default="/" -->static/web-common/dropdown-navbar_style.css">
+ <script src="<!--# echo var="envroot" default="/" -->static/web-common/dropdown-navbar_script.js" type="application/javascript"></script>
<div class="dropdown-navbar">
<ul>
<li>
<a href="https://taler.net/" class="m_index btn btn-outline-success" id="home" target="_blank">Home</a>
</li>
<li>
- <a href="/landing" class="m_demo" id="demo">Instructions</a>
+ <a href="<!--# echo var="envroot" default="/" -->landing" class="m_demo" id="demo">Instructions</a>
</li>
<li>
<a href="javascript:void(0)" class="dropbtn" id="bank">Bank</a>
<div class="dropdown-content bank">
- <a href="/bank">Main</a>
- <a href="/bank/public-accounts">Public accounts</a>
+ <a href="<!--# echo var="envroot" default="/" -->bank">Main</a>
+ <a href="<!--# echo var="envroot" default="/" -->bank/public-accounts">Public accounts</a>
</div>
</li>
<li>
- <a href="/shop" class="m_demo" id="shop">Shop</a>
+ <a href="<!--# echo var="envroot" default="/" -->shop" class="m_demo" id="shop">Shop</a>
</li>
<li>
- <a href="/donations" class="m_demo" id="donations">Donations</a>
+ <a href="<!--# echo var="envroot" default="/" -->donations" class="m_demo" id="donations">Donations</a>
</li>
</ul>
</div>