summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-12-25 13:38:26 -0400
committerJoey Hess <joey@kitenet.net>2010-12-25 13:38:26 -0400
commitbeae7ef9db01ab2af75d3176b016113c9d33f0a9 (patch)
treeedb900bab7145a76ef118a2a4447796a949a8819
parent9741a3f979eb65b59b32f04422410e206f48ed86 (diff)
editpage, comment: Clean up title when editing or creating a page or comment.
Now that page.tmpl is used for cgi, the parentlinks are able to be displayed even when creating or editing a page. So it's redundant to include the path to the page in the title, remove it.
-rw-r--r--IkiWiki/Plugin/comments.pm2
-rw-r--r--IkiWiki/Plugin/editpage.pm4
-rw-r--r--debian/changelog2
3 files changed, 5 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 68ac4cfae..63e9ab499 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -375,7 +375,7 @@ sub editcomment ($$) {
my $baseurl = urlto($page);
$form->title(sprintf(gettext("commenting on %s"),
- IkiWiki::pagetitle($page)));
+ IkiWiki::pagetitle(IkiWiki::basename($page))));
$form->tmpl_param('helponformattinglink',
htmllink($page, $page, 'ikiwiki/formatting',
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index da071d492..537b86ad1 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -291,7 +291,7 @@ sub cgi_editpage ($$) {
value => $best_loc);
$form->field(name => "type", type => 'select',
options => \@page_types);
- $form->title(sprintf(gettext("creating %s"), pagetitle($page)));
+ $form->title(sprintf(gettext("creating %s"), pagetitle(basename($page))));
}
elsif ($form->field("do") eq "edit") {
@@ -309,7 +309,7 @@ sub cgi_editpage ($$) {
$form->tmpl_param("page_select", 0);
$form->field(name => "page", type => 'hidden');
$form->field(name => "type", type => 'hidden');
- $form->title(sprintf(gettext("editing %s"), pagetitle($page)));
+ $form->title(sprintf(gettext("editing %s"), pagetitle(basename($page))));
}
showform($form, \@buttons, $session, $q,
diff --git a/debian/changelog b/debian/changelog
index 630a4498a..89617d5de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ ikiwiki (3.20101202) UNRELEASED; urgency=low
like title_overridden that do not appear on the template. (intrigeri)
(See https://rt.cpan.org/Public/Bug/Display.html?id=64158)
* inline: Force an absolute page location when the inline postform is used.
+ * editpage, comment: Clean up title when editing or creating a page or
+ comment.
-- Joey Hess <joeyh@debian.org> Mon, 29 Nov 2010 14:44:13 -0400