summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ikiwiki.setup7
-rw-r--r--perl/IkiWiki/Plugin/farbar.pm110
-rw-r--r--perl/IkiWiki/Plugin/topbar.pm110
m---------templates0
4 files changed, 227 insertions, 0 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup
index e3be550..ec22c03 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -224,4 +224,11 @@ use IkiWiki::Setup::Standard {
#websetup_force_plugins => [],
# show unsafe settings, read-only, in web interface?
#websetup_show_unsafe => 1,
+
+ # varioki plugin (strings are eval'ed: double-quote actual strings!)
+ #varioki => {
+ # 'branding_logo_text' => '"Example Website"',
+ # 'branding_logo' => '"logo.png"',
+ # 'branding_logo_tagline' => '"Yet another ikiwiki site!"',
+ #},
}
diff --git a/perl/IkiWiki/Plugin/farbar.pm b/perl/IkiWiki/Plugin/farbar.pm
new file mode 100644
index 0000000..37f1013
--- /dev/null
+++ b/perl/IkiWiki/Plugin/farbar.pm
@@ -0,0 +1,110 @@
+#!/usr/bin/perl
+# Farbar plugin.
+# by Jonas Smedegaard <dr@jones.dk>
+# Heavily based on Sidebar by Tuomo Valkonen <tuomov at iki dot fi>
+
+package IkiWiki::Plugin::farbar;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+ hook(type => "getsetup", id => "farbar", call => \&getsetup);
+ hook(type => "preprocess", id => "farbar", call => \&preprocess);
+ hook(type => "pagetemplate", id => "farbar", call => \&pagetemplate);
+}
+
+sub getsetup () {
+ return
+ plugin => {
+ safe => 1,
+ rebuild => 1,
+ },
+ global_farbars => {
+ type => "boolean",
+ example => 1,
+ description => "show farbar page on all pages?",
+ safe => 1,
+ rebuild => 1,
+ },
+}
+
+my %pagefarbar;
+
+sub preprocess (@) {
+ my %params=@_;
+
+ my $page=$params{page};
+ return "" unless $page eq $params{destpage};
+
+ if (! defined $params{content}) {
+ $pagefarbar{$page}=undef;
+ }
+ else {
+ my $file = $pagesources{$page};
+ my $type = pagetype($file);
+
+ $pagefarbar{$page}=
+ IkiWiki::htmlize($page, $page, $type,
+ IkiWiki::linkify($page, $page,
+ IkiWiki::preprocess($page, $page, $params{content})));
+ }
+
+ return "";
+}
+
+my $oldfile;
+my $oldcontent;
+
+sub farbar_content ($) {
+ my $page=shift;
+
+ return delete $pagefarbar{$page} if defined $pagefarbar{$page};
+
+ return if ! exists $pagefarbar{$page} &&
+ defined $config{global_farbars} && ! $config{global_farbars};
+
+ my $farbar_page=bestlink($page, "farbar") || return;
+ my $farbar_file=$pagesources{$farbar_page} || return;
+ my $farbar_type=pagetype($farbar_file);
+
+ if (defined $farbar_type) {
+ # FIXME: This isn't quite right; it won't take into account
+ # adding a new farbar page. So adding such a page
+ # currently requires a wiki rebuild.
+ add_depends($page, $farbar_page);
+
+ my $content;
+ if (defined $oldfile && $farbar_file eq $oldfile) {
+ $content=$oldcontent;
+ }
+ else {
+ $content=readfile(srcfile($farbar_file));
+ $oldcontent=$content;
+ $oldfile=$farbar_file;
+ }
+
+ return unless length $content;
+ return IkiWiki::htmlize($farbar_page, $page, $farbar_type,
+ IkiWiki::linkify($farbar_page, $page,
+ IkiWiki::preprocess($farbar_page, $page,
+ IkiWiki::filter($farbar_page, $page, $content))));
+ }
+
+}
+
+sub pagetemplate (@) {
+ my %params=@_;
+
+ my $template=$params{template};
+ if ($params{destpage} eq $params{page} &&
+ $template->query(name => "farbar")) {
+ my $content=farbar_content($params{destpage});
+ if (defined $content && length $content) {
+ $template->param(farbar => $content);
+ }
+ }
+}
+
+1
diff --git a/perl/IkiWiki/Plugin/topbar.pm b/perl/IkiWiki/Plugin/topbar.pm
new file mode 100644
index 0000000..2705161
--- /dev/null
+++ b/perl/IkiWiki/Plugin/topbar.pm
@@ -0,0 +1,110 @@
+#!/usr/bin/perl
+# Topbar plugin.
+# by Jonas Smedegaard <dr@jones.dk>
+# Heavily based on Sidebar by Tuomo Valkonen <tuomov at iki dot fi>
+
+package IkiWiki::Plugin::topbar;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+ hook(type => "getsetup", id => "topbar", call => \&getsetup);
+ hook(type => "preprocess", id => "topbar", call => \&preprocess);
+ hook(type => "pagetemplate", id => "topbar", call => \&pagetemplate);
+}
+
+sub getsetup () {
+ return
+ plugin => {
+ safe => 1,
+ rebuild => 1,
+ },
+ global_topbars => {
+ type => "boolean",
+ example => 1,
+ description => "show topbar page on all pages?",
+ safe => 1,
+ rebuild => 1,
+ },
+}
+
+my %pagetopbar;
+
+sub preprocess (@) {
+ my %params=@_;
+
+ my $page=$params{page};
+ return "" unless $page eq $params{destpage};
+
+ if (! defined $params{content}) {
+ $pagetopbar{$page}=undef;
+ }
+ else {
+ my $file = $pagesources{$page};
+ my $type = pagetype($file);
+
+ $pagetopbar{$page}=
+ IkiWiki::htmlize($page, $page, $type,
+ IkiWiki::linkify($page, $page,
+ IkiWiki::preprocess($page, $page, $params{content})));
+ }
+
+ return "";
+}
+
+my $oldfile;
+my $oldcontent;
+
+sub topbar_content ($) {
+ my $page=shift;
+
+ return delete $pagetopbar{$page} if defined $pagetopbar{$page};
+
+ return if ! exists $pagetopbar{$page} &&
+ defined $config{global_topbars} && ! $config{global_topbars};
+
+ my $topbar_page=bestlink($page, "topbar") || return;
+ my $topbar_file=$pagesources{$topbar_page} || return;
+ my $topbar_type=pagetype($topbar_file);
+
+ if (defined $topbar_type) {
+ # FIXME: This isn't quite right; it won't take into account
+ # adding a new topbar page. So adding such a page
+ # currently requires a wiki rebuild.
+ add_depends($page, $topbar_page);
+
+ my $content;
+ if (defined $oldfile && $topbar_file eq $oldfile) {
+ $content=$oldcontent;
+ }
+ else {
+ $content=readfile(srcfile($topbar_file));
+ $oldcontent=$content;
+ $oldfile=$topbar_file;
+ }
+
+ return unless length $content;
+ return IkiWiki::htmlize($topbar_page, $page, $topbar_type,
+ IkiWiki::linkify($topbar_page, $page,
+ IkiWiki::preprocess($topbar_page, $page,
+ IkiWiki::filter($topbar_page, $page, $content))));
+ }
+
+}
+
+sub pagetemplate (@) {
+ my %params=@_;
+
+ my $template=$params{template};
+ if ($params{destpage} eq $params{page} &&
+ $template->query(name => "topbar")) {
+ my $content=topbar_content($params{destpage});
+ if (defined $content && length $content) {
+ $template->param(topbar => $content);
+ }
+ }
+}
+
+1
diff --git a/templates b/templates
-Subproject 5df058b2b3dc6e565ad3b3604263f487ef65f2a
+Subproject e56182b880dc296388452f97dacdcef457540e1