* Various CSS and formatting changes.

master
joey 2006-08-04 00:47:28 +00:00
parent c5919df5f3
commit 819b31d46c
5 changed files with 28 additions and 6 deletions

View File

@ -10,6 +10,7 @@ my %meta;
my %title;
my %permalink;
my %author;
my %authorurl;
sub import { #{{{
IkiWiki::hook(type => "preprocess", id => "meta",
@ -68,6 +69,9 @@ sub preprocess (@) { #{{{
if ($key eq 'author') {
$author{$page}=$value;
}
elsif ($key eq 'authorurl') {
$authorurl{$page}=$value;
}
}
return "";
@ -86,6 +90,8 @@ sub pagetemplate (@) { #{{{
if exists $permalink{$page} && $template->query(name => "permalink");
$template->param(author => $author{$page})
if exists $author{$page} && $template->query(name => "author");
$template->param(authorurl => $authorurl{$page})
if exists $authorurl{$page} && $template->query(name => "authorurl");
} # }}}

View File

@ -5,6 +5,13 @@
line-height: 1em;
}
.author {
margin: 0;
font-size: 18px;
font-weight: bold;
display: block;
}
#actions ul {
margin: 0;
padding: 6px;
@ -76,6 +83,7 @@ td.changelog {
.pageinfo {
font-style: italic;
display: block;
}
/* Used for invalid form fields. */

1
debian/changelog vendored
View File

@ -10,6 +10,7 @@ ikiwiki (1.16) UNRELEASED; urgency=low
* Change titlepage() to encode utf-8 alnum characters. This is necessary
to avoid UTF-8 creeping into filenames in urls. (There are still
some other ways that it can get in.)
* Various CSS and formatting changes.
-- Joey Hess <joeyh@debian.org> Thu, 3 Aug 2006 18:45:36 -0400

View File

@ -1,5 +1,4 @@
<TMPL_VAR CONTENT>
<br/>
<TMPL_LOOP NAME="TAGS">
[[tag <TMPL_VAR TAG>]]
</TMPL_LOOP>
@ -10,3 +9,4 @@
[[meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]]
</TMPL_IF>
[[meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]]
[[meta authorurl="<TMPL_VAR NAME="URL" ESCAPE=HTML>>"]]

View File

@ -1,13 +1,20 @@
<div class="inlinepage">
<span class="header"><a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a></span>
<TMPL_IF NAME="AUTHOR">
<span class="author">
<TMPL_IF NAME="AUTHORURL">
<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
<TMPL_ELSE>
<TMPL_VAR NAME=AUTHOR>
</TMPL_IF>
</span>
</TMPL_IF>
<span class="header">
<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
</span>
<TMPL_VAR CONTENT>
<span class="pageinfo">
Posted <TMPL_VAR CTIME>
<TMPL_IF NAME="AUTHOR">
by <TMPL_VAR NAME=AUTHOR>
</TMPL_IF>
<TMPL_IF NAME="PERMALINK">
(<a href="<TMPL_VAR NAME=PERMALINK>">permalink</a>)
</TMPL_IF>