3 files changed, 14 insertions, 2 deletions
diff --git a/design/templates/notes/notebook_detail.html b/design/templates/notes/notebook_detail.html
index 73c13ab..37c8f8a 100644
--- a/design/templates/notes/notebook_detail.html
+++ b/design/templates/notes/notebook_detail.html
@@ -8,9 +8,9 @@
 <main>
     <article class="note-container single-col">
         <div class="flex-wrapper">
+            {% if object.name != 'Trash'%}
         <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%}>
@@ -28,6 +28,9 @@
                 <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>
+        {%else%}
+            <h1 class="notebook-title" id="nb-title">{{object.name}}</h1>
+        {%endif%}
         </div>
 
         <form id="new-note-form" action="{% url 'notebook-api-list' %}" method="post" class="hide">
diff --git a/design/templates/notes/notes_detail.html b/design/templates/notes/notes_detail.html
index edf45e7..cce13b7 100644
--- a/design/templates/notes/notes_detail.html
+++ b/design/templates/notes/notes_detail.html
@@ -49,8 +49,8 @@
         <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>
         <input id="btn-js-hide" type="submit" class="btn sm" value="Save" >
+        <button type="submit" value="trash" class="btn-hollow trash float-right" name="trash">Move to Trash</button>
         </form>
-        <button type="submit" value="trash" class="btn btn-hollow">Move to Trash</button>
     </article>
     <!--<aside class="note-list-container">
         <div class="svg-wrapper"><svg class="svg-icon-arrow">
diff --git a/design/templates/notes/notes_list.html b/design/templates/notes/notes_list.html
index 5ef067a..94e82ec 100644
--- a/design/templates/notes/notes_list.html
+++ b/design/templates/notes/notes_list.html
@@ -5,6 +5,15 @@
     <div class="note-container">
         <div class="note-hed-wrapper">
             <h1 class="note-hed">Notes</h1>
+            {% if messages %}
+                <ul class="messages">
+                    {% for message in messages %}
+                        <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
+                            {% if 'safe' in message.tags %}{{ message|safe }}{% else %}{{ message }}{% endif %}
+                        </li>
+                    {% endfor %}
+                </ul>
+            {% endif %}
             {% if tags|length >= 1%}<h2 class="note-subhed">Tagged with: {% for tag in tags%}<a href="{{tag.slug}}">{{tag.name}}</a>{%endfor%}</h2>{%endif%}
 
             <h6 class="bottom-margin-0 inline-block"><button id="notebook-drop-btn" class="btn btn-light btn-drop-menu">Notebooks</button></h6>