From 1452b3adf30145e8fd1208ac73da9d12967863bc Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 2 Jul 2006 17:44:43 +0000
Subject: [PATCH]   so make sure to let perl know it should be handled as utf8.
 Also, * Improve layout of edit page so formatting help link is always visible
 w/o   getting in the way of the preview.

---
 IkiWiki/Render.pm                              | 4 ++--
 debian/changelog                               | 6 ++++--
 doc/bugs/helponformatting_link_disappears.mdwn | 6 +++++-
 templates/editpage.tmpl                        | 5 ++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d23dfdc25..08f098760 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -34,11 +34,11 @@ sub htmlize ($$) { #{{{
 	
 	if ($type eq '.mdwn') {
 		# XXX explanation of this insanity wating on perl bug number
-		$content=Encode::encode_utf8($content);
+#		$content=Encode::encode_utf8($content);
 		$content=Encode::encode_utf8($content);
 		$content=Markdown::Markdown($content);
 		$content=Encode::decode_utf8($content);
-		$content=Encode::decode_utf8($content);
+#		$content=Encode::decode_utf8($content);
 	}
 	else {
 		error("htmlization of $type not supported");
diff --git a/debian/changelog b/debian/changelog
index 6a0e50b89..b1b449ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ ikiwiki (1.8) UNRELEASED; urgency=low
     ikiwiki depend on XML::Simple. Patch by Faidon Liambotis.
   * POSIX::strftime doesn't know about encodings and doesn't return a utf8
     flagged string even if the locale causes it to generate utf8 output,
-    so make sure to let perl know it should be handled as utf8. Also, 
+    so make sure to let perl know it should be handled as utf8. Also,
     the optimised version used for standard time formats won't work if the
     user has changed locale, so drop it. Thanks, Faidon Liambotis.
   * Fix re-encoding of the comments field to utf8 if a commit fails
@@ -18,8 +18,10 @@ ikiwiki (1.8) UNRELEASED; urgency=low
   * Add insane double encode/decode to utf8 around call to markdown.
     This works around a truely strange bug, which is apparently a bug in
     perl, which I lack space to describe here (see t/crazy-badass-perl-bug.t)
+  * Improve layout of edit page so formatting help link is always visible w/o
+    getting in the way of the preview.
 
- -- Joey Hess <joeyh@debian.org>  Sat,  1 Jul 2006 23:25:44 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun,  2 Jul 2006 13:43:56 -0400
 
 ikiwiki (1.7) unstable; urgency=low
 
diff --git a/doc/bugs/helponformatting_link_disappears.mdwn b/doc/bugs/helponformatting_link_disappears.mdwn
index 65e57b774..11ce5488d 100644
--- a/doc/bugs/helponformatting_link_disappears.mdwn
+++ b/doc/bugs/helponformatting_link_disappears.mdwn
@@ -1 +1,5 @@
-If you are editing a page using your www browser and hit the "Preview" button, the link to "HelpOnFormatting" on the bottom of the page disappears.  This may be expected, or not.
+If you are editing a page using your www browser and hit the "Preview"
+button, the link to "HelpOnFormatting" on the bottom of the page
+disappears.  This may be expected, or not.
+
+[[bugs/done]]
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index ec48df4c2..cf4520575 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -38,17 +38,16 @@ Optional comment about this change:<br />
 <TMPL_VAR FIELD-COMMENTS><br />
 </TMPL_IF>
 <TMPL_VAR FORM-SUBMIT>
+<TMPL_VAR HELPONFORMATTINGLINK>
 <TMPL_VAR FORM-END>
-<hr />
 <TMPL_IF NAME="PAGE_PREVIEW">
+<hr />
 <div class="header">
 <span>Page preview:</span>
 </div>
 <div id="content">
 <TMPL_VAR PAGE_PREVIEW>
 </div>
-<TMPL_ELSE>
-<TMPL_VAR HELPONFORMATTINGLINK>
 </TMPL_IF>
 </body>
 </html>
-- 
2.26.2