render/templates/views/admin_config.tmpl

@@ -6,10 +6,6 @@
 <br>
 <br>
 
-<form method="POST" enctype="multipart/form-data">
 {{.}}
-<input type="submit" value="Submit" />
-</form>
-
 
 {{end}}

render/templates/views/editor.tmpl

@@ -6,13 +6,6 @@
 <br>
 <br>
 
-<form method="POST" enctype="multipart/form-data">
 {{.}}
 
-<div class="grid">
-    <input type="submit" name="action" value="Publish" />
-    <input class="secondary" type="submit" name="action" value="Save as Draft" />
-</div>
-</form>
-
 {{end}}

render/templates/views/entry.tmpl

@@ -2,14 +2,6 @@
 
 {{define "main"}}
 
-{{ if not .Entry.PublishedAt }}
-    <mark>
-        This entry is a draft. It is only visible to logged in authors.
-    </mark>
-    <br>
-    <br>
-{{ end }}
-
 <div class="h-entry">
     <hgroup>
         {{if .Entry.Title}}

web/editor_handler.go

@@ -75,12 +75,7 @@ func (h *EditorHandler) HandlePostNew(c *fiber.Ctx) error {
 	// create entry
 	now := time.Now()
 	entry.SetMetaData(entryMeta)
-	published := c.FormValue("action") == "Publish"
+	entry.SetPublishedAt(&now)
-	if published {
-		entry.SetPublishedAt(&now)
-	} else {
-		entry.SetPublishedAt(nil)
-	}
 	entry.SetAuthorId(c.Locals("author").(string))
 
 	err = h.entrySvc.Create(entry)
@@ -124,13 +119,6 @@ func (h *EditorHandler) HandlePostEdit(c *fiber.Ctx) error {
 		return err
 	}
 
-	published := c.FormValue("action") == "Publish"
-	if !published {
-		entry.SetPublishedAt(nil)
-	} else if entry.PublishedAt() == nil || entry.PublishedAt().IsZero() {
-		now := time.Now()
-		entry.SetPublishedAt(&now)
-	}
 	// update entry
 	entry.SetMetaData(meta)
 	err = h.entrySvc.Update(entry)

web/entry_handler.go

@@ -39,18 +39,14 @@ func NewEntryHandler(
 func (h *EntryHandler) Handle(c *fiber.Ctx) error {
 	c.Set(fiber.HeaderContentType, fiber.MIMETextHTML)
 
-	loggedIn := c.Locals("author") != nil
-
 	entryId := c.Params("post")
 	entry, err := h.entrySvc.FindById(entryId)
 	if err != nil {
 		return err
 	}
 
-	if !loggedIn {
+	if entry.PublishedAt() == nil || entry.PublishedAt().IsZero() {
-		if entry.PublishedAt() == nil || entry.PublishedAt().IsZero() {
+		return fiber.NewError(fiber.StatusNotFound, "Entry not found")
-			return fiber.NewError(fiber.StatusNotFound, "Entry not found")
-		}
 	}
 
 	author, err := h.authorSvc.FindByName(entry.AuthorId())
@@ -65,7 +61,7 @@ func (h *EntryHandler) Handle(c *fiber.Ctx) error {
 		entryData{
 			Entry:    entry,
 			Author:   author,
-			LoggedIn: loggedIn,
+			LoggedIn: c.Locals("author") != nil,
 		},
 	)
 }

web/forms/form.go

@@ -107,10 +107,12 @@ func (s *Form) HtmlForm() (string, error) {
 		return "", err
 	}
 
-	html := ""
+	html := "<form method=\"POST\" enctype=\"multipart/form-data\">\n"
 	for _, field := range fields {
 		html += field.Html()
 	}
+	html += "<input type=\"submit\" value=\"Submit\" />\n"
+	html += "</form>\n"
 
 	return html, nil
 }