summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/archivepage.tmpl2
-rw-r--r--templates/blogpost.tmpl4
-rw-r--r--templates/feedlink.tmpl4
-rw-r--r--templates/page.tmpl112
4 files changed, 57 insertions, 65 deletions
diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
index 738abcc..18ea4bc 100644
--- a/templates/archivepage.tmpl
+++ b/templates/archivepage.tmpl
@@ -7,7 +7,7 @@
<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
</TMPL_IF>
<TMPL_LOOP TAGS>
- &nbsp;<span class="label label-default"><TMPL_VAR LINK></span>
+ &nbsp;<span class="badge"><TMPL_VAR LINK></span>
</TMPL_LOOP>
</div>
<div class="col-md-4 col-sm-4 text-muted">
diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl
index 6156881..ddf2a8f 100644
--- a/templates/blogpost.tmpl
+++ b/templates/blogpost.tmpl
@@ -1,10 +1,10 @@
<p class="text-right">
<TMPL_IF RSSURL>
- <a class="label label-info" type="application/rss+xml" rel="alternate"
+ <a class="badge badge-info" type="application/rss+xml" rel="alternate"
title="<TMPL_VAR RSSDESC>" href="<TMPL_VAR RSSURL>">RSS</a>
</TMPL_IF>
<TMPL_IF ATOMURL>
- <a class="label label-info" type="application/atom+xml" rel="alternate"
+ <a class="badge badge-info" type="application/atom+xml" rel="alternate"
title="<TMPL_VAR ATOMDESC>" href="<TMPL_VAR ATOMURL>">Atom</a>
</TMPL_IF>
</p>
diff --git a/templates/feedlink.tmpl b/templates/feedlink.tmpl
index 7d82c02..f640ab5 100644
--- a/templates/feedlink.tmpl
+++ b/templates/feedlink.tmpl
@@ -1,8 +1,8 @@
<div class="text-right" style="margin-top:1em; margin-bottom:1em;">
<TMPL_IF RSSURL>
- <a class="label label-info" type="application/rss+xml" rel="alternate" title="<TMPL_VAR RSSDESC>" href="<TMPL_VAR RSSURL>">RSS</a>
+ <a class="badge badge-info" type="application/rss+xml" rel="alternate" title="<TMPL_VAR RSSDESC>" href="<TMPL_VAR RSSURL>">RSS</a>
</TMPL_IF>
<TMPL_IF ATOMURL>
- <a class="label label-info" type="application/atom+xml" rel="alternate" title="<TMPL_VAR ATOMDESC>" href="<TMPL_VAR ATOMURL>">Atom</a>
+ <a class="badge badge-info" type="application/atom+xml" rel="alternate" title="<TMPL_VAR ATOMDESC>" href="<TMPL_VAR ATOMURL>">Atom</a>
</TMPL_IF>
</div>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 0f2f705..b805d98 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -6,13 +6,8 @@
<meta charset="utf-8" />
<!-- Bootstrap -->
<link rel="stylesheet" href="/static/css/bootstrap.min.css">
+ <link rel="stylesheet" href="/static/css/font-awesome.min.css">
<link rel="stylesheet" href="/static/css/fripost.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/respond.min.js"></script>
- <![endif]-->
<TMPL_IF FAVICON>
<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
</TMPL_IF>
@@ -25,62 +20,59 @@
</head>
<body>
<div class="container">
- <nav class="navbar navbar-fripost" role="navigation">
- <!-- Brand and toggle get grouped for better mobile display -->
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="https://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">
+ <nav class="navbar navbar-expand-md navbar-fripost navbar-light mb-4 mt-2">
+ <a class="navbar-brand" href="https://fripost.org"><b>fripost</b> | demokratisk e-post</a>
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar">
+ <span class="navbar-toggler-icon"></span>
+ </button>
- <li><a href="<TMPL_IF ISWEBSITE>/<TMPL_ELSE>https://fripost.org</TMPL_IF>">Hem</a></li>
- <li><a href="<TMPL_UNLESS ISWEBSITE>https://fripost.org</TMPL_UNLESS>/om">Om</a></li>
- <li><a href="<TMPL_UNLESS ISWEBSITE>https://fripost.org</TMPL_UNLESS>/medlemskap">G&aring; med</a></li>
- <li><a href="<TMPL_UNLESS ISWEBSITE>https://fripost.org</TMPL_UNLESS>/kontakt">Kontakt</a></li>
- <li><a href="<TMPL_UNLESS ISWEBSITE>https://fripost.org</TMPL_UNLESS>/english">English</a></li>
- <li><a href="<TMPL_IF ISWEBSITE>https://wiki.fripost.org</TMPL_IF>/faq">FAQ</a></li>
- <li><a href="<TMPL_IF ISWEBSITE>https://wiki.fripost.org<TMPL_ELSE>/</TMPL_IF>">Wiki</a></li>
-
- </ul>
- <ul class="nav navbar-nav navbar-right">
- <li>
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- <span class="glyphicon glyphicon-user"></span> Medlemmar <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="https://mail.fripost.org/">
- <span class="glyphicon glyphicon-envelope"></span> Webbmail</a></li>
- <li><a href="https://cloud.fripost.org/">
- <span class="glyphicon glyphicon-cloud"></span> Lagring för delning</a></li>
- <li><a href="https://lists.fripost.org/sympa/lists">
- <span class="glyphicon glyphicon-list"></span> E-postlistor</a></li>
+ <div class="collapse navbar-collapse" id="collapsibleNavbar">
+ <ul class="navbar-nav">
+ <li class="nav-item p-2">
+ <a class="nav-link" href="<TMPL_IF ISWEBSITE>/<TMPL_ELSE>https://fripost.org</TMPL_IF>">Hem</a>
+ </li>
+ <li class="nav-item p-2">
+ <a class="nav-link" href="<TMPL_UNLESS ISWEBSITE>https://fripost.org</TMPL_UNLESS>/om">Om</a>
+ </li>
+ <li class="nav-item p-2">
+ <a class="nav-link" href="<TMPL_UNLESS ISWEBSITE>https://fripost.org</TMPL_UNLESS>/medlemskap">G&aring; med</a>
+ </li>
+ <li class="nav-item p-2">
+ <a class="nav-link" href="<TMPL_UNLESS ISWEBSITE>https://fripost.org</TMPL_UNLESS>/kontakt">Kontakt</a>
+ </li>
+ <li class="nav-item p-2">
+ <a class="nav-link" href="<TMPL_IF ISWEBSITE>https://wiki.fripost.org</TMPL_IF>/faq">FAQ</a>
+ </li>
+ <li class="nav-item p-2">
+ <a class="nav-link" href="<TMPL_IF ISWEBSITE>https://wiki.fripost.org</TMPL_IF>/essays">Essäer</a>
+ </li>
+ <li class="nav-item p-2">
+ <a class="nav-link" href="<TMPL_IF ISWEBSITE>https://wiki.fripost.org<TMPL_ELSE>/</TMPL_IF>">Wiki</a>
+ </li>
+ </ul>
+ </div>
+ <div class="navbar-collapse p-2 order-2">
+ <ul class="navbar-nav ml-auto">
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle" href="#" id="navbardrop" data-toggle="dropdown"><i class="fa fa-user"></i> Medlemmar</a>
+ <div class="dropdown-menu">
+ <a class="dropdown-item" href="https://mail.fripost.org/"><i class="fa fa-envelope"></i> Webbmail</a>
+ <a class="dropdown-item" href="https://cloud.fripost.org/"><i class="fa fa-cloud"></i> Lagring för delning</a>
+ <a class="dropdown-item" href="https://lists.fripost.org/sympa/lists"><i class="fa fa-list"></i> E-postlistor</a>
<!-- later...
- <li class="divider"></li>
- <li><a href="#"><span class="glyphicon glyphicon-wrench"></span> Administrationspanel</a></li>
+ <a class="dropdown-item" href="#"><i class="fa fa-wrench"></i> Administrationspanel</a>
-->
-
- <li>
-
- <a href="<TMPL_UNLESS ISWEBSITE>https://fripost.org</TMPL_UNLESS>/certs">
- <span class="glyphicon glyphicon-certificate"></span> Certifikat</a>
-
- </li>
- </ul>
+ <a class="dropdown-item" href="<TMPL_UNLESS ISWEBSITE>https://fripost.org</TMPL_UNLESS>/certs"><i class="fa fa-certificate"></i> Certifikat</a>
+ </div>
</li>
</ul>
- </div><!-- /.navbar-collapse -->
+ </div>
</nav>
<div class="row">
- <div class="col-md-8 col-md-offset-2">
+ <div class="col-md-8 offset-md-2">
<!-- -->
<!-- HEADER -->
<TMPL_UNLESS ISWEBSITE>
@@ -96,7 +88,7 @@
<TMPL_IF EDITURL>
<div class="col-md-4 col-sm-4 col-xs-6 text-right">
<a href="<TMPL_VAR EDITURL>" rel="nofollow">
- <span class="glyphicon glyphicon-pencil"></span> Redigera sidan
+ <i class="fa fa-pencil"></i> Redigera sidan
</a>
</div>
</TMPL_IF>
@@ -115,24 +107,24 @@
<!-- FOOTER -->
<TMPL_IF TAGS>
<p><TMPL_LOOP TAGS>
- <span class="label label-default"><TMPL_VAR LINK></span>
+ <span class="badge"><TMPL_VAR LINK></span>
</TMPL_LOOP></p>
</TMPL_IF>
<p>
<TMPL_IF MTIME>
- <span class="glyphicon glyphicon-calendar"></span> Last modified <em><TMPL_VAR MTIME></em>
+ <i class="fa fa-calendar"></i> Last modified <em><TMPL_VAR MTIME></em>
<TMPL_IF HISTORYURL>
- | <span class="glyphicon glyphicon-time"></span> <a href="<TMPL_VAR HISTORYURL>">History</a>
+ | <i class="fa fa-clock-o"></i> <a href="<TMPL_VAR HISTORYURL>">History</a>
</TMPL_IF>
<TMPL_UNLESS ISWEBSITE>
<TMPL_IF GETSOURCEURL>
- | <span class="glyphicon glyphicon-file"></span> <a href="<TMPL_VAR GETSOURCEURL>">Source</a>
+ | <i class="fa fa-file"></i> <a href="<TMPL_VAR GETSOURCEURL>">Source</a>
</TMPL_IF>
<TMPL_IF DISCUSSIONURL>
- | <span class="glyphicon glyphicon-comment"></span> <a href="<TMPL_VAR DISCUSSIONURL>">Discussion</a>
+ | <i class="fa fa-comment"></i> <a href="<TMPL_VAR DISCUSSIONURL>">Discussion</a>
</TMPL_IF>
<TMPL_IF PREFSURL>
- | <span class="glyphicon glyphicon-wrench"></span> <a href="<TMPL_VAR PREFSURL>">Preferences</a>
+ | <i class="fa fa-wrench"></i> <a href="<TMPL_VAR PREFSURL>">Preferences</a>
</TMPL_IF>
</TMPL_UNLESS>
</TMPL_IF>