From 9fa06206686208b01618f6d59561c4a65bb035da Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Oct 2018 09:35:14 +0000
Subject: [PATCH] blog: Add dialogue to publish posts at a certain time

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 Makefile.am                          |  1 +
 src/templates/blog/compose.html      |  6 ++++
 src/templates/blog/modules/post.html | 33 ++++++++++---------
 src/templates/blog/publish.html      | 48 ++++++++++++++++++++++++++++
 src/web/blog.py                      | 29 +++++++++++++++--
 5 files changed, 97 insertions(+), 20 deletions(-)
 create mode 100644 src/templates/blog/publish.html

diff --git a/Makefile.am b/Makefile.am
index c864037c..20f553a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,6 +117,7 @@ templates_blog_DATA = \
 	src/templates/blog/feed.xml \
 	src/templates/blog/index.html \
 	src/templates/blog/post.html \
+	src/templates/blog/publish.html \
 	src/templates/blog/search-results.html \
 	src/templates/blog/tag.html \
 	src/templates/blog/year.html
diff --git a/src/templates/blog/compose.html b/src/templates/blog/compose.html
index 481886de..8aad111c 100644
--- a/src/templates/blog/compose.html
+++ b/src/templates/blog/compose.html
@@ -29,6 +29,12 @@
 				<button type="submit" class="btn btn-primary btn-block">
 					{{ _("Save") }}
 				</button>
+
+				{% if post %}
+					<a class="btn btn-outline-primary btn-block" href="/post/{{ post.slug }}/delete">
+						{{ _("Delete") }}
+					</a>
+				{% end %}
 			</form>
 		</div>
 	</div>
diff --git a/src/templates/blog/modules/post.html b/src/templates/blog/modules/post.html
index 1bb51aaf..397551c9 100644
--- a/src/templates/blog/modules/post.html
+++ b/src/templates/blog/modules/post.html
@@ -29,14 +29,25 @@
 			{% else %}
 				{{ _("Not published") }}
 			{% end %}
-
-			{% if current_user and current_user == post.author %}
-				<a href="/post/{{ post.slug }}/edit">{{ _("Edit") }}</a>
-				<a href="/post/{{ post.slug }}/delete">{{ _("Delete") }}</a>
-			{% end %}
 		</p>
 	</div>
 
+	{% if not post.is_published() and post.is_editable(current_user) %}
+		<div class="row">
+			<div class="col-12 col-md-6 mb-3">
+				<a class="btn btn-success btn-block" href="/post/{{ post.slug }}/edit">
+					<span class="fas fa-edit mr-2"></span> {{ _("Edit") }}
+				</a>
+			</div>
+
+			<div class="col-12 col-md-6 mb-3">
+				<a class="btn btn-primary btn-block" href="/post/{{ post.slug }}/publish">
+					<span class="fas fa-book-reader mr-2"></span> {{ _("Publish") }}
+				</a>
+			</div>
+		</div>
+	{% end %}
+
 	<div class="blog-content">
 		{% raw post.html %}
 	</div>
@@ -60,16 +71,4 @@
 			</a>
 		{% end %}
 	</div>
-
-	{% if not post.is_published() %}
-		<form action="/post/{{ post.slug }}/publish" method="POST">
-			{% raw xsrf_form_html() %}
-
-			<div class="btn-toolbar mt-5">
-				<button type="submit" class="btn btn-primary btn-block btn-lg">
-					{{ _("Publish") }}
-				</button>
-			</div>
-		</form>
-	{% end %}
 </div>
diff --git a/src/templates/blog/publish.html b/src/templates/blog/publish.html
new file mode 100644
index 00000000..fa29b18c
--- /dev/null
+++ b/src/templates/blog/publish.html
@@ -0,0 +1,48 @@
+{% extends "base.html" %}
+
+{% block title %}{{ _("Publish %s") % post.title }}{% end block %}
+
+{% block modal %}
+	<div class="card">
+		<div class="card-body">
+			<h5 class="card-title mb-1">{{ _("Publish Post") }}</h5>
+			<h6 class="card-subtitle text-muted mb-3">{{ post.title }}</h6>
+
+			<form action="" method="POST">
+				{% raw xsrf_form_html() %}
+
+				<input type="hidden" name="when">
+
+				<div class="form-group">
+					<label>{{ _("Time to Publish") }}</label>
+
+					<input type="datetime-local" class="form-control"
+						pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}" required>
+				</div>
+
+				<button type="submit" class="btn btn-primary btn-block">{{ _("Publish") }}</button>
+				<a class="btn btn-secondary btn-block" href="/post/{{ post.slug }}">{{ _("Cancel") }}</a>
+			</form>
+		</div>
+	</div>
+{% end block %}
+
+{% block javascript %}
+	<script type="text/javascript">
+		$(document).ready(function() {
+			var when = $("input[name='when']");
+
+			$("input[type='datetime-local']").on("change keyup", function(event) {
+				var value = $(this).val();
+
+				// Parse date and format with timezone
+				if (value) {
+					var date = new Date(value);
+					value = date.toISOString();
+				}
+
+				when.val(value);
+			}).change();
+		});
+	</script>
+{% end %}
diff --git a/src/web/blog.py b/src/web/blog.py
index d39ef396..ad770da7 100644
--- a/src/web/blog.py
+++ b/src/web/blog.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import datetime
+import dateutil
 import email.utils
 import tornado.web
 
@@ -69,21 +70,43 @@ class PostHandler(auth.CacheMixin, base.BaseHandler):
 
 
 class PublishHandler(auth.CacheMixin, base.BaseHandler):
+	@tornado.web.authenticated
+	def get(self, slug):
+		post = self.backend.blog.get_by_slug(slug, published=False)
+		if not post:
+			raise tornado.web.HTTPError(404)
+
+		# Check if current_user is allowed to edit the post
+		if not post.is_editable(self.current_user):
+			raise tornado.web.HTTPError(403)
+
+		# Is the post already published?
+		if post.is_published():
+			raise tornado.web.HTTPError(400, "Post is already published")
+
+		self.render("blog/publish.html", post=post)
+
 	@tornado.web.authenticated
 	def post(self, slug):
-		post = self.backend.blog.get_by_slug(slug, published=not self.current_user)
+		post = self.backend.blog.get_by_slug(slug, published=False)
 		if not post:
 			raise tornado.web.HTTPError(404)
 
+		# Check if current_user is allowed to edit the post
+		if not post.is_editable(self.current_user):
+			raise tornado.web.HTTPError(403)
+
 		# Is the post already published?
 		if post.is_published():
 			raise tornado.web.HTTPError(400, "Post is already published")
 
-		# XXX Check that we are only publishing our own posts
+		when = self.get_argument("when", None)
+		if when:
+			when = dateutil.parser.parse(when)
 
 		# Publish the post
 		with self.db.transaction():
-			post.publish()
+			post.publish(when)
 
 		self.redirect("/post/%s" % post.slug)
 
-- 
2.39.2