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.

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d23dfdc2538716780cb80f94c05876562f9ea0e0..08f098760ecd8faec191e271bded69fc6427bd71 100644 (file)
--- 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 6a0e50b8933343363047524fcef2f9c1cbd3a351..b1b449ad59db18e06e959f0bf7e0d9c3c47bf87a 100644 (file)
--- 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 65e57b774b3924c1e56828ad5b3fa421392a98a5..11ce5488d23c75742129e5c5d86c07e1756d658a 100644 (file)
--- 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 ec48df4c223995ddd70001a79b6e6d1ab77e332b..cf4520575ba04776ddf3cf65ab9521f281473ca6 100644 (file)
--- 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>