Add a microblog template that is useful for inlining microblogging posts.

diff --git a/debian/changelog b/debian/changelog
index b7779600e76ed8739b2e77bcb736cc5d7490b1ff..51b5121fb093bbb3348e830932dfdbfd21815d9f 100644 (file)
--- 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 <joeyh@debian.org>  Sat, 04 Apr 2009 17:47:36 -0400
 

diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn
index f69d55de3dc6582bcc1dec6378813ea1774af85e..8afd65a05e84541fbb13e69a9b870c79579e8d73 100644 (file)
--- 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 98a28f34769d34d43feb2a8d73f37fddd10442be..74d968ddf3cb61c5a86e2b13d31da0f87495d0f2 100644 (file)
--- 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 ee5ead64b40cf9915b022b302c6946b16b0418b4..3497da9ff04e6dde73734c108123e00abbe7aaa3 100644 (file)
--- 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 fc589367741078aa1c615da73ac782e23293d82a..f365cd5aaa373751bb14448882ef3d320a32036c 100644 (file)
--- 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 (file)
index 0000000..2e84441
--- /dev/null
+++ b/templates/microblog.tmpl
@@ -0,0 +1,22 @@
+<div class="microblog">
+
+<div class="inlinecontent">
+<TMPL_VAR CONTENT>
+</div>
+
+<div class="microblog-header">
+
+<TMPL_IF NAME="AUTHOR">
+<span class="author">
+<TMPL_IF NAME="AUTHORURL">
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+
+&mdash; <TMPL_VAR CTIME>
+
+</div> <!--.microblog-header-->
+</div> <!--.microblog-->