urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Elegant patch from Ethan to clean up the display of page names in the 

dropdown when creating a new page.
master
joey 2007-02-21 00:17:50 +00:00
parent 67b782a346
commit 92e5781212
4 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IkiWiki/CGI.pm
View File

@ -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)));

4
debian/changelog vendored
View File

@ -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

27
doc/patchqueue/friendly_pagelocs.mdwn
View File

@ -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>

10
po/ikiwiki.pot
View File

@ -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 ""