diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-02-08 03:46:35 +0100 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-02-08 03:46:35 +0100 |
commit | 509b5e775030896799a02201a3c84ba501744df6 (patch) | |
tree | d72c0d4a5fb72407261372e7aebed9fb699a9ec6 | |
parent | 6e5ed5af1550aad66d10ea645ff21755bb74c018 (diff) |
Sync with ikiwiki 2.30.
-rw-r--r-- | ikiwiki/pagespec.mdwn | 9 | ||||
-rw-r--r-- | recentchanges.mdwn | 5 | ||||
-rw-r--r-- | shortcuts.mdwn | 6 | ||||
-rw-r--r-- | style.css | 48 |
4 files changed, 50 insertions, 18 deletions
diff --git a/ikiwiki/pagespec.mdwn b/ikiwiki/pagespec.mdwn index 5c6433e..3cd6bb9 100644 --- a/ikiwiki/pagespec.mdwn +++ b/ikiwiki/pagespec.mdwn @@ -33,8 +33,13 @@ functions: was created * "`created_before(page)`" - match only pages created before the given page was created -* "`user(name)`" - only available in page subscription preferences, match - only changes made by this user +* "`glob(someglob)`" - match pages that match the given glob. Just writing + the glob by itself is actually a shorthand for this function. +* "`internal(glob)`" - like `glob()`, but matches even internal-use + pages that globs do not usually match. +* "`title(glob)`", "`author(glob)`", "`authorurl(glob)`", + "`license(glob)`", "`copyright(glob)`" - match pages that have the given + metadata, matching the specified glob. For example, to match all pages in a blog that link to the page about music and were written in 2005: diff --git a/recentchanges.mdwn b/recentchanges.mdwn new file mode 100644 index 0000000..f832981 --- /dev/null +++ b/recentchanges.mdwn @@ -0,0 +1,5 @@ +[[meta title="RecentChanges"]] +Recent changes to this wiki: + +[[inline pages="internal(recentchanges/change_*) and !*/Discussion" +template=recentchanges show=0]] diff --git a/shortcuts.mdwn b/shortcuts.mdwn index 105c8e0..62e0661 100644 --- a/shortcuts.mdwn +++ b/shortcuts.mdwn @@ -65,6 +65,6 @@ Remember that the `name` you give the shortcut will become a new with an existing directive. If you come up with a shortcut that you think others might find useful, -consider contributing it to the [[iki shortcuts]] page on the ikiwiki -ikiwiki, so that future versions of ikiwiki will include your shortcut -in the standard underlay. +consider contributing it to the [shortcuts page on the ikiwiki +ikiwiki](http://ikiwiki.info/shortcuts/), so that future versions of +ikiwiki will include your shortcut in the standard underlay. @@ -70,27 +70,49 @@ img { border-style: none; } -/* Stuff for the RecentChanges table. */ -tr.changeheader { +div.recentchanges { + border-style: solid; + border-width: 1px; + overflow: auto; + width: 100%; background: #eee; color: black !important; } -tr.changeinfo { - background: #eee; +.recentchanges .metadata { + padding: 0px 0.5em; +} +.recentchanges .changelog { + font-style: italic; + clear: both; + display: block; + padding: 1px 2px; + background: white !important; color: black !important; } -th.changeheader { - padding: 1px .3em; +.recentchanges .desc { + display: none; +} +.recentchanges .committer { + float: left; + margin: 0; + width: 40%; } -td.changeinfo { - padding: 1px .3em; +.recentchanges .committype { + float: left; + margin: 0; + width: 5%; + font-size: small; } -td.changetime { - white-space: nowrap; - padding: 1px .3em; +.recentchanges .changedate { + float: left; + margin: 0; + width: 35%; + font-size: small; } -td.changelog { - font-style: italic; +.recentchanges .pagelinks { + float: right; + margin: 0; + width: 60%; } /* Used for adding a blog page. */ |