From: Simon McVittie
Date: Sun, 13 Jul 2008 14:32:40 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/31bc223abbe0ec1990921b4bab85f074431b0c1d?hp=2d6263b9917c1d7e5f3e675aaf7dd04d8f11365f
Merge branch 'master' of git://git.ikiwiki.info
---
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index b5354a823..4fbcde390 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -30,7 +30,10 @@ sub getopt () { #{{{
eval q{use Getopt::Long};
error($@) if $@;
Getopt::Long::Configure('pass_through');
- GetOptions("aggregate" => \$config{aggregate});
+ GetOptions(
+ "aggregate" => \$config{aggregate},
+ "aggregateinternal!" => \$config{aggregateinternal},
+ );
} #}}}
sub checkconfig () { #{{{
@@ -595,7 +598,7 @@ sub pagefile ($) { #{{{
} #}}}
sub htmlfn ($) { #{{{
- return shift().".".$config{htmlext};
+ return shift().".".($config{aggregateinternal} ? "_" : "").$config{htmlext};
} #}}}
my $aggregatelock;
diff --git a/doc/style.css b/doc/style.css
index 246da1ffc..0e3bfb3e6 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -35,12 +35,14 @@
padding: .2em .4em;
}
-.tags {
+.pagefooter {
clear: both;
}
+.tags {
+}
+
#pageinfo {
- clear: both;
margin: 1em 0;
border-top: 1px solid #000;
}
@@ -140,7 +142,6 @@ div.recentchanges {
.pagedate,
.pagelicense,
.pagecopyright {
- clear: both;
font-style: italic;
display: block;
margin-top: 1em;
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 71d57b008..ffcb897a8 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -1,4 +1,7 @@
-
+
+
+
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 166f3c560..d39c9aa2a 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -17,6 +17,7 @@
+
-
-
+
-
+