From cb0b81deaa62a2047e80ccfea5d40344183ef7d7 Mon Sep 17 00:00:00 2001
From: Daniel Muckerman <danielmuckerman@me.com>
Date: Sat, 31 Oct 2020 22:27:20 -0400
Subject: [PATCH] Make navbar a template

---
 templates/bookmarklet.j2      | 21 +-------------------
 templates/fragments/navbar.j2 | 36 +++++++++++++++++++++++++++++++++++
 templates/list.j2             | 30 +----------------------------
 3 files changed, 38 insertions(+), 49 deletions(-)
 create mode 100644 templates/fragments/navbar.j2

diff --git a/templates/bookmarklet.j2 b/templates/bookmarklet.j2
index db76cd7..7021355 100644
--- a/templates/bookmarklet.j2
+++ b/templates/bookmarklet.j2
@@ -7,26 +7,7 @@
 {% endblock %}
 
 {% block navbar %}
-<div id="navbar" class="navbar navbar-expand-lg sticky-top navbar-dark bg-dark">
-    <div class="navbar-brand">Read TI Later</div>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
-                aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-    <div class="collapse navbar-collapse" id="navbarNavDropdown">
-        <ul class="navbar-nav">
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('index') }}">My List</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('archived') }}">Archived</a>
-            </li>
-        </ul>
-        <form class="form-inline ml-auto">
-            <a class="btn btn-primary" href="/logout" role="button">Logout</a>
-        </form>
-    </div>        
-</div>
+    {% include "fragments/navbar.j2" %}
 {% endblock %}
 
 {% block content %}
diff --git a/templates/fragments/navbar.j2 b/templates/fragments/navbar.j2
new file mode 100644
index 0000000..de30d14
--- /dev/null
+++ b/templates/fragments/navbar.j2
@@ -0,0 +1,36 @@
+<div id="navbar" class="navbar navbar-expand-lg sticky-top navbar-dark bg-dark">
+    <div class="navbar-brand">Read TI Later</div>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
+                aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+    <div class="collapse navbar-collapse" id="navbarNavDropdown">
+        <ul class="navbar-nav">
+            {% if request.path == url_for('index') %}
+            <li class="nav-item active">
+            {% else %}
+            <li class="nav-item">
+            {% endif %}
+                <a class="nav-link" href="{{ url_for('index') }}">My List</a>
+            </li>
+            {% if request.path == url_for('archived') %}
+            <li class="nav-item active">
+            {% else %}
+            <li class="nav-item">
+            {% endif %}
+                <a class="nav-link" href="{{ url_for('archived') }}">Archived</a>
+            </li>
+            {% if request.path == url_for('bookmarklet') %}
+            <li class="nav-item active">
+            {% else %}
+            <li class="nav-item">
+            {% endif %}
+                <a class="nav-link" href="{{ url_for('archived') }}">Bookmarklet</a>
+            </li>
+        </ul>
+        <form class="form-inline ml-auto">
+            <a class="btn btn-info" href="#addLink" onclick="openLinkModal();" role="button" style="margin-right: 20px;">Add Link</a>
+            <a class="btn btn-primary" href="/logout" role="button">Logout</a>
+        </form>
+    </div>        
+</div>
\ No newline at end of file
diff --git a/templates/list.j2 b/templates/list.j2
index de5d846..3a1b048 100644
--- a/templates/list.j2
+++ b/templates/list.j2
@@ -7,35 +7,7 @@
 {% endblock %}
 
 {% block navbar %}
-<div id="navbar" class="navbar navbar-expand-lg sticky-top navbar-dark bg-dark">
-    <div class="navbar-brand">Read TI Later</div>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
-                aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-    <div class="collapse navbar-collapse" id="navbarNavDropdown">
-        <ul class="navbar-nav">
-            {% if request.path == url_for('index') %}
-                <li class="nav-item active">
-            {% else %}
-                <li class="nav-item">
-            {% endif %}
-                <a class="nav-link" href="{{ url_for('index') }}">My List</a>
-            </li>
-            {% if request.path == url_for('archived') %}
-                <li class="nav-item active">
-            {% else %}
-                <li class="nav-item">
-            {% endif %}
-                <a class="nav-link" href="{{ url_for('archived') }}">Archived</a>
-            </li>
-        </ul>
-        <form class="form-inline ml-auto">
-            <a class="btn btn-info" href="#addLink" onclick="openLinkModal();" role="button" style="margin-right: 20px;">Add Link</a>
-            <a class="btn btn-primary" href="/logout" role="button">Logout</a>
-        </form>
-    </div>        
-</div>
+    {% include "fragments/navbar.j2" %}
 {% endblock %}
 
 {% block content %}