summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-03-30 14:24:37 +0200
committerJonas Smedegaard <dr@jones.dk>2012-03-30 14:24:37 +0200
commit326787e9f82b5c095932e07f128dd2db686b54d3 (patch)
treed72b44c76ff9771126fe961e2e01da4e630d5575
parent400f837c143e03ab7b183fb26070d0b72fbc23d7 (diff)
parent83b920b5bfb014a7ea14fce9d9757902f7771d28 (diff)
Merge branch 'ikiwiki'
-rw-r--r--sandbox.mdwn2
-rw-r--r--shortcuts.mdwn8
-rw-r--r--style.css35
-rw-r--r--templates.mdwn2
4 files changed, 44 insertions, 3 deletions
diff --git a/sandbox.mdwn b/sandbox.mdwn
index c66534f..e76bdb8 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -30,3 +30,5 @@ Bulleted list
* item
[[ikiwiki/WikiLink]]
+
+[[!calendar type="month" pages="blog/*"]]
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 07210f9..722c6b1 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -15,7 +15,7 @@ This page controls what shortcut links the wiki supports.
* [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
* [[!shortcut name=gmap url="https://maps.google.com/maps?q=%s"]]
* [[!shortcut name=gmsg url="https://groups.google.com/groups?selm=%s"]]
-* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%s"]]
+* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%W"]]
* [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]]
* [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]]
* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
@@ -69,8 +69,10 @@ This page controls what shortcut links the wiki supports.
To add a new shortcut, use the `shortcut`
[[ikiwiki/directive]]. In the url, "%s" is replaced with the
text passed to the named shortcut, after [[!wikipedia url_encoding]]
-it, and '%S' is replaced with the raw, non-encoded text. The optional
-`desc` parameter controls the description of the link.
+it, and '%S' is replaced with the raw, non-encoded text.
+Additionally, `%W` is replaced with the text encoded just right for
+Wikipedia. The optional `desc` parameter controls the description of
+the link.
Remember that the `name` you give the shortcut will become a new
[[ikiwiki/directive]]. Avoid using a `name` that conflicts
diff --git a/style.css b/style.css
index 7bbfe5d..35a1331 100644
--- a/style.css
+++ b/style.css
@@ -501,3 +501,38 @@ a.openid_large_btn:focus {
.fileupload-content .ui-progressbar-value {
background: url(ikiwiki/images/pbar-ani.gif);
}
+
+.trail {
+ display: block;
+ clear: both;
+ position: relative;
+}
+
+.trailprev {
+ display: block;
+ text-align: left;
+ position: absolute;
+ top: 0%;
+ left: 3%;
+ width: 30%;
+}
+
+.trailup {
+ display: block;
+ text-align: center;
+ margin-left: 35%;
+ margin-right: 35%;
+}
+
+.trailnext {
+ display: block;
+ text-align: right;
+ position: absolute;
+ top: 0%;
+ width: 30%;
+ right: 3%;
+}
+
+.trailsep {
+ display: none;
+}
diff --git a/templates.mdwn b/templates.mdwn
index d189fa0..43bf9ee 100644
--- a/templates.mdwn
+++ b/templates.mdwn
@@ -80,6 +80,8 @@ Here is a full list of the template files used:
* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.
* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to
make calendar archive pages.
+* `trails.tmpl` - Used by the trail plugin to generate links on each page
+ that is a member of a trail.
* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
`editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
`editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,