diff --git a/_includes/header.html b/_includes/header.html
index 75e3d80a0bacc9074d64c95af1c412c48b41cc29..5f857010b0d14e50d41796f3b502906de9043cd0 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,6 +1,6 @@
<!-- Static navbar -->
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
- <div class="container">
+ <div class="navbar-wrapper">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
@@ -17,9 +17,8 @@
<a href="#" class="dropdown-toggle purple" data-toggle="dropdown">{% t menu.blog %} <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="/blog">{% t menu.allblog %}</a></li>
- <li><a href="/blog/missives">{% t menu.missives %}</a></li>
- <li><a href="/blog/devdiaries">{% t menu.devdiaries %}</a></li>
- <li><a href="/blog/uncategorised">{% t menu.uncategorised %}</a></li>
+ <li><a href="/blog/tags/monero%20missives">{% t menu.missives %}</a></li>
+ <li><a href="/blog/tags/dev%20diaries">{% t menu.devdiaries %}</a></li>
</ul>
</li>
<li class="dropdown">
@@ -44,12 +43,13 @@
<li><a href="/knowledge-base/user-guides">{% t menu.userguides %}</a></li>
<li><a href="/knowledge-base/developer-guides">{% t menu.developerguides %}</a></li>
<li class="divider"></li>
+ <li><a href="/research-lab">{% t menu.lab %}</a></li>
<li><a href="/knowledge-base/openalias">{% t menu.openalias %}</a></li>
<li><a href="/knowledge-base/projects">{% t menu.projects %}</a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle softyellow" data-toggle="dropdown">{% t menu.community %} <span class="caret"></span></a>
+ <a href="#" class="dropdown-toggle softyellow last" data-toggle="dropdown">{% t menu.community %} <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="https://forum.monero.cc">{% t menu.forum %}</a></li>
<li><a href="https://www.reddit.com/r/monero/">{% t menu.reddit %}</a></li>
diff --git a/_layouts/blog_by_tag.html b/_layouts/blog_by_tag.html
index bc26d42dcf69ebe18552a62cb29f8fefcc65f0b4..a3a980bb7344124250aa3e0fe37b9c99e6d076e5 100644
--- a/_layouts/blog_by_tag.html
+++ b/_layouts/blog_by_tag.html
@@ -10,7 +10,11 @@ layout: default
{% endif %}
{% endfor %}
-<h1>{% t tags.all %}: <span class="kicks">{{ tag.name }}</span></h1>
+<div class="page-title">
+ <!-- Icon is based on work by Sergiu Bagrin (http://pixelkit.com) and is licensed under Creative Commons BY 3.0 -->
+ <img src="//static.monero.cc/images/icon_tags.svg" class="title-icon"><h2 class="inline">{% t tags.all %}: <span class="kicks">{{ tag.name }}</span></h2>
+</div>
+
<div>
{% if site.tags[tag.slug] %}
{% for post in site.tags[tag.slug] %}
@@ -20,7 +24,7 @@ layout: default
</blockquote>
{% endfor %}
{% else %}
- <h3>There are no posts for this tag.</h3>
+ <h3>{% t tags.notags %}</h3>
{% endif %}
</div>
diff --git a/_layouts/root.html b/_layouts/root.html
index b924495f242f2cbb217d92f6b7f9b05de8b2123e..582dfba062b32d8450e0993067128d886e058203 100644
--- a/_layouts/root.html
+++ b/_layouts/root.html
@@ -6,13 +6,17 @@
<body>
- {% include header.html %}
+ <div id="wrap">
- <div class="container main-content">
- {{ content }}
- </div>
+ {% include header.html %}
+
+ <div class="container main-content">
+ {{ content }}
+ </div>
- {% include footer.html %}
+ {% include footer.html %}
+
+ </div>
</body>
diff --git a/_strings_en.yml b/_strings_en.yml
index 06de2b4ff56c71fe7d65955671bc827b2be44fe0..c1a11b5f3a395701c63405d197acec2230491b7d 100644
--- a/_strings_en.yml
+++ b/_strings_en.yml
@@ -18,14 +18,15 @@ menu:
choose: How to Choose a Monero Client
running: How to Run a Monero Node
downloads: All Monero Downloads
- accepting: How to Accept Monero Payments
merchants: Monero Merchant Directory
+ accepting: Accepting Monero Payments
about: About Monero
people: The People Behind Monero
wiki: Moneropedia
userguides: User Guides
developerguides: Developer Guides
openalias: The OpenAlias Project
+ lab: Monero Research Lab
alternative: Alternative Clients
projects: External Projects
irc: IRC on Freenode
@@ -89,3 +90,4 @@ blog:
tagged: Tagged under
tags:
all: Articles by Tag
+ notags: There are no posts for this tag.
\ No newline at end of file
diff --git a/blog/index.html b/blog/index.html
index 2f1540e0ac1a98c789c10cf97f2cae73a0dc8861..54ba0f54057845659a305f565f4a3e4382bf1780 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -3,7 +3,10 @@ layout: default
title: All Blog Posts
---
-<h2>{% t blog.title_1 %} <span class="purple-kicks">{% t blog.title_2 %}</span> {% t blog.title_3 %}</h2>
+<div class="page-title">
+ <!-- Icon is based on work by Freepik (http://www.freepik.com) and is licensed under Creative Commons BY 3.0 -->
+ <img src="//static.monero.cc/images/icon_blog.svg" class="title-icon"><h2 class="inline">{% t blog.title_1 %} <span class="purple-kicks">{% t blog.title_2 %}</span> {% t blog.title_3 %}</h2>
+</div>
{% for post in paginator.posts %}
<h3><a href="{{ post.url }}">{{ post.title }}</a></h3>
@@ -11,12 +14,13 @@ title: All Blog Posts
{{ post.summary }}
<small>{% t blog.tagged %}:
{% for tag in post.tags %}
- [{{ tag }}]
+ [<a href="/blog/tags/{{ tag }}">{{ tag }}]</a>
{% endfor %}
</small>
</blockquote>
{% endfor %}
+
{% if paginator.total_pages > 1 %}
<div class="text-center">
{% if paginator.previous_page %}
diff --git a/home.php b/home.php
index 8fca6cf494c508a6302fc76f456c8c233121e03c..7d909504e0cf12eae80f4d775e750212cdb22964 100644
--- a/home.php
+++ b/home.php
@@ -21,7 +21,7 @@ Title: Home
<ul>
{% for post in site.posts limit:3 %}
<li>
- <a href="post.url">[{{ post.date | date: "%B %d" }} - <span class="news-title">{{ post.title }}</span>]</a><br>
+ <a href="{{ post.url }}">[{{ post.date | date: "%B %d" }} - <span class="news-title">{{ post.title }}</span>]</a><br>
{{ post.summary }}
</li>
{% endfor %}