redid tags to use through model, cleaned up note and notebook detail

views

5 files changed, 99 insertions, 101 deletions

diff --git a/design/templates/notes/notebook_create.html b/design/templates/notes/notebook_create.html
index 8ffc94a..1386946 100644
--- a/design/templates/notes/notebook_create.html
+++ b/design/templates/notes/notebook_create.html
@@ -2,6 +2,7 @@
 
 {% block extrastyles %}
 <link rel="stylesheet" href="/media/quill.snow.css" />
+<script async src="/media/js/vanilla-picker.min.js"></script>
 {% endblock %}
 {% block content %}
 <main>
@@ -10,34 +11,23 @@
 {% csrf_token %}
 {{ form.non_field_errors }}
 {% for field in form %}
-<fieldset class="{% if field.errors %}error {%endif%}{% if field.name == 'body_qjson' or field.name == 'body_html' %}hide {%endif%}" id="fs-{{field.name}}" >
+<fieldset class="{% if field.errors %}error {%endif%}{% if field.name == 'color_hex' %}hide {%endif%}" id="fs-{{field.name}}" >
 {{field.label_tag}}
 {{field}}
 {% if field.errors %}{{field.errors}}{% endif %}
 </fieldset>
 {% endfor %}
+<p id="color-picker"><a href="#">Pick color</a></p>
 <p><input class="btn btn-inline" value="create" type="submit" /></p>
 </form>
     <ul>{% for object in notebook_list %}
         <li>
-            <a href="{% url 'notes:notebook-detail' user.username object.slug %}"><i class="icon-notebook"> </i>{{object.name}}</a>
+            <a href="{% url 'notebooks:detail' object.slug %}"><i class="icon-notebook"> </i>{{object.name}}</a>
         </li>
         {%endfor%}</ul>
     </article>
     <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>
-            </svg></div>
-        <div class="">
-            <ul class="list-note-preview">{% for obj in notes_list %}
-                <li>
-                    <a href="{% url 'notes:note-detail' user.username  obj.slug %}">
-                        <h4>{{obj.title}}</h4>
-                        <div class="note-preview">{{obj.body_text|truncatewords:12}}</div>
-                    </a>
-                </li>
-            {% endfor %}</ul>
-        </div>
+        {% include "notes/partials/note_sidebar.html" with note_list=note_list %}
     </aside>
     <div class="balance-container">
     </div>
diff --git a/design/templates/notes/notebook_detail.html b/design/templates/notes/notebook_detail.html
index 36873e1..a0b06a3 100644
--- a/design/templates/notes/notebook_detail.html
+++ b/design/templates/notes/notebook_detail.html
@@ -1,49 +1,59 @@
 {% extends 'base.html' %}
 
+{% block extrastyles %}
+<script async src="/media/js/vanilla-picker.min.js"></script>
+{% endblock %}
+
 {% block content %}
 <main>
-    <article class="note-container">
-        {%comment%}
-        <form id="new-note-form" action="{% url 'notebook-api-list' %}" method="post">
+    <article class="note-container single-col">
+        <div class="flex-wrapper">
+        <form id="nb-edit-form" action="{% url 'notebook-api-detail' object.pk %}" method="PATCH">{% csrf_token %}
+            {{ form.non_field_errors }}
+
+            <div class="flex-wrapper flex-inner">
+                {% for field in form %}{% if field.name == 'color_rgb' %}
+                <fieldset class="color-picker-fieldset" id="color-picker" {% if form.instance.color_rgb %}style="background-color: {{form.instance.color_rgb}}; border: none;"{%endif%}>
+                    <input type="text" name="color_rgb" value="{{form.instance.color_rgb}}" maxlength="20" id="id_color_rgb">
+                    {% if field.errors %}{{field.errors}}{% endif %}
+                </fieldset>{% else %}
+                <fieldset class="hide">
+                    {{field.label_tag}}
+                    {{field}}
+                    {% if field.errors %}{{field.errors}}{% endif %}
+                </fieldset>{% endif %}
+                    {% endfor %}
+                    <h1 class="notebook-title" id="nb-title">{{object.name}}</h1>
+            </div>
+                <input id="btn-js-hide" type="submit" class="btn sm" value="Save" >
+        </form>
+        <div class="edit-btn-wrapper"><a class="hide btn btn-hollow" id="edit-toggle-btn">Edit</a></div>
+        </div>
+
+        <form id="new-note-form" action="{% url 'notebook-api-list' %}" method="post" class="hide">
             <label>Create a new notebook</label>
             {% csrf_token %}
             {{ form.non_field_errors }}
             {% for field in form %}
-            <fieldset class="{% if field.errors %}error {%endif%}{% if field.name == 'body_qjson' or field.name == 'body_html' %}hide {%endif%}" id="fs-{{field.name}}" >
+            <fieldset class="" id="fs-{{field.name}}" >
                 {{field.label_tag}}
                 {{field}}
                 {% if field.errors %}{{field.errors}}{% endif %}
             </fieldset>
                 {% endfor %}
-                <p><input class="btn btn-inline" value="create" type="submit" /></p>
+                <p><input id="btn-js-hide" class="btn btn-inline" value="create" type="submit" /></p>
         </form>
-        {%endcomment%}
-{{object}}
-            <ul class="list-note-preview">{% for obj in object.note_set.all %}
-                <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>
+            <ul class="list-note-preview">{% for object in object.note_set.all %}
+                {% include "notes/partials/note_list.html" with object=object hidecolor=True hidenotebook=True %}
             {% endfor %}</ul>
     </article>
     <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>
-            </svg></div>
-        <div class="">
-            <ul class="list-note-preview">{% for obj in notes_list %}
-                <li>
-                    <a href="{% url 'notes:note-detail' user.username  obj.slug %}">
-                        <h4>{{obj.title}}</h4>
-                        <div class="note-preview">{{obj.body_text|truncatewords:12}}</div>
-                    </a>
-                </li>
-            {% endfor %}</ul>
-        </div>
+        {% include "notes/partials/note_sidebar.html" with note_list=note_list %}
     </aside>
     <div class="balance-container">
     </div>
 </main>
 {% endblock %}
+{% block jsdomready %}
+window.url = "{% url 'notebook-api-detail' object.pk %}";
+{%endblock%}
diff --git a/design/templates/notes/notes_create.html b/design/templates/notes/notes_create.html
index 9bbdb26..9ca4111 100644
--- a/design/templates/notes/notes_create.html
+++ b/design/templates/notes/notes_create.html
@@ -5,8 +5,9 @@
 {% endblock %}
 {% block content %}
 <main>
+    <article class="note-container">
     <h1>Create a new note</h1>
-    <form id="new-note-form" action="{% url 'notes:note-create' %}" method="post">
+    <form id="new-note-form" action="{% url 'notes:create' %}" method="post">
 {% csrf_token %}
 {{ form.non_field_errors }}
 {% for field in form %}
@@ -23,6 +24,24 @@
 {% endfor %}
 <p><input class="btn btn-inline" value="submit" type="submit" /></p>
 </form>
+</article>
+    <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>
+            </svg></div>
+        <div class="">
+            <ul class="list-note-preview">{% for obj in notes_list %}
+                <li>
+                    <a href="{% url 'notes:detail' user.username  obj.slug %}">
+                        <h4>{{obj.title}}</h4>
+                        <div class="note-preview">{{obj.body_text|truncatewords:12}}</div>
+                    </a>
+                </li>
+            {% endfor %}</ul>
+        </div>
+    </aside>
+    <div class="balance-container">
+    </div>
 </main>
 {% endblock %}
 
diff --git a/design/templates/notes/notes_detail.html b/design/templates/notes/notes_detail.html
index 95583bd..b2ddbc3 100644
--- a/design/templates/notes/notes_detail.html
+++ b/design/templates/notes/notes_detail.html
@@ -2,26 +2,38 @@
 {% block extrastyles %}
 <link rel="stylesheet" href="/media/quill.snow.css" />
 {% endblock %}
-{% block breadcrumbs %}
-<li><a href="{%url 'notes:note-list' user.username %}">Notes</a></li>
-{% endblock %}
-
 {% block content %}
 <main>
     <article class="note-container">
+        <form action="" method="post" id="note-edit-form">{% csrf_token %}
         <header class="note-header">
             <div class="note-header-left">
-                <span class="label">tags:</span>
-                <ul>{% for tag in object.tags.all %}
-                    <li>
-                        <a href="{% url 'notes:note-tag' user.username tag.slug %}">{{tag}}</a>
-                    </li>
-                    {%endfor%}</ul>
-                <div class="notebook">
-                    <span class="label">notebook:</span>
-                    <a href="">{{object.notebook.name}}</a>
-                </div>
+
+                    <div class="flex-wrapper">
+                        <div class="notebook">
+                            <a id="n-link" href="{% url 'notebooks:detail' object.slug %}"><span id="n-box" class="color-box" style="background-color: {{object.notebook.color_rgb}}"></span><span id="n-name">{{object.notebook}}</span></a>
+                            <div id="notebook-edit" class="hide">
+                                <span class="error">{{ form.notebook.errors }}</span>
+                                {{form.notebook}}
+                            </div>
+                        </div>
+                        <div class="tags">
+                            <span class="label">tags:</span>
+                            <div id="t-display" class="">{% for tag in object.tags.all %}
+                                <a class="t-link" href="{% url 'notes:tags' tag.slug %}">
+                                    <span class="tag-wrapper" data-bg-color="#{{tag.color_color_rgb}};" >{{tag}}</span>
+                                </a>{%endfor%}
+                            </div>
+                            <div id="tags-edit" class="hide">
+                                <span class="error">{{ form.notebook.errors }}</span>
+                                {{form.tags}}
+                            </div>
+                        </div>
+                    </div>
+
             </div>
+            <div class="hide">{{form.body_text}}</div>
+            <fieldset class="hide">{{form.title}}</fieldset>
             <div class="note-header-right">
                 <h2 class="note-time">{{object.date_created|date:"M d, Y"}}</h2>
                 {% if object.url %}<h3 class="note-url"><a class="btn btn-small btn-subtle" href="{{object.url}}">Source</a><a class="btn btn-small btn-subtle right-padding-0 left-margin-2" href="object.cache">Archive</a></h3>{% endif %}
@@ -30,10 +42,6 @@
         <div class="edit-btn-wrapper"><button class="hide btn btn-hollow" id="edit-toggle-btn">Edit</button></div>
         <h1 id="note-title" class="note-title">{{object.title}}</h1>
         <div id="q-container" class="inactive"><div id="note-body">{% if object.body_html %}{{object.body_html|safe}}{%else%}{{object.body_text}}{%endif%}</div></div>
-        <form action="" method="post" id="note-edit-form">{% csrf_token %}
-            {% for field in form %}{% if field.name in "title body_text" %}
-            <div class="hide">{{field}}</div>
-            {% endif%}{% endfor %}
         <input id="btn-js-hide" type="submit" class="btn sm" value="Save" >
         </form>
     </article>
@@ -44,7 +52,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>
@@ -71,34 +79,6 @@ document.addEventListener('readystatechange', event => {
 });
 </script>
 {% endblock %}
-    <script>
 {% block jsdomready %}
-    var btn = document.getElementById("edit-toggle-btn"),
-        qcontainer = document.getElementById('q-container'),
-        title = document.getElementById('note-title'),
-        form = document.getElementById('note-edit-form'),
-        note_html = document.createElement('textarea'),
-        note_qjson = document.createElement('textarea');
-
-    window.editing = false;
-    window.quillchange = false;
-
-    hljs.initHighlightingOnLoad();
-    btn.classList.remove('hide');
-    note_html.setAttribute('name', 'body_html');
-    note_html.setAttribute('class', 'hide');
-    note_html.setAttribute('id', 'id_body_html');
-    note_qjson.setAttribute('name', 'body_qjson');
-    note_qjson.setAttribute('id', 'id_body_qjson');
-    note_qjson.setAttribute('class', 'hide');
-    form.appendChild(note_html);
-    form.appendChild(note_qjson);
-    document.getElementById("btn-js-hide").classList.add("hide");
-    btn.addEventListener('click', function(){edit_note(this, title, qcontainer, window.quill, "{% url 'notes-api-detail' object.pk %}" )}, false)
+window.url = "{% url 'notes-api-detail' object.pk %}";
 {%endblock%}
-    </script>
-
-'indent
-'align
-'direction
-'code-block
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>