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/notebook_detail.html | 64 +++++++++++++++++------------
 1 file changed, 37 insertions(+), 27 deletions(-)

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

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%}
-- 
cgit v1.2.3