aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-04 00:47:28 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-04 00:47:28 +0000
commit819b31d46c05c00d4183f824f74bfe3836471d78 (patch)
treeb309d4683352a64c339bb572505635ba154000e8
parentc5919df5f3697e0f8968e2b8f49cd15c1e0aa412 (diff)
downloadikiwiki-819b31d46c05c00d4183f824f74bfe3836471d78.tar
ikiwiki-819b31d46c05c00d4183f824f74bfe3836471d78.tar.gz
* Various CSS and formatting changes.
-rw-r--r--IkiWiki/Plugin/meta.pm6
-rw-r--r--basewiki/style.css8
-rw-r--r--debian/changelog1
-rw-r--r--templates/aggregatepost.tmpl2
-rw-r--r--templates/inlinepage.tmpl17
5 files changed, 28 insertions, 6 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index b6226ed88..adfd688a6 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -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");
} # }}}
diff --git a/basewiki/style.css b/basewiki/style.css
index ebc912553..3f8547e95 100644
--- a/basewiki/style.css
+++ b/basewiki/style.css
@@ -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. */
diff --git a/debian/changelog b/debian/changelog
index aca30fc81..2cd304a33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl
index 50c09fff8..046be4804 100644
--- a/templates/aggregatepost.tmpl
+++ b/templates/aggregatepost.tmpl
@@ -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>>"]]
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 6840f3681..f8f5b2e20 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -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>