From 4ee2841896a371a4d5ef093ce24dc28fecbb77f7 Mon Sep 17 00:00:00 2001
From: Dan Konshin <konshin104@gmail.com>
Date: Wed, 24 Jun 2020 18:32:59 +0500
Subject: [PATCH] DarkTheme edit page

---
 render.go                                     | 10 +++----
 .../default-dark/Hypha/edit/index.html/1.html | 26 +++----------------
 .../Hypha/edit/sidebar.html/1.html            | 19 ++++++++++++++
 .../Hypha/edit/sidebar.html/meta.json         | 19 ++++++++++++++
 w/m/Templates/default-dark/main.css/1.css     |  4 +--
 5 files changed, 48 insertions(+), 30 deletions(-)
 create mode 100644 w/m/Templates/default-dark/Hypha/edit/sidebar.html/1.html
 create mode 100644 w/m/Templates/default-dark/Hypha/edit/sidebar.html/meta.json

diff --git a/render.go b/render.go
index 822a9ce..85bdd3a 100644
--- a/render.go
+++ b/render.go
@@ -11,17 +11,17 @@ import (
 
 // EditHyphaPage returns HTML page of hypha editor.
 func EditHyphaPage(name, textMime, content, tags string) string {
-	keys := map[string]string{
-		"Title":   fmt.Sprintf(cfg.TitleEditTemplate, name),
-		"Header":  renderFromString(name, "Hypha/edit/header.html"),
-		"Sidebar": renderFromString("", "Hypha/edit/sidebar.html"),
-	}
 	page := map[string]string{
 		"Text":     content,
 		"TextMime": textMime,
 		"Name":     name,
 		"Tags":     tags,
 	}
+	keys := map[string]string{
+		"Title":   fmt.Sprintf(cfg.TitleEditTemplate, name),
+		"Header":  renderFromString(name, "Hypha/edit/header.html"),
+		"Sidebar": renderFromMap(page, "Hypha/edit/sidebar.html"),
+	}
 	return renderBase(renderFromMap(page, "Hypha/edit/index.html"), keys)
 }
 
diff --git a/w/m/Templates/default-dark/Hypha/edit/index.html/1.html b/w/m/Templates/default-dark/Hypha/edit/index.html/1.html
index 49ab078..842b43b 100644
--- a/w/m/Templates/default-dark/Hypha/edit/index.html/1.html
+++ b/w/m/Templates/default-dark/Hypha/edit/index.html/1.html
@@ -1,36 +1,16 @@
 <div class="naviwrapper">
 	<form class="naviwrapper__edit edit-box"
-	      method="POST"
+		  method="POST"
+		  id="editform"
 	      enctype="multipart/form-data"
 	      action="?action=update">
-		<div class="naviwrapper__buttons">
-			<input type="submit" value="update"/>
-		</div>
 
 		<div class="edit-box__left">
-			<h4>Edit box</h4>
+			<h4 class="">Edit box</h4>
 			<!-- It is important that there is no indent ↓ -->
 			<textarea class="edit-box__text" name="text" cols="80" rows="25">
 {{ .Text }}
 			</textarea>
-
-			<h4>Upload file</h4>
-			<p>If this hypha has a file like that, the text above is meant to be a description of it</p>
-			<input type="file" name="binary"/>
-		</div>
-
-		<div class="edit-box__right">
-			<h4>Text MIME-type</h4>
-			<p>Good types are <code>text/markdown</code> and <code>text/plain</code></p>
-			<input type="text" name="text_mime" value="{{ .TextMime }}"/>
-
-			<h4>Revision comment</h4>
-			<p>Please make your comment helpful</p>
-			<input type="text" name="comment" value="Update {{ .Name }}"/>
-
-			<h4>Edit tags</h4>
-			<p>Tags are separated by commas, whitespace is ignored</p>
-			<input type="text" name="tags" value="{{ .Tags }}"/>
 		</div>
 	</form>
 </div>
diff --git a/w/m/Templates/default-dark/Hypha/edit/sidebar.html/1.html b/w/m/Templates/default-dark/Hypha/edit/sidebar.html/1.html
new file mode 100644
index 0000000..3f257cf
--- /dev/null
+++ b/w/m/Templates/default-dark/Hypha/edit/sidebar.html/1.html
@@ -0,0 +1,19 @@
+<div style=""><h4>Text MIME-type</h4>
+<p>Good types are <code>text/markdown</code> and <code>text/plain</code></p>
+<input type="text" name="text_mime" value="{{ .TextMime }}"/>
+
+<h4>Revision comment</h4>
+<p>Please make your comment helpful</p>
+<input type="text" name="comment" value="Update {{ .Name }}"/>
+
+<h4>Edit tags</h4>
+<p>Tags are separated by commas, whitespace is ignored</p>
+<input type="text" name="tags" value="{{ .Tags }}"/>
+
+<h4>Upload file</h4>
+<p>If this hypha has a file like that, the text above is meant to be a description of it</p>
+<input type="file" name="binary"/>
+
+
+<p><input type="submit" value="update"/></p>
+</div>
diff --git a/w/m/Templates/default-dark/Hypha/edit/sidebar.html/meta.json b/w/m/Templates/default-dark/Hypha/edit/sidebar.html/meta.json
new file mode 100644
index 0000000..1fe3342
--- /dev/null
+++ b/w/m/Templates/default-dark/Hypha/edit/sidebar.html/meta.json
@@ -0,0 +1,19 @@
+{
+	"views": 0,
+	"deleted": false,
+	"revisions": {
+		"1": {
+			"tags": [
+				""
+			],
+			"name": "sidebar.html",
+			"comment": "Create Templates/default-dark/Hypha/edit/sidebar.html",
+			"author": "",
+			"time": 1593003792,
+			"text_mime": "text/html",
+			"binary_mime": "",
+			"text_name": "1.html",
+			"binary_name": ""
+		}
+	}
+}
diff --git a/w/m/Templates/default-dark/main.css/1.css b/w/m/Templates/default-dark/main.css/1.css
index 400d02e..fcc208e 100644
--- a/w/m/Templates/default-dark/main.css/1.css
+++ b/w/m/Templates/default-dark/main.css/1.css
@@ -182,7 +182,7 @@ footer a, footer a:visited {
         position: fixed;
         top: 0;
         bottom: 0;
-        width: 274px;
+        min-width: 274px;
         right: 0;
     }
 
@@ -192,7 +192,7 @@ footer a, footer a:visited {
 }
 
 .sidebar {
-    padding: 16px 0;
+    padding: 16px;
     border-radius: 1rem;
     background-color: rgba(255,255,255,.05);
 }