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

web commit by http://ethan.betacantrips.com/: oops, missed inline

master
joey 2007-02-25 23:10:11 +00:00
parent 220811c46f
commit 0f7198ac18
1 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
doc/patchqueue/index.html_allowed.mdwn
View File

@ -47,26 +47,55 @@ page "A/B/index.html" is treated as "A/B".
> ikiwiki's design and architecture. > ikiwiki's design and architecture.
> I would like to make one suggestion to your patch, which is: > I would like to make one suggestion to your patch, which is:
diff -urX ignorepats clean-ikidev/IkiWiki/Plugin/inline.pm ikidev/IkiWiki/Plugin/inline.pm
--- clean-ikidev/IkiWiki/Plugin/inline.pm 2007-02-25 12:26:54.099113000 -0800
+++ ikidev/IkiWiki/Plugin/inline.pm 2007-02-25 14:55:21.163340000 -0800
@@ -154,7 +154,7 @@
$link=htmlpage($link) if defined $type;
$link=abs2rel($link, dirname($params{destpage}));
$template->param(pageurl => $link);
- $template->param(title => pagetitle(basename($page)));
+ $template->param(title => titlename($page));
$template->param(ctime => displaytime($pagectime{$page}));
if ($actions) {
@@ -318,7 +318,7 @@
my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
$itemtemplate->param(
- title => pagetitle(basename($p), 1),
+ title => titlename($p, 1),
url => $u,
permalink => $u,
date_822 => date_822($pagectime{$p}),
diff -urX ignorepats clean-ikidev/IkiWiki/Render.pm ikidev/IkiWiki/Render.pm diff -urX ignorepats clean-ikidev/IkiWiki/Render.pm ikidev/IkiWiki/Render.pm
--- clean-ikidev/IkiWiki/Render.pm 2007-02-25 12:26:54.745833000 -0800 --- clean-ikidev/IkiWiki/Render.pm 2007-02-25 12:26:54.745833000 -0800
+++ ikidev/IkiWiki/Render.pm 2007-02-25 12:56:40.711261000 -0800 +++ ikidev/IkiWiki/Render.pm 2007-02-25 14:54:01.564715000 -0800
@@ -106,11 +106,15 @@ @@ -110,7 +110,7 @@
if ($actions) { $template->param(
$template->param(have_actions => 1); title => $page eq 'index'
} ? $config{wikiname}
+ my $title = $page; - : pagetitle(basename($page)),
+ if ($page =~ m!/index$!){ + : titlename($page),
+ $title =~ s!/index$!!; wikiname => $config{wikiname},
+ } parentlinks => [parentlinks($page)],
content => $content,
$template->param( diff -urX ignorepats clean-ikidev/IkiWiki.pm ikidev/IkiWiki.pm
title => $page eq 'index' --- clean-ikidev/IkiWiki.pm 2007-02-25 12:26:58.812850000 -0800
? $config{wikiname} +++ ikidev/IkiWiki.pm 2007-02-25 15:05:22.328852000 -0800
- : pagetitle(basename($page)), @@ -192,6 +192,12 @@
+ : pagetitle(basename($title)), return $untainted;
wikiname => $config{wikiname}, } #}}}
parentlinks => [parentlinks($page)],
content => $content, +sub titlename($;@) { #{{{
+ my $page = shift;
+ $page =~ s!/index$!!;
+ return pagetitle(basename($page), @_);
+} #}}}
+
sub basename ($) { #{{{
my $file=shift;
> This way foo/index gets "foo" as its title, not "index". --Ethan > This way foo/index gets "foo" as its title, not "index". --Ethan