From 26099e7ddabb5b5709b311dafd15583cd90588e1 Mon Sep 17 00:00:00 2001
From: handlerug <umar@handlerug.me>
Date: Sun, 20 Jun 2021 12:56:19 +0700
Subject: [PATCH] Sync edit and preview templates and fix some bugs

---
 static/default.css     |  1 -
 views/mutators.qtpl    | 14 +++++++-------
 views/mutators.qtpl.go | 14 +++++++-------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/static/default.css b/static/default.css
index b83d0ad..edd168e 100644
--- a/static/default.css
+++ b/static/default.css
@@ -117,7 +117,6 @@ textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;
 .edit__preview { border: 2px dashed #ddd; }
 .edit-form { height: calc(100vh - 12rem); }
 .edit-form__textarea { width: 100%; height: calc(100% - 8rem); min-height: 4rem; }
-.edit-form label { font-style: italic; }
 .edit-form__message { width: 100%; margin: 0.25em 0; }
 .edit-form__save { font-weight: bold; }
 .edit-toolbar__buttons, .edit-toolbar__ad { margin: .5rem; }
diff --git a/views/mutators.qtpl b/views/mutators.qtpl
index 0d0cc1a..9c9dd90 100644
--- a/views/mutators.qtpl
+++ b/views/mutators.qtpl
@@ -95,20 +95,20 @@
 {%s= NavHTML(rq, hyphaName, "edit") %}
 <div class="layout">
 <main class="main-width edit edit_with-preview">
-	<h1>Edit {%s util.BeautifulName(hyphaName) %} (preview)</h1>
+	<h1 class="edit__title">Edit {%s util.BeautifulName(hyphaName) %}</h1>
 	{%s= warning %}
 	<form method="post" class="edit-form"
 			action="/upload-text/{%s hyphaName %}">
-		<textarea class="edit-form__textarea" name="text">{%s textAreaFill %}</textarea>
+		<textarea name="text" class="edit-form__textarea" autofocus>{%s textAreaFill %}</textarea>
 		<br/><br/>
-		<label for="text">Edit description:</label>
+		<label for="text">Describe your changes:</label><br>
 		<input id="text" type="text" name="message" class="edit-form__message" value="{%s message %}">
 		<br/><br/>
-		<input type="submit" name="action" class="btn btn_accent" value="Save" class="edit-form__save"/>
-		<input type="submit" name="action" class="btn" value="Preview" class="edit-form__preview">
+		<input type="submit" name="action" class="btn btn_accent edit-form__save" value="Save"/>
+		<input type="submit" name="action" class="btn edit-form__preview" value="Preview">
 		<a href="/hypha/{%s hyphaName %}" class="btn btn_weak">Cancel</a>
 	</form>
-	<p class="warning">Note that the hypha is not saved yet. You can preview the changes ↓</p>
+	<p class="warning">Note that the hypha hasn't been saved yet. Here's the preview:</p>
 	<article class="edit__preview">{%s= renderedPage %}</article>
 </main>
 {%s= Toolbar(user.FromRequest(rq)) %}
@@ -120,4 +120,4 @@
 {% for _, scriptPath := range cfg.EditScripts %}
 <script src="{%s scriptPath %}"></script>
 {% endfor %}
-{% endfunc %}
\ No newline at end of file
+{% endfunc %}
diff --git a/views/mutators.qtpl.go b/views/mutators.qtpl.go
index 3bd9981..fa1ccfb 100644
--- a/views/mutators.qtpl.go
+++ b/views/mutators.qtpl.go
@@ -269,11 +269,11 @@ func StreamPreviewHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, t
 	qw422016.N().S(`
 <div class="layout">
 <main class="main-width edit edit_with-preview">
-	<h1>Edit `)
+	<h1 class="edit__title">Edit `)
 //line views/mutators.qtpl:98
 	qw422016.E().S(util.BeautifulName(hyphaName))
 //line views/mutators.qtpl:98
-	qw422016.N().S(` (preview)</h1>
+	qw422016.N().S(`</h1>
 	`)
 //line views/mutators.qtpl:99
 	qw422016.N().S(warning)
@@ -285,28 +285,28 @@ func StreamPreviewHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, t
 	qw422016.E().S(hyphaName)
 //line views/mutators.qtpl:101
 	qw422016.N().S(`">
-		<textarea class="edit-form__textarea" name="text">`)
+		<textarea name="text" class="edit-form__textarea" autofocus>`)
 //line views/mutators.qtpl:102
 	qw422016.E().S(textAreaFill)
 //line views/mutators.qtpl:102
 	qw422016.N().S(`</textarea>
 		<br/><br/>
-		<label for="text">Edit description:</label>
+		<label for="text">Describe your changes:</label><br>
 		<input id="text" type="text" name="message" class="edit-form__message" value="`)
 //line views/mutators.qtpl:105
 	qw422016.E().S(message)
 //line views/mutators.qtpl:105
 	qw422016.N().S(`">
 		<br/><br/>
-		<input type="submit" name="action" class="btn btn_accent" value="Save" class="edit-form__save"/>
-		<input type="submit" name="action" class="btn" value="Preview" class="edit-form__preview">
+		<input type="submit" name="action" class="btn btn_accent edit-form__save" value="Save"/>
+		<input type="submit" name="action" class="btn edit-form__preview" value="Preview">
 		<a href="/hypha/`)
 //line views/mutators.qtpl:109
 	qw422016.E().S(hyphaName)
 //line views/mutators.qtpl:109
 	qw422016.N().S(`" class="btn btn_weak">Cancel</a>
 	</form>
-	<p class="warning">Note that the hypha is not saved yet. You can preview the changes ↓</p>
+	<p class="warning">Note that the hypha hasn't been saved yet. Here's the preview:</p>
 	<article class="edit__preview">`)
 //line views/mutators.qtpl:112
 	qw422016.N().S(renderedPage)