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. --- templates/archivepage.tmpl | 4 ++++ templates/titlepage.tmpl | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'templates') 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 ba46ec5d1eadc7a0d992e28201538067ab969899 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Apr 2009 18:22:58 -0400 Subject: fix format --- templates/archivepage.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl index 63f716544..fe1f0ab92 100644 --- a/templates/archivepage.tmpl +++ b/templates/archivepage.tmpl @@ -1,6 +1,6 @@

- +

 -- 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 'templates') 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 'templates') 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