From 92e5781212eba09bc847fddb92e86e873338fe67 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 21 Feb 2007 00:17:50 +0000
Subject: * Elegant patch from Ethan to clean up the display of page names in
 the   dropdown when creating a new page.

---
 IkiWiki/CGI.pm                        |  3 ++-
 debian/changelog                      |  4 +++-
 doc/patchqueue/friendly_pagelocs.mdwn | 27 ---------------------------
 po/ikiwiki.pot                        | 10 +++++-----
 4 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 doc/patchqueue/friendly_pagelocs.mdwn

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index af3bb8a4a..e23ef8afd 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -459,7 +459,8 @@ sub cgi_editpage ($$) { #{{{
 			
 			$form->tmpl_param("page_select", 1);
 			$form->field(name => "page", type => 'select',
-				options => \@editable_locs, value => $best_loc);
+				options => { map { $_ => pagetitle($_, 1) } @editable_locs },
+				value => $best_loc);
 			$form->field(name => "type", type => 'select',
 				options => \@page_types);
 			$form->title(sprintf(gettext("creating %s"), pagetitle($page)));
diff --git a/debian/changelog b/debian/changelog
index 95811f7f5..6a6dc8f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,10 @@ ikiwiki (1.44) UNRELEASED; urgency=low
   * Detect old versions of xgettext and avoid using them.
   * perl is broken: print "" || die fails! Work around this insanity.
   * Smarter detection of no-op changes to po files.
+  * Elegant patch from Ethan to clean up the display of page names in the
+    dropdown when creating a new page.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 20 Feb 2007 18:12:44 -0500
+ -- Joey Hess <joeyh@debian.org>  Tue, 20 Feb 2007 19:14:39 -0500
 
 ikiwiki (1.43) unstable; urgency=low
 
diff --git a/doc/patchqueue/friendly_pagelocs.mdwn b/doc/patchqueue/friendly_pagelocs.mdwn
deleted file mode 100644
index 2fbfbf51d..000000000
--- a/doc/patchqueue/friendly_pagelocs.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-When you create a new page, the choices for page location have underscores and
-numbers in them to represent spaces and "special characters". This patch lets
-ikiwiki display more user-friendly names. --Ethan
-
-<pre>
-diff -urX ignorepats ikiwiki/IkiWiki/CGI.pm ikidev/IkiWiki/CGI.pm
---- ikiwiki/IkiWiki/CGI.pm      2007-02-14 18:17:12.000000000 -0800
-+++ ikidev/IkiWiki/CGI.pm       2007-02-20 15:54:13.761158000 -0800
-@@ -450,6 +450,8 @@
-                                map { check_canedit($_, $q, $session) } @page_locs;
-                        }
-
-+                       # don't escape (will be done by formbuilder)
-+                       my %loc_options = map { $_ => pagetitle($_, 1) } @editable_locs;
-                        my @page_types;
-                        if (exists $hooks{htmlize}) {
-                                @page_types=keys %{$hooks{htmlize}};
-@@ -457,7 +459,7 @@
-
-                        $form->tmpl_param("page_select", 1);
-                        $form->field(name => "page", type => 'select',
--                               options => \@editable_locs, value => $best_loc);
-+                               options => \%loc_options, value => $best_loc);
-                        $form->field(name => "type", type => 'select',
-                                options => \@page_types);
-                        $form->title(sprintf(gettext("creating %s"), pagetitle($page)));
-</pre>
\ No newline at end of file
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 29673a1d1..76337ff7e 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-20 18:12-0500\n"
+"POT-Creation-Date: 2007-02-20 19:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,21 +36,21 @@ msgstr ""
 msgid "discussion"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:465
+#: ../IkiWiki/CGI.pm:466
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:482 ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:543
+#: ../IkiWiki/CGI.pm:483 ../IkiWiki/CGI.pm:511 ../IkiWiki/CGI.pm:544
 #, perl-format
 msgid "editing %s"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:651
+#: ../IkiWiki/CGI.pm:652
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:683
+#: ../IkiWiki/CGI.pm:684
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-- 
cgit v1.2.3