From f0678c3379ee0f00c6ce75a5f5eb320f2d1fa6e0 Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Tue, 12 Jun 2018 10:47:53 +1000
Subject: [PATCH 1/2] Add the missing navbars to the Jinja2 version of the
 layout

---
 lemoncurry/jinja2.py                     |  8 +++--
 lemoncurry/jinja2/lemoncurry/layout.html | 39 ++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/lemoncurry/jinja2.py b/lemoncurry/jinja2.py
index 25546af..c459fe5 100644
--- a/lemoncurry/jinja2.py
+++ b/lemoncurry/jinja2.py
@@ -1,19 +1,23 @@
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.urls import reverse
 from jinja2 import Environment
-from compressor.contrib.jinja2ext import CompressorExtension
 
+from compressor.contrib.jinja2ext import CompressorExtension
+from django_activeurl.ext.django_jinja import ActiveUrl
+
+from entries.kinds import all as entry_kinds
 from .utils import load_package_json
 
 
 def environment(**options):
     env = Environment(
-        extensions=[CompressorExtension],
+        extensions=[ActiveUrl, CompressorExtension],
         trim_blocks=True,
         lstrip_blocks=True,
         **options
     )
     env.globals.update({
+        'entry_kinds': entry_kinds,
         'package': load_package_json(),
         'static': staticfiles_storage.url,
         'url': reverse,
diff --git a/lemoncurry/jinja2/lemoncurry/layout.html b/lemoncurry/jinja2/lemoncurry/layout.html
index c46f232..2d870e5 100644
--- a/lemoncurry/jinja2/lemoncurry/layout.html
+++ b/lemoncurry/jinja2/lemoncurry/layout.html
@@ -31,8 +31,43 @@
           <span class="navbar-toggler-icon"></span>
         </button>
 
-        <div class="collapse navbar-collapse" id="navbar">
-        </div>
+        {% activeurl %}<div class="collapse navbar-collapse" id="navbar">
+          <ul class="navbar-nav">
+          {% for kind in entry_kinds %}
+            <li class="nav-item">
+              <a class="nav-link" href="{{ kind.index }}">
+                <i class="{{ kind.icon }} fa-fw" aria-hidden="true"></i>
+                {{ kind.plural }}
+              </a>
+            </li>
+          {% endfor %}
+          </ul>
+
+          <ul class="navbar-nav">
+          {% if request.user.is_authenticated %}
+            <li class="nav-item">
+              <a class="nav-link" href="{{ url('admin:index') }}">
+                <i class="fas fa-cog fa-fw" aria-hidden="true"></i>
+                admin
+              </a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="{{ url('lemonauth:logout') }}">
+                <i class="fas fa-sign-out-alt fa-fw" aria-hidden="true"></i>
+                log out
+              </a>
+            </li>
+          {% else %}
+            <li class="nav-item">
+              <a class="nav-link" href="{{ url('lemonauth:login') }}">
+                <i class="fas fa-sign-in-alt fa-fw" aria-hidden="true"></i>
+                log in
+              </a>
+            </li>
+          {% endif %}
+          </ul>
+        </div>{% endactiveurl %}
+
       </nav>
     </header>
 

From 24bc7816f1f3d982b13e670fa969d5ae25af503b Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Tue, 12 Jun 2018 10:52:49 +1000
Subject: [PATCH 2/2] Relocate official repository to git.00dani.me

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fd3f30f..c8a51ad 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "lemoncurry",
 	"version": "1.9.8",
-	"repository": "https://gitlab.com/00dani/lemoncurry",
+	"repository": "https://git.00dani.me/00dani/lemoncurry",
 	"license": "MIT",
 	"devDependencies": {
 		"js-yaml": "^3.10.0",