1 Instead of having files foo.html "in front of" foo/, I prefer to have
4 I independently implemented a similar, but smaller patch.
5 (It's smaller because I only care about rendering; not CGI, for example.)
6 The key to this patch is that "A/B/C" is treated as equivalent
8 Here it is: --Per Bothner
10 --- IkiWiki/Render.pm~ 2007-01-11 15:01:51.000000000 -0800
11 +++ IkiWiki/Render.pm 2007-02-02 22:24:12.000000000 -0800
13 foreach my $dir (reverse split("/", $page)) {
16 - unshift @ret, { url => $path.htmlpage($dir), page => pagetitle($dir) };
17 + unshift @ret, { url => abs2rel(htmlpage(bestlink($page, $dir)), dirname($page)), page => pagetitle($dir) };
20 + elsif ($dir ne "index") {
25 --- IkiWiki.pm~ 2007-01-12 12:47:09.000000000 -0800
26 +++ IkiWiki.pm 2007-02-02 18:02:16.000000000 -0800
28 elsif (exists $pagecase{lc $l}) {
29 return $pagecase{lc $l};
32 + my $lindex = $l . "/index";
33 + if (exists $links{$lindex}) {
37 } while $cwd=~s!/?[^/]+$!!;
39 if (length $config{userdir} && exists $links{"$config{userdir}/".lc($link)}) {
41 Note I handle setting the url; slightly differently.
42 Also note that an initial "index" is ignored. I.e. a
43 page "A/B/index.html" is treated as "A/B".
45 > Actually, your patch is shorter because it's more elegant and better :)
46 > I'm withdrawing my old patch, because yours is much more in line with
47 > ikiwiki's design and architecture.
48 > I would like to make one suggestion to your patch, which is:
50 diff -urX ignorepats clean-ikidev/IkiWiki/Plugin/inline.pm ikidev/IkiWiki/Plugin/inline.pm
51 --- clean-ikidev/IkiWiki/Plugin/inline.pm 2007-02-25 12:26:54.099113000 -0800
52 +++ ikidev/IkiWiki/Plugin/inline.pm 2007-02-25 14:55:21.163340000 -0800
54 $link=htmlpage($link) if defined $type;
55 $link=abs2rel($link, dirname($params{destpage}));
56 $template->param(pageurl => $link);
57 - $template->param(title => pagetitle(basename($page)));
58 + $template->param(title => titlename($page));
59 $template->param(ctime => displaytime($pagectime{$page}));
63 my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
66 - title => pagetitle(basename($p), 1),
67 + title => titlename($p, 1),
70 date_822 => date_822($pagectime{$p}),
71 diff -urX ignorepats clean-ikidev/IkiWiki/Render.pm ikidev/IkiWiki/Render.pm
72 --- clean-ikidev/IkiWiki/Render.pm 2007-02-25 12:26:54.745833000 -0800
73 +++ ikidev/IkiWiki/Render.pm 2007-02-25 14:54:01.564715000 -0800
76 title => $page eq 'index'
78 - : pagetitle(basename($page)),
80 wikiname => $config{wikiname},
81 parentlinks => [parentlinks($page)],
83 diff -urX ignorepats clean-ikidev/IkiWiki.pm ikidev/IkiWiki.pm
84 --- clean-ikidev/IkiWiki.pm 2007-02-25 12:26:58.812850000 -0800
85 +++ ikidev/IkiWiki.pm 2007-02-25 15:05:22.328852000 -0800
90 +sub titlename($;@) { #{{{
92 + $page =~ s!/index$!!;
93 + return pagetitle(basename($page), @_);
96 sub basename ($) { #{{{
100 > This way foo/index gets "foo" as its title, not "index". --Ethan