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

add both kinds of links

master
Joey Hess 2008-07-01 18:08:31 -04:00
parent 0ffcafc130
commit 8441d31535
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
IkiWiki/Plugin/attachment.pm
View File

@ -27,17 +27,17 @@ sub attachment_location ($) {
} }
sub attachment_list ($) { sub attachment_list ($) {
my $loc=attachment_location(shift); my $page=shift;
my $loc=attachment_location($page);
my @ret; my @ret;
foreach my $f (values %pagesources) { foreach my $f (values %pagesources) {
print STDERR ">>$f\n" if ! defined IkiWiki::pagetype($f);
if (! defined IkiWiki::pagetype($f) && if (! defined IkiWiki::pagetype($f) &&
$f=~m/^\Q$loc\E[^\/]+$/ && $f=~m/^\Q$loc\E[^\/]+$/ &&
-e "$config{srcdir}/$f") { -e "$config{srcdir}/$f") {
push @ret, { push @ret, {
"field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'">', "field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'">',
link => $f, link => htmllink($page, $page, $f, noimageinline => 1),
size => (stat(_))[7], size => (stat(_))[7],
mtime => displaytime($IkiWiki::pagemtime{$f}), mtime => displaytime($IkiWiki::pagemtime{$f}),
}; };
@ -87,11 +87,11 @@ sub formbuilder_setup (@) { #{{{
sub formbuilder (@) { #{{{ sub formbuilder (@) { #{{{
my %params=@_; my %params=@_;
my $form=$params{form}; my $form=$params{form};
my $q=$params{cgi};
return if $form->field("do") ne "edit"; return if $form->field("do") ne "edit";
if ($form->submitted eq "Upload" || $form->submitted eq "Save Page") { if ($form->submitted eq "Upload" || $form->submitted eq "Save Page") {
my $q=$params{cgi};
my $session=$params{session}; my $session=$params{session};
my $filename=$q->param('attachment'); my $filename=$q->param('attachment');
@ -163,6 +163,15 @@ sub formbuilder (@) { #{{{
IkiWiki::refresh(); IkiWiki::refresh();
IkiWiki::saveindex(); IkiWiki::saveindex();
} }
elsif ($form->submitted eq "Insert Links") {
my $add="";
foreach my $f ($q->param("attachment_select")) {
$add.="[[$f]]\n";
}
$form->field(name => 'editcontent',
value => $form->field('editcontent')."\n\n".$add,
force => 1);
}
} # }}} } # }}}
package IkiWiki::PageSpec; package IkiWiki::PageSpec;