From d45fa99aa9d587b5674484f68955b43f39e8f6fd Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Thu, 6 Dec 2018 06:57:52 -0600
Subject: redid tags to use through model, cleaned up note and notebook detail
 views

---
 design/templates/notes/notes_list.html | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'design/templates/notes/notes_list.html')

diff --git a/design/templates/notes/notes_list.html b/design/templates/notes/notes_list.html
index b1c1700..393cf89 100644
--- a/design/templates/notes/notes_list.html
+++ b/design/templates/notes/notes_list.html
@@ -4,16 +4,11 @@
 <main>
     <article class="note-container">
         <h1>Notes {% if tags|length == 1%} tagged {% for tag in tags%}{{tag}}{%endfor%}{%endif%}</h1>
-        <div>Tagged with: {% for tag in tags%}<a href="{{tag|slugify}}">{{tag}}</a>{%endfor%}</div>
-            <ul class="list-note-preview">{% for obj in object_list %}
-                <li>
-                    <a href="{% url 'notes:note-detail' user.username  obj.slug %}">
-                        <h4>{{obj.title}}</h4>
-                        <div class="note-preview">{{obj.body_text|truncatewords:36}}</div>
-                    </a>
-                </li>
+        {% if tags|length >= 1%}<div>Tagged with: {% for tag in tags%}<a href="{{tag|slugify}}">{{tag}}</a>{%endfor%}</div>{%endif%}
+            <ul class="list-note-preview">{% for object in object_list %}
+                {% include "notes/partials/note_list.html" with object=object %}
             {% endfor %}</ul>
-    </article>
+    </article>{% if tags|length >= 1%}
     <aside class="note-list-container">
         <div class="svg-wrapper"><svg class="svg-icon-arrow">
             <svg viewBox="0 0 16 13" id="shape-double-arrow" width="100%" height="100%"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="square"><g id="Showing-post-info" transform="translate(-297.000000, -105.000000)" stroke="currentColor"><g transform="translate(305.000000, 111.500000) scale(-1, 1) rotate(-180.000000) translate(-305.000000, -111.500000) translate(297.000000, 105.000000)"><path d="M2.20710678,6.5 L6.85355339,1.85355339 L7.20710678,1.5 L6.5,0.792893219 L6.14644661,1.14644661 L1.14644661,6.14644661 L1.05805826,6.23483496 L0.792893219,6.5 L1.14644661,6.85355339 L6.14644661,11.8535534 L6.5,12.2071068 L7.20710678,11.5 L6.85355339,11.1464466 L2.20710678,6.5 Z" id="Combined-Shape"></path><path d="M10.2071068,6.5 L14.8535534,1.85355339 L15.2071068,1.5 L14.5,0.792893219 L14.1464466,1.14644661 L9.14644661,6.14644661 L9.05805826,6.23483496 L8.79289322,6.5 L9.14644661,6.85355339 L14.1464466,11.8535534 L14.5,12.2071068 L15.2071068,11.5 L14.8535534,11.1464466 L10.2071068,6.5 Z" id="Combined-Shape"></path></g></g></g></svg>
@@ -21,7 +16,7 @@
         <div class="">
             <ul class="list-note-preview">{% for obj in notes_list %}
                 <li>
-                    <a href="{% url 'notes:note-detail' user.username  obj.slug %}">
+                    <a href="{% url 'notes:detail' obj.slug obj.pk %}">
                         <h4>{{obj.title}}</h4>
                         <div class="note-preview">{{obj.body_text|truncatewords:12}}</div>
                     </a>
@@ -29,6 +24,10 @@
             {% endfor %}</ul>
         </div>
     </aside>
+    {%else%}
+    <div class="balance-container-left">
+    </div>
+    {%endif%}
     <div class="balance-container">
     </div>
 </main>
-- 
cgit v1.2.3