tAdd a link to delete a story upon editing. - diasporadiaries - a platform for writing stories with personal accounts and messages
[h|git clone git://parazyd.org/diasporadiaries.git|URL:git://parazyd.org/diasporadiaries.git|server|port]
[1|Log|/git/diasporadiaries/log.gph|server|port]
[1|Files|/git/diasporadiaries/files.gph|server|port]
[1|Refs|/git/diasporadiaries/refs.gph|server|port]
[1|Submodules|/git/diasporadiaries/file/.gitmodules.gph|server|port]
[1|README|/git/diasporadiaries/file/README.md.gph|server|port]
[1|LICENSE|/git/diasporadiaries/file/LICENSE.gph|server|port]
---
[1|commit 2fb42fb6b7f3d8b4c3f7a9cadf0dcabf62f285f9|/git/diasporadiaries/commit/2fb42fb6b7f3d8b4c3f7a9cadf0dcabf62f285f9.gph|server|port]
[1|parent e32796a3cf0a4a9f295c5844c265f65d1c47bdaa|/git/diasporadiaries/commit/e32796a3cf0a4a9f295c5844c265f65d1c47bdaa.gph|server|port]
[h|Author: parazyd <parazyd@dyne.org>|URL:mailto:parazyd@dyne.org|server|port]
Date:   Sun, 20 Jan 2019 15:09:56 +0100

Add a link to delete a story upon editing.

Also add some style fixes which are not worth commenting.

Diffstat:
  M templates/edit.html                 |       4 ++++
  M templates/index.html                |       2 +-
  M templates/nav.html                  |       4 +++-
  M utils.py                            |       6 +++---

4 files changed, 11 insertions(+), 5 deletions(-)
---
[1|diff --git a/templates/edit.html b/templates/edit.html|/git/diasporadiaries/file/templates/edit.html.gph|server|port]
t@@ -20,6 +20,10 @@
 
   <main role="main" class="container">
 
+  <p>
+    <a href="/delete?key={{ story['deletekey'] }}" class="btn btn-danger">Delete this story</a>
+  </p>
+
   <form action="/edit" method="POST" id="storyform">
     <input type="text" name="Id" value="{{ story['id'] }}" style="display: none;">
     <p class="lead">Name:<br>
[1|diff --git a/templates/index.html b/templates/index.html|/git/diasporadiaries/file/templates/index.html.gph|server|port]
t@@ -21,7 +21,7 @@
   others of their kind. Make them feel less scared and lonely.</p>
 
   <p class="text-center">
-    <a href="/submit" class="btn btn-lg btn-secondary">GO AND WRITE DOWN YOUR
+    <a href="/write" class="btn btn-lg btn-secondary">GO AND WRITE DOWN YOUR
     STORY!</a>
   </p>
 
[1|diff --git a/templates/nav.html b/templates/nav.html|/git/diasporadiaries/file/templates/nav.html.gph|server|port]
t@@ -9,15 +9,17 @@
 
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav mr-auto">
+        <!--
         <li class="nav-item ">
           <a class="nav-link" href="/">Home</a>
         </li>
+        -->
         <li class="nav-item">
           <a class="nav-link" href="/write">Write!</a>
         </li>
 
         <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="#" id="navbarDowntown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             Stories
           </a>
           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
[1|diff --git a/utils.py b/utils.py|/git/diasporadiaries/file/utils.py.gph|server|port]
t@@ -120,7 +120,7 @@ def get_multiple_stories_filtered(col, val, param, reverse=True):
     return filtered_stories
 
 
-def makenav(randomize=True):
+def makenav(randomize=False):
     """
     Queries the disembark column for filling up the by-country dropdown
     navigation.
t@@ -131,8 +131,8 @@ def makenav(randomize=True):
     havec = list(set(havec))
     navlist = [(i, getcountryname(i)) for i in havec]
 
-    #if randomize:
-    #    shuffle(navlist)
+    if randomize:
+        shuffle(navlist)
     return navlist