4 files changed, 39 insertions, 6 deletions
diff --git a/app/notes/templates/note_detail.html b/app/notes/templates/note_detail.html
new file mode 100644
index 0000000..5dc7ace
--- /dev/null
+++ b/app/notes/templates/note_detail.html
@@ -0,0 +1,25 @@
+{% extends 'base_notes.html' %}
+{% block primary %}
+<style>
+p {
+    margin-top: 1rem !important;
+    margin-bottom: 1rem;
+}
+</style>
+<main class="post-detail">
+    <div class="note-list">
+        <article>
+    <h2>{% if object.url %}<a href="{{object.url}}">{{object.title}}</a>{%else%}{{object.title}}{%endif%} <span class="note-edit"><a href="{%url 'notes:note-edit' object.id %}">edit</a></span></h2>
+    <p>{{object.description}}</p>
+    --------------------
+    <p>{{object.body_html|safe}}</p>
+    <p class="small"><a href="{% url 'notes:note-delete' object.pk %}">delete</a></p>
+        </article>
+</div>
+</main>
+
+
+{% endblock %}
+{% block js %}
+<script type="text/javascript">var go_from_select = function(opt) { window.location = window.location.pathname + opt };</script>
+{% endblock%}
diff --git a/app/notes/templates/note_list.html b/app/notes/templates/note_list.html
index 727c21d..1439f4a 100644
--- a/app/notes/templates/note_list.html
+++ b/app/notes/templates/note_list.html
@@ -16,9 +16,9 @@
     </div>
     <div class="note-list">{% for object in object_list %}<article>
     <h2>{% if object.url %}<a href="{{object.url}}">{{object.title}}</a>{%else%}{{object.title}}{%endif%} <span class="note-edit"><a href="{%url 'notes:note-edit' object.id %}">edit</a></span></h2>
-    <p>{{object.body_markdown}}</p>
+    <p>{{object.description}}</p>
     {% if object.project %}<p class="small">For: <a href="{% url 'notes:project-detail' object.project.id %}">{{object.project}}</a></p>{%endif%}
-    <p class="small">Status: {{object.get_status_display}}</p>
+    <p class="small"><a href="{% url 'notes:note-detail' object.pk %}">View local</a></p>
     <p class="small"><a href="{% url 'notes:note-delete' object.pk %}">delete</a></p>
         </article>
 {% endfor%}</div>
diff --git a/app/notes/urls.py b/app/notes/urls.py
index eb83804..cdab47c 100644
--- a/app/notes/urls.py
+++ b/app/notes/urls.py
@@ -17,6 +17,11 @@ urlpatterns = [
         name="note-create"
     ),
     path(
+        r'<pk>',
+        views.LuxNoteDetailView.as_view(),
+        name="note-detail"
+    ),
+    path(
         r'<str:note_type>',
         views.LuxNoteListView.as_view(),
         name="note-list-status"
diff --git a/app/notes/views.py b/app/notes/views.py
index 1be3f4b..944186b 100644
--- a/app/notes/views.py
+++ b/app/notes/views.py
@@ -42,10 +42,7 @@ class LuxNoteUpdateView(UpdateView):
         return context
 
     def get_success_url(self):
-        if self.object.project:
-            return reverse('notes:project-detail', kwargs={"pk": self.object.project.pk})
-        else:
-            return reverse('notes:note-list', kwargs={"pk": self.object.project.pk})
+        return reverse('notes:note-list')
 
 
 class LuxNoteListView(ListView):
@@ -70,3 +67,9 @@ class LuxNoteDeleteView(DeleteView):
     model = LuxNote
     success_url = "/notes/notes"
     template_name = "notes/confirm_delete.html"
+
+
+class LuxNoteDetailView(DetailView):
+    model = LuxNote
+    template_name = "note_detail.html"
+