From 4e599569ed99a39d1bb33c00ad7148e750614d97 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Thu, 7 Apr 2016 16:54:50 +0100
Subject: [PATCH] Align editing message with edit form

---
 build/index.php       | 6 ++++--
 module_index.json     | 2 +-
 modules/page-edit.php | 2 +-
 settings.fragment.php | 4 +++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build/index.php b/build/index.php
index b936c73..6904c26 100644
--- a/build/index.php
+++ b/build/index.php
@@ -70,7 +70,8 @@ $settings->footer_message = "All content is under <a href='?page=License' target
 
 // A message that will appear just before the submit button on the editing
 // page. May contain HTML.
-$settings->editing_message = "By submitting your edit, you are agreeing to release your changes under <a href='?action=view&page=License' target='_blank'>this license</a>. Also note that if you don't want your work to be edited by other users of this site, please don't submit it here!";
+$settings->editing_message = "<a href='?action=help#20-parser-default' target='_blank'>Formatting help</a> (<a href='https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet'>Markdown Cheatsheet</a>)<br />
+By submitting your edit, you are agreeing to release your changes under <a href='?action=view&page=License' target='_blank'>this license</a>. Also note that if you don't want your work to be edited by other users of this site, please don't submit it here!";
 
 // The string that is prepended before an admin's name on the nav bar. Defaults
 // to a diamond shape (&#9670;).
@@ -336,6 +337,7 @@ textarea { min-height: 35rem; font-size: 1.25rem; }
 textarea, textarea ~ input[type=submit], #search-box { width: calc(100% - 0.3rem); box-sizing: border-box; }
 textarea ~ input[type=submit] { margin: 0.5rem 0.8rem; padding: 0.5rem; font-weight: bolder; }
 .editform input[type=text] { width: calc(100% - 0.3rem); box-sizing: border-box; }
+.editing_message { margin: 0.8rem; }
 
 .page-tags-display { margin: 0.5rem 0 0 0; padding: 0; list-style-type: none; }
 .page-tags-display li { display: inline-block; margin: 0.5rem; padding: 0.5rem; background: #D2C3DD; white-space: nowrap; }
@@ -3105,7 +3107,7 @@ register_module([
 			$content .= "<form method='post' action='index.php?action=save&page=" . rawurlencode($page) . "&action=save' class='editform'>
 			<textarea name='content'>$pagetext</textarea>
 			<input type='text' name='tags' value='$page_tags' placeholder='Enter some tags for the page here. Separate them with commas.' title='Enter some tags for the page here. Separate them with commas.' />
-			<p>$settings->editing_message</p>
+			<p class='editing_message'>$settings->editing_message</p>
 			<input type='submit' value='Save Page' />
 		</form>";
 			exit(page_renderer::render_main("$title - $settings->sitename", $content));
diff --git a/module_index.json b/module_index.json
index 373f070..5666f1a 100644
--- a/module_index.json
+++ b/module_index.json
@@ -104,7 +104,7 @@
         "author": "Starbeamrainbowlabs",
         "description": "Allows you to edit pages by adding the edit and save actions. You should probably include this one.",
         "id": "page-edit",
-        "lastupdate": 1452949641,
+        "lastupdate": 1460044396,
         "optional": false
     },
     {
diff --git a/modules/page-edit.php b/modules/page-edit.php
index ad0df25..d4ed3f0 100644
--- a/modules/page-edit.php
+++ b/modules/page-edit.php
@@ -69,7 +69,7 @@ register_module([
 			$content .= "<form method='post' action='index.php?action=save&page=" . rawurlencode($page) . "&action=save' class='editform'>
 			<textarea name='content'>$pagetext</textarea>
 			<input type='text' name='tags' value='$page_tags' placeholder='Enter some tags for the page here. Separate them with commas.' title='Enter some tags for the page here. Separate them with commas.' />
-			<p>$settings->editing_message</p>
+			<p class='editing_message'>$settings->editing_message</p>
 			<input type='submit' value='Save Page' />
 		</form>";
 			exit(page_renderer::render_main("$title - $settings->sitename", $content));
diff --git a/settings.fragment.php b/settings.fragment.php
index dbce0f1..db2cc6d 100644
--- a/settings.fragment.php
+++ b/settings.fragment.php
@@ -67,7 +67,8 @@ $settings->footer_message = "All content is under <a href='?page=License' target
 
 // A message that will appear just before the submit button on the editing
 // page. May contain HTML.
-$settings->editing_message = "By submitting your edit, you are agreeing to release your changes under <a href='?action=view&page=License' target='_blank'>this license</a>. Also note that if you don't want your work to be edited by other users of this site, please don't submit it here!";
+$settings->editing_message = "<a href='?action=help#20-parser-default' target='_blank'>Formatting help</a> (<a href='https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet'>Markdown Cheatsheet</a>)<br />
+By submitting your edit, you are agreeing to release your changes under <a href='?action=view&page=License' target='_blank'>this license</a>. Also note that if you don't want your work to be edited by other users of this site, please don't submit it here!";
 
 // The string that is prepended before an admin's name on the nav bar. Defaults
 // to a diamond shape (&#9670;).
@@ -333,6 +334,7 @@ textarea { min-height: 35rem; font-size: 1.25rem; }
 textarea, textarea ~ input[type=submit], #search-box { width: calc(100% - 0.3rem); box-sizing: border-box; }
 textarea ~ input[type=submit] { margin: 0.5rem 0.8rem; padding: 0.5rem; font-weight: bolder; }
 .editform input[type=text] { width: calc(100% - 0.3rem); box-sizing: border-box; }
+.editing_message { margin: 0.8rem; }
 
 .page-tags-display { margin: 0.5rem 0 0 0; padding: 0; list-style-type: none; }
 .page-tags-display li { display: inline-block; margin: 0.5rem; padding: 0.5rem; background: #D2C3DD; white-space: nowrap; }