summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustav Eek <gustav@fripost.org>2015-04-24 21:40:14 +0200
committerGustav Eek <gustav@fripost.org>2015-04-24 21:40:14 +0200
commit21bf78ac7720167b895164af494d4317a199789f (patch)
treedea30437e465877eda72f16df8e1362e8320eb91
parent122c931ecf96bc182291c15a37ac2e878c156e59 (diff)
Temporary link changes
Of course the navigation bar links on the wiki can not yet point to the addresses to be. The template page.tmpl is modified so that navigation links point to relative path pages. When fripost.org and wiki.fripost.org are served from the same instance, then the navigation bar URL's should be updated again.
-rw-r--r--templates/page.tmpl39
1 files changed, 30 insertions, 9 deletions
diff --git a/templates/page.tmpl b/templates/page.tmpl
index db6f4d0..06e5a18 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -53,14 +53,26 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
- <li><a href="http://fripost.org">Hem</a></li>
- <li><a href="http://fripost.org/om/">Om</a></li>
- <li><a href="http://fripost.org/medlemskap.html">G&aring; med</a></li>
- <li><a href="http://fripost.org/kontakt/">Kontakt</a></li>
- <li><a href="http://fripost.org/english/">English</a></Li>
- <li><a href="http://wiki.fripost.org/faq/">FAQ</a></li>
- <li><a href="http://wiki.fripost.org">Wiki</a></Lie>
- </ul>
+
+ <li><a href="/website">Hem</a></li>
+ <li><a href="/website/om">Om</a></li>
+ <li><a href="/website/medlemskap">G&aring; med</a></li>
+ <li><a href="/website/kontakt">Kontakt</a></li>
+ <li><a href="/website/english">English</a></li>
+ <li><a href="/faq">FAQ</a></li>
+ <li><a href="/">Wiki</a></li>
+
+ <!-- later ...
+ <li><a href="http://fripost.org">Hem</a></li>
+ <li><a href="http://fripost.org/om">Om</a></li>
+ <li><a href="http://fripost.org/medlemskap">G&aring; med</a></li>
+ <li><a href="http://fripost.org/kontakt">Kontakt</a></li>
+ <li><a href="http://fripost.org/english">English</a></li>
+ <li><a href="http://wiki.fripost.org/faq">FAQ</a></li>
+ <li><a href="http://wiki.fripost.org">Wiki</a></li>
+ -->
+
+ </ul>
<ul class="nav navbar-nav navbar-right">
<li>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -70,13 +82,22 @@
<span class="glyphicon glyphicon-envelope"></span> Webmail</a></li>
<li><a href="https://antilop.fripost.org/mailman/listinfo">
<span class="glyphicon glyphicon-list"></span> Mailing lists</a></li>
+
<!-- later...
<li class="divider"></li>
<li><a href="#"><span class="glyphicon glyphicon-wrench"></span> Admin panel</a></li>
-->
+
<li>
- <a href="<TMPL_VAR BASEURL>certs/">
+
+ <a href="/website/certs">
<span class="glyphicon glyphicon-certificate"></span> Certifikat</a>
+
+ <!-- later ...
+ <a href="http://fripost.org/certs/">
+ <span class="glyphicon glyphicon-certificate"></span> Certifikat</a>
+ -->
+
</li>
</ul>
</li>