summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorGustav Eek <gustav@fripost.org>2015-04-24 20:50:18 +0200
committerGustav Eek <gustav@fripost.org>2015-04-24 20:50:18 +0200
commit122c931ecf96bc182291c15a37ac2e878c156e59 (patch)
tree2bd4a4d37e2347200153ff6dde16df9e78c6ef42 /templates
parentfcac7568ec8f2c24d207690f83c160b5dcff8eb0 (diff)
parent11f47202476a3760d680f50257ee5700fe4b48d5 (diff)
Merge branch 'website-separation'
Conflicts: templates/page.tmpl
Diffstat (limited to 'templates')
-rw-r--r--templates/page.tmpl37
1 files changed, 23 insertions, 14 deletions
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 40cb459..db6f4d0 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="utf-8" />
<!-- Bootstrap -->
- <link rel="stylesheet" href="/static/css/bootstrap.min.css">
+ <link rel="stylesheet" href="<TMPL_VAR BASEURL>static/css/bootstrap.min.css">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
- <script src="/static/js/html5shiv.min.js"></script>
+ <script src="/static/js/html5shiv.min.js"></script>
<script src="/static/js/respond.min.js"></script>
<![endif]-->
<TMPL_IF FAVICON>
@@ -47,28 +47,37 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="/"><b>fripost</b> | demokratisk e-post</a>
+ <a class="navbar-brand" href="http://fripost.org"><b>fripost</b> | demokratisk e-post</a>
</div>
<!-- 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 class="active"><a href="https://fripost.org/">Hem</a></li>
- <li><a href="<TMPL_VAR BASEURL>om/">Om</a></li>
- <li><a href="<TMPL_VAR BASEURL>faq/">FAQ</a></li>
- <li><a href="https://fripost.org/medlemskap.html">G&aring; med</a></li>
- <li><a href="<TMPL_VAR BASEURL>kontakt/">Kontakt</a></li>
+ <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>
<ul class="nav navbar-nav navbar-right">
<li>
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-user"></span> Members <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+ <span class="glyphicon glyphicon-user"></span> Members <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="https://mail.fripost.org/"><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>
+ <li><a href="https://mail.fripost.org/">
+ <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/">
+ <span class="glyphicon glyphicon-certificate"></span> Certifikat</a>
+ </li>
</ul>
</li>
</ul>
@@ -77,7 +86,7 @@
<div class="row">
<div class="col-md-8 col-md-offset-2">
- <!-- ---------------------------------------------------------------- -->
+ <!-- -->
<!-- HEADER -->
<div class="row">
<div class="col-md-8 col-sm-8 col-xs-6">
@@ -98,12 +107,12 @@
</div>
<hr />
- <!-- ---------------------------------------------------------------- -->
+ <!-- -->
<!-- CONTENT -->
<TMPL_VAR CONTENT>
<hr />
- <!-- ---------------------------------------------------------------- -->
+ <!-- -->
<!-- FOOTER -->
<p>
<TMPL_IF TAGS>