summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--README3
m---------basewiki0
m---------basewiki_nonedit0
-rw-r--r--ikiwiki_nb.setup (renamed from ikiwiki.setup)12
-rw-r--r--ikiwiki_nb_admin.setup (renamed from ikiwiki_admin.setup)21
m---------javascript0
m---------openid-selector0
-rw-r--r--perl/IkiWiki/Plugin/farbar.pm53
-rw-r--r--perl/IkiWiki/Plugin/topbar.pm53
m---------smiley0
m---------templates0
m---------templates_nonedit0
13 files changed, 134 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 1cdbc56..e469a98 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ ikiwiki_MODULES = templates basewiki smiley directives
dummy_MODULES = content_dummy
# uncomment this when ikiwiki.setup is configured for the local environment
-#CONFIGS = ikiwiki_admin.setup ikiwiki.setup
+#CONFIGS = ikiwiki_nb_admin.setup ikiwiki_nb.setup
# Everything after this is generic
diff --git a/README b/README
index 5f4302c..da044bf 100644
--- a/README
+++ b/README
@@ -8,6 +8,9 @@ the following locales:
* danish (da) by Jonas Smedegaard <dr@jones.dk>
+Additionally, the configuration has been simplified to not mention non-Git VCS
+systems, and deprecated placeholder files has been removed from basewiki.
+
Getting the source
------------------
diff --git a/basewiki b/basewiki
-Subproject 6b53960c5bbcf6a43f2e48b0b37a94e1f909b52
+Subproject d298a5fe6aa3f3308377635adb64f67834433ea
diff --git a/basewiki_nonedit b/basewiki_nonedit
-Subproject 7fb1c12eb8ab54df0085bac0262ba73d5a85819
+Subproject 240f2f0aeec158e94b54ca23a2cf3e19b95e5ea
diff --git a/ikiwiki.setup b/ikiwiki_nb.setup
index 0f78b08..12e2db6 100644
--- a/ikiwiki.setup
+++ b/ikiwiki_nb.setup
@@ -38,6 +38,7 @@ use IkiWiki::Setup::Standard {
underlaydirs => [
$ENV{'HOME'} . "/private_webdata/samplewiki/content",
],
+ # Some plugins (smiley in particular) need non-localized master underlay
underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit',
# display verbose messages when building?
#verbose => 1,
@@ -60,7 +61,7 @@ use IkiWiki::Setup::Standard {
# strftime format string to display date
timeformat => '%c',
# UTF-8 locale to use
- #locale => 'en_US.UTF-8',
+ locale => 'nb_NO.UTF-8',
# put user pages below specified page
userdir => '',
# how many backlinks to show before hiding excess (0 to show all)
@@ -126,7 +127,7 @@ use IkiWiki::Setup::Standard {
# git plugin
# git hook to generate
- #git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki',
+ #git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb',
# mode for git_wrapper (can safely be made suid)
#git_wrappermode => '06755',
# gitweb url to show file history ([[file]] substituted)
@@ -259,4 +260,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/ikiwiki_admin.setup b/ikiwiki_nb_admin.setup
index 353f2f0..0bd3e70 100644
--- a/ikiwiki_admin.setup
+++ b/ikiwiki_nb_admin.setup
@@ -21,9 +21,9 @@ use IkiWiki::Setup::Standard {
# base url to the wiki
url => 'http://admin.wiki.example.org',
# url to the ikiwiki.cgi
- cgiurl => 'http://admin.wiki.example.org/ikiwiki.cgi',
+ cgiurl => 'http://admin.wiki.example.org/ikiwiki.nb.cgi',
# cgi wrapper to generate
- cgi_wrapper => $ENV{'HOME'} . '/public_cgi/admin.wiki.example.org/ikiwiki.cgi',
+ cgi_wrapper => $ENV{'HOME'} . '/public_cgi/admin.wiki.example.org/ikiwiki.nb.cgi',
# mode for cgi_wrapper (can safely be made suid)
cgi_wrappermode => '06755',
# rcs backend to use
@@ -53,11 +53,11 @@ use IkiWiki::Setup::Standard {
# extension to use for new pages
default_pageext => 'mdwn',
# extension to use for html files
- htmlext => 'html',
+ htmlext => 'nb.html',
# strftime format string to display date
timeformat => '%c',
# UTF-8 locale to use
- #locale => 'en_US.UTF-8',
+ locale => 'no_NB.UTF-8',
# put user pages below specified page
userdir => '',
# how many backlinks to show before hiding excess (0 to show all)
@@ -123,17 +123,17 @@ use IkiWiki::Setup::Standard {
# git plugin
# git hook to generate
- #git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-admin',
+ #git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb-admin',
# mode for git_wrapper (can safely be made suid)
#git_wrappermode => '06755',
# gitweb url to show file history ([[file]] substituted)
- #historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master
+ #historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]];hb=master-nb',
# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
#diffurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
# where to pull and push changes (set to empty string to disable)
#gitorigin_branch => 'samplewiki',
# branch that the wiki is stored in
- #gitmaster_branch => 'master',
+ #gitmaster_branch => 'master-nb',
# htmlscrubber plugin
# PageSpec specifying pages not to scrub
@@ -256,4 +256,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/javascript b/javascript
-Subproject dea1eff3d9e9781e5b92a326ad7df17d3ba8ba1
+Subproject 9bf18ddbcb122e0f0005c06870c3b792bf7d9b0
diff --git a/openid-selector b/openid-selector
-Subproject b4852ae1f1905a285d69947d6352b6898303324
+Subproject 517a71e93b14812d722f000ab42a6e61cb7b402
diff --git a/perl/IkiWiki/Plugin/farbar.pm b/perl/IkiWiki/Plugin/farbar.pm
new file mode 100644
index 0000000..ab4390a
--- /dev/null
+++ b/perl/IkiWiki/Plugin/farbar.pm
@@ -0,0 +1,53 @@
+#!/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 2.00;
+
+sub import { #{{{
+ hook(type => "pagetemplate", id => "farbar", call => \&pagetemplate);
+} # }}}
+
+sub farbar_content ($) { #{{{
+ my $page=shift;
+
+ 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=readfile(srcfile($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 $page=$params{page};
+ my $template=$params{template};
+
+ if ($template->query(name => "farbar")) {
+ my $content=farbar_content($page);
+ 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..aa62a11
--- /dev/null
+++ b/perl/IkiWiki/Plugin/topbar.pm
@@ -0,0 +1,53 @@
+#!/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 2.00;
+
+sub import { #{{{
+ hook(type => "pagetemplate", id => "topbar", call => \&pagetemplate);
+} # }}}
+
+sub topbar_content ($) { #{{{
+ my $page=shift;
+
+ 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=readfile(srcfile($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 $page=$params{page};
+ my $template=$params{template};
+
+ if ($template->query(name => "topbar")) {
+ my $content=topbar_content($page);
+ if (defined $content && length $content) {
+ $template->param(topbar => $content);
+ }
+ }
+} # }}}
+
+1
diff --git a/smiley b/smiley
-Subproject 30dd469765c2396ded03355876af391e922e89b
+Subproject 60c3fee2d6e48ebd094b59be3385bcb8cf9ea9c
diff --git a/templates b/templates
-Subproject 03cdb15da3f28c109a1a176d6c3f53cf5e1a18f
+Subproject bc2428706e55a105261241c281190e7cddc3f91
diff --git a/templates_nonedit b/templates_nonedit
-Subproject 5967d73895eaf2410c48b886e3cf2778f678fd6
+Subproject 8c0c142ad073666eaa626ea6bebcc76138e351f