From 7bbe9cf94d75b52fe979d87e4e3951514dbd1b76 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Mar 2009 13:07:50 -0400 Subject: Fix documentation of anonok_pagespec. Closes: #521793 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 158db9a4d..581a3bf33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.09) UNRELEASED; urgency=low * comments: Fix too loose test for comments pages that matched normal pages with "comment_" in their name. Closes: #521322 * comments: Fix anchor ids to be legal xhtml. Closes: #521339 + * Fix documentation of anonok_pagespec. Closes: #521793 -- Joey Hess Thu, 19 Mar 2009 15:32:49 -0400 -- cgit v1.2.3 From b1f9996078314bd1b05e66e2962fb067754a36be Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 31 Mar 2009 14:16:32 -0400 Subject: Add missing suggests on libtext-textile-perl. Closes: #522039 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 581a3bf33..a3ff97d30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ ikiwiki (3.09) UNRELEASED; urgency=low normal pages with "comment_" in their name. Closes: #521322 * comments: Fix anchor ids to be legal xhtml. Closes: #521339 * Fix documentation of anonok_pagespec. Closes: #521793 + * Add missing suggests on libtext-textile-perl. Closes: #522039 -- Joey Hess Thu, 19 Mar 2009 15:32:49 -0400 diff --git a/debian/control b/debian/control index 8f48bf98a..a0769cbce 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Package: ikiwiki Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl -Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl +Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl, libtext-textile-perl Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table Provides: ikiwiki-plugin-table -- cgit v1.2.3 From 72b9482835faabcef13a22c9c9af3314da5a71f3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Apr 2009 19:18:43 -0400 Subject: recentchanges: change to using do=goto links. --- IkiWiki/Plugin/recentchanges.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 329dd6f32..fa851e466 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -123,7 +123,7 @@ sub store ($$$) { } elsif (length $config{cgiurl}) { $change->{authorurl} = IkiWiki::cgiurl( - do => "recentchanges_link", + do => "goto", page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author}, ); } diff --git a/debian/changelog b/debian/changelog index a3ff97d30..25ed0dce9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ ikiwiki (3.09) UNRELEASED; urgency=low * comments: Fix anchor ids to be legal xhtml. Closes: #521339 * Fix documentation of anonok_pagespec. Closes: #521793 * Add missing suggests on libtext-textile-perl. Closes: #522039 + * recentchanges: change to using do=goto links. -- Joey Hess Thu, 19 Mar 2009 15:32:49 -0400 -- cgit v1.2.3 From 6157c8697b6eb8842b38b82ade85b72135f6cdcc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Apr 2009 19:33:49 -0400 Subject: clarify --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 25ed0dce9..6c30c8ff5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,7 @@ ikiwiki (3.09) UNRELEASED; urgency=low * comments: Fix anchor ids to be legal xhtml. Closes: #521339 * Fix documentation of anonok_pagespec. Closes: #521793 * Add missing suggests on libtext-textile-perl. Closes: #522039 - * recentchanges: change to using do=goto links. + * recentchanges: change to using do=goto links for user links. -- Joey Hess Thu, 19 Mar 2009 15:32:49 -0400 -- cgit v1.2.3 From 8a119839464fbfdf6fc3e8c302fa3d9cac7eab6b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 4 Apr 2009 14:58:34 -0400 Subject: Fix git test suite to use a bare repo. This works around an enormous (and, in this context, enormously confusing) message that git has begun to print when one attempts to push changes into a non-bare repo. As a bonus, it now tests whether ikiwiki-makerepo works. --- debian/changelog | 5 +++-- t/git.t | 19 ++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6c30c8ff5..fab20985d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.09) UNRELEASED; urgency=low +ikiwiki (3.09) unstable; urgency=low * inline: Add title_natural sort order, using Sort::Naturally (chrysn) @@ -13,8 +13,9 @@ ikiwiki (3.09) UNRELEASED; urgency=low * Fix documentation of anonok_pagespec. Closes: #521793 * Add missing suggests on libtext-textile-perl. Closes: #522039 * recentchanges: change to using do=goto links for user links. + * Fix git test suite to use a bare repo. - -- Joey Hess Thu, 19 Mar 2009 15:32:49 -0400 + -- Joey Hess Sat, 04 Apr 2009 14:33:49 -0400 ikiwiki (3.08) unstable; urgency=low diff --git a/t/git.t b/t/git.t index b3aa6a80b..f1c24b359 100755 --- a/t/git.t +++ b/t/git.t @@ -3,19 +3,17 @@ use warnings; use strict; my $dir; -my $gitrepo; BEGIN { $dir="/tmp/ikiwiki-test-git.$$"; - $gitrepo="$dir/repo"; my $git=`which git`; chomp $git; - if (! -x $git || ! mkdir($dir) || ! mkdir($gitrepo)) { + if (! -x $git || ! mkdir($dir)) { eval q{ - use Test::More skip_all => "git not available or could not make test dirs" + use Test::More skip_all => "git not available or could not make test dir" } } } -use Test::More tests => 16; +use Test::More tests => 18; BEGIN { use_ok("IkiWiki"); } @@ -25,17 +23,16 @@ $config{srcdir} = "$dir/src"; IkiWiki::loadplugins(); IkiWiki::checkconfig(); -system "cd $gitrepo && git init >/dev/null 2>&1"; -system "cd $gitrepo && echo dummy > dummy; git add . >/dev/null 2>&1"; -system "cd $gitrepo && git commit -m Initial >/dev/null 2>&1"; -system "git clone -l -s $gitrepo $config{srcdir} >/dev/null 2>&1"; +ok (mkdir($config{srcdir})); +is (system("./ikiwiki-makerepo git $config{srcdir} $dir/repo"), 0); my @changes; @changes = IkiWiki::rcs_recentchanges(3); is($#changes, 0); # counts for dummy commit during repo creation -is($changes[0]{message}[0]{"line"}, "Initial"); -is($changes[0]{pages}[0]{"page"}, "dummy"); +# ikiwiki-makerepo's first commit is setting up the .gitignore +is($changes[0]{message}[0]{"line"}, "initial commit"); +is($changes[0]{pages}[0]{"page"}, ".gitignore"); # Web commit my $test1 = readfile("t/test1.mdwn"); -- cgit v1.2.3 From f7fa6966195a3a4cc392aea56b307c939d28ffc7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 4 Apr 2009 17:49:04 -0400 Subject: move comments to copyright and changelog --- IkiWiki/Plugin/darcs.pm | 38 -------------------------------------- debian/changelog | 13 +++++++++++++ debian/copyright | 10 ++++++++++ 3 files changed, 23 insertions(+), 38 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm index 978457b2c..dfd193b9c 100644 --- a/IkiWiki/Plugin/darcs.pm +++ b/IkiWiki/Plugin/darcs.pm @@ -1,42 +1,4 @@ #!/usr/bin/perl -# Support for the darcs rcs, . -# Copyright (C) 2006 Thomas Schwinge -# 2007 Benjamin A'Lee -# Tuomo Valkonen -# 2008 Simon Michael -# Petr Ročkai -# Sven M. Hallberg -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# History (see http://ikiwiki.info/todo/darcs/): -# -# * Thomas Schwinge wrote the original file, implementing only rcs_commit. -# * Benjamin A'Lee contributed an alternative implementation. -# * Tuomo Valkonen contributed rcs_getctime and stub rcs_recentchanges. -# * Simon Michael contributed multiple changes. -# * Petr Ročkai fixed rcs_recentchanges and added caching to rcs_getctime. -# * Sven M. Hallberg merged the above and added missing features. - - -# We're guaranteed to be the only instance of ikiwiki running at a given -# time. It is essential that only ikiwiki is working on a particular -# repository. That means one instance of ikiwiki and it also means that -# you must not 'darcs push' into this repository, as this might create -# race conditions, as I understand it. - package IkiWiki::Plugin::darcs; use warnings; diff --git a/debian/changelog b/debian/changelog index fab20985d..2b1f938b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +ikiwiki (3.10) UNRELEASED; urgency=low + + * darcs: Finally added support for this VCS, thanks to many + contributors: + - Thomas Schwinge wrote the original file, implementing only rcs_commit. + - Benjamin A'Lee contributed an alternative implementation. + - Tuomo Valkonen contributed rcs_getctime and stub rcs_recentchanges. + - Simon Michael contributed multiple changes. + - Petr Ročkai fixed rcs_recentchanges. + - Sven M. Hallberg merged the above and added missing features. + + -- Joey Hess Sat, 04 Apr 2009 17:47:36 -0400 + ikiwiki (3.09) unstable; urgency=low * inline: Add title_natural sort order, using Sort::Naturally diff --git a/debian/copyright b/debian/copyright index 67f0ac540..5fc55f5c5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -32,6 +32,16 @@ Files: tla.pm Copyright: © 2006 Clint Adams License: GPL-2+ +Files: darcs.pm +Copyright: + © 2006 Thomas Schwinge + 2007 Benjamin A'Lee + Tuomo Valkonen + 2008 Simon Michael + Petr Ročkai + Sven M. Hallberg +License: GPL-2+ + Files: teximg.pm Copyright: © 2007 Patrick Winnertz License: GPL-2+ -- cgit v1.2.3 From 3fb4653d8a0824fb182da0346a7a80b282564cd5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 4 Apr 2009 18:25:52 -0400 Subject: Add missing newline to Confirm Password prompt. --- IkiWiki/Setup/Automator.pm | 1 + debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index 7d9eca3af..c194d34be 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -117,6 +117,7 @@ sub import (@) { for (;;) { print "Choose a password: "; chomp($password=); + print "\n"; print "Confirm password: "; chomp($password2=); diff --git a/debian/changelog b/debian/changelog index fab20985d..781024146 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.10) UNRELEASED; urgency=low + + * Add missing newline to Confirm Password prompt. + + -- Joey Hess Sat, 04 Apr 2009 18:25:33 -0400 + ikiwiki (3.09) unstable; urgency=low * inline: Add title_natural sort order, using Sort::Naturally -- cgit v1.2.3 From 98ae0fb92ccfcc877eadd0a941beaa9c462d6cd1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Apr 2009 18:02:03 -0400 Subject: Add missing permalink support to archivepage and titlepage templates. --- debian/changelog | 1 + templates/archivepage.tmpl | 4 ++++ templates/titlepage.tmpl | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bbc7e6f13..d9dcc95e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ ikiwiki (3.10) UNRELEASED; urgency=low - Petr Ročkai fixed rcs_recentchanges. - Sven M. Hallberg merged the above and added missing features. * Add missing newline to Confirm Password prompt. + * Add missing permalink support to archivepage and titlepage templates. -- Joey Hess Sat, 04 Apr 2009 17:47:36 -0400 diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl index 6bc789dfb..63f716544 100644 --- a/templates/archivepage.tmpl +++ b/templates/archivepage.tmpl @@ -1,5 +1,9 @@

+ + +
+ Posted diff --git a/templates/titlepage.tmpl b/templates/titlepage.tmpl index f5cd5bc53..8a11e693e 100644 --- a/templates/titlepage.tmpl +++ b/templates/titlepage.tmpl @@ -1 +1,7 @@ -

+

+ + + + + +

-- cgit v1.2.3 From a6d3bad29dd1848dc5a55be730db463f8577e7e4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Apr 2009 21:26:54 -0400 Subject: debian/control: Wrap fields. --- debian/changelog | 1 + debian/control | 29 +++++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d9dcc95e6..a82369f9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.10) UNRELEASED; urgency=low - Sven M. Hallberg merged the above and added missing features. * Add missing newline to Confirm Password prompt. * Add missing permalink support to archivepage and titlepage templates. + * debian/control: Wrap fields. -- Joey Hess Sat, 04 Apr 2009 17:47:36 -0400 diff --git a/debian/control b/debian/control index a0769cbce..a00fd72cc 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,11 @@ Source: ikiwiki Section: web Priority: optional Build-Depends: perl, debhelper (>= 7.0.50) -Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick +Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, + libtext-markdown-perl | markdown, + libtimedate-perl, libhtml-template-perl, + libhtml-scrubber-perl, wdg-html-validator, + libhtml-parser-perl, liburi-perl, perlmagick Maintainer: Joey Hess Uploaders: Josh Triplett Standards-Version: 3.8.0 @@ -12,9 +16,26 @@ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki Package: ikiwiki Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl -Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl -Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl, libtext-textile-perl +Depends: ${misc:Depends}, ${perl:Depends}, + libtext-markdown-perl | markdown, + libhtml-scrubber-perl, libhtml-template-perl, + libhtml-parser-perl, liburi-perl +Recommends: gcc | c-compiler, + libc6-dev | libc-dev, + subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), + libxml-simple-perl, libnet-openid-consumer-perl, + liblwpx-paranoidagent-perl, libtimedate-perl, + libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), + libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl +Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, + xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, + python, python-docutils, polygen, tidy, libhtml-tree-perl, + libxml-feed-perl, libmailtools-perl, perlmagick, + libfile-mimeinfo-perl, libcrypt-ssleay-perl, + liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, + libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, + sparkline-php, texlive, dvipng, libtext-wikicreole-perl, + libsort-naturally-perl, libtext-textile-perl Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table Provides: ikiwiki-plugin-table -- cgit v1.2.3 From a25d8f992bc3e39cf39954475f31b83dabbf2374 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Apr 2009 21:44:37 -0400 Subject: inline: Add author info to archive display. This won't change it normally, and is useful if using archive format to display some aggregated feed titles. --- debian/changelog | 1 + templates/archivepage.tmpl | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a82369f9f..b7779600e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ ikiwiki (3.10) UNRELEASED; urgency=low * Add missing newline to Confirm Password prompt. * Add missing permalink support to archivepage and titlepage templates. * debian/control: Wrap fields. + * inline: Add author info to archive display. -- Joey Hess Sat, 04 Apr 2009 17:47:36 -0400 diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl index fe1f0ab92..28800e763 100644 --- a/templates/archivepage.tmpl +++ b/templates/archivepage.tmpl @@ -6,6 +6,14 @@ Posted + +by + + + + + + + -

-- cgit v1.2.3 From b6eccfd3d38c95773bdfc8fdf1ecbc32094f353e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Apr 2009 12:40:15 -0400 Subject: Add a microblog template that is useful for inlining microblogging posts. --- debian/changelog | 1 + doc/ikiwiki/directive/inline.mdwn | 3 ++- doc/style.css | 6 ++++-- doc/tips/add_chatterbox_to_blog.mdwn | 6 ++---- doc/wikitemplates.mdwn | 1 + templates/microblog.tmpl | 22 ++++++++++++++++++++++ 6 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 templates/microblog.tmpl (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b7779600e..51b5121fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ ikiwiki (3.10) UNRELEASED; urgency=low * Add missing permalink support to archivepage and titlepage templates. * debian/control: Wrap fields. * inline: Add author info to archive display. + * Add a microblog template that is useful for inlining microblogging posts. -- Joey Hess Sat, 04 Apr 2009 17:47:36 -0400 diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn index f69d55de3..8afd65a05 100644 --- a/doc/ikiwiki/directive/inline.mdwn +++ b/doc/ikiwiki/directive/inline.mdwn @@ -79,7 +79,8 @@ Here are some less often needed parameters: page. By default the `inlinepage` template is used, while the `archivepage` template is used for archives. Set this parameter to use some other, custom template, such as the `titlepage` template that - only shows post titles. Note that you should still set `archive=yes` if + only shows post titles or the `microblog` template, optimised for + microblogging. Note that you should still set `archive=yes` if your custom template does not include the page content. * `raw` - Rather than the default behavior of creating a blog, if raw is set to "yes", the page will be included raw, without additional diff --git a/doc/style.css b/doc/style.css index 98a28f347..74d968ddf 100644 --- a/doc/style.css +++ b/doc/style.css @@ -373,11 +373,13 @@ span.color { padding: 2px; } -.comment-header { +.comment-header, +.microblog-header { font-style: italic; margin-top: .3em; } -.comment .author { +.comment .author, +.microblog .author { font-weight: bold; } .comment-subject { diff --git a/doc/tips/add_chatterbox_to_blog.mdwn b/doc/tips/add_chatterbox_to_blog.mdwn index ee5ead64b..3497da9ff 100644 --- a/doc/tips/add_chatterbox_to_blog.mdwn +++ b/doc/tips/add_chatterbox_to_blog.mdwn @@ -11,10 +11,8 @@ from there, like I have on [my blog](http://kitenet.net/~joey/blog/) \[[!template id=note text=""" \[[!aggregate expirecount=5 name="dents" url="http://identi.ca/joeyh" feedurl="http://identi.ca/api/statuses/user_timeline/joeyh.atom"]] - \[[!inline pages="internal(dents/*)" archive=yes show=5 feeds=no]] + \[[!inline pages="internal(dents/*)" template=microblog + show=5 feeds=no]] """]] -For a cleaner look without the post dates, add `template=titlepage` -to the `inline` directive. - Note: Works best with ikiwiki 3.10 or better. diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn index fc5893677..f365cd5aa 100644 --- a/doc/wikitemplates.mdwn +++ b/doc/wikitemplates.mdwn @@ -21,6 +21,7 @@ located in /usr/share/ikiwiki/templates by default. * `inlinepage.tmpl` - Used for adding a page inline in a blog page. * `archivepage.tmpl` - Used for listing a page in a blog archive page. +* `microblog.tmpl` - Used for showing a microblogging post inline. * `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links) * `feedlink.tmpl` - Used to add rss/atom links if blogpost.tmpl is not used. * `aggregatepost.tmpl` - Used by the [[plugins/aggregate]] plugin to create diff --git a/templates/microblog.tmpl b/templates/microblog.tmpl new file mode 100644 index 000000000..2e84441cc --- /dev/null +++ b/templates/microblog.tmpl @@ -0,0 +1,22 @@ +
+ +
+ +
+ +
+ + + + + + + + + + + +— + +
+
-- cgit v1.2.3 From e88a110d6204658e58efcccac363937ef67f4b3b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Apr 2009 22:51:25 -0400 Subject: releasing version 3.10 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 51b5121fb..4bbeac1d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.10) UNRELEASED; urgency=low +ikiwiki (3.10) unstable; urgency=low * darcs: Finally added support for this VCS, thanks to many contributors: @@ -14,7 +14,7 @@ ikiwiki (3.10) UNRELEASED; urgency=low * inline: Add author info to archive display. * Add a microblog template that is useful for inlining microblogging posts. - -- Joey Hess Sat, 04 Apr 2009 17:47:36 -0400 + -- Joey Hess Sat, 18 Apr 2009 19:40:25 -0400 ikiwiki (3.09) unstable; urgency=low -- cgit v1.2.3