From: David Bremner <bremner@unb.ca>
Date: Mon, 1 Sep 2008 15:12:51 +0000 (-0300)
Subject: Merge branch 'master' into htmlify
X-Git-Tag: 0.4~8
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/715d587f76b74be9228a9349f25f82cf936a2a11?hp=-c

Merge branch 'master' into htmlify
---

715d587f76b74be9228a9349f25f82cf936a2a11
diff --combined IkiWiki/Plugin/mailbox.pm
index e619eb35f,8e91bc4cb..bf626030b
--- a/IkiWiki/Plugin/mailbox.pm
+++ b/IkiWiki/Plugin/mailbox.pm
@@@ -28,16 -28,17 +28,18 @@@ sub import { #{{
  	hook(type => "preprocess", id => "mailbox", call => \&preprocess);
  	hook(type => "scan", id => "mailbox", call => \&scan);
  	hook(type => "pagetemplate", id=>"mailbox", call => \&pagetemplate);
 +	hook(type => "htmlize",id=>"mbox",call => \&mbox_htmlize);
  	IkiWiki::loadplugin("filecheck");
  } # }}}
  
  sub scan(@){
  	my %params=@_;
  	my $page=$params{page};
+ 	
+ 	my $linktext=$config{url}.'/mailbox.css';
  
  	push @{$metaheaders{$page}}, 
- 	       '<link rel="stylesheet" href="mailbox.css" type="text/css"/>'
+ 	       '<link rel="stylesheet" href="'.$linktext.'" type="text/css"/>'
  }
  
  sub preprocess (@) { #{{{
@@@ -60,12 -61,6 +62,12 @@@
  
  } # }}}
  
 +sub mbox_htmlize(@){
 +    my %params=@_;
 +    
 +    my $path=$config{srcdir} . '/' . $params{page}.".mbox";
 +    return format_mailbox(path=>$path,type=>'Mbox',destpage=>$params{page});
 +}
  
  ### The guts of the plugin
  ### parameters