diff options
| -rw-r--r-- | .topmsg | 4 | ||||
| -rw-r--r-- | ikiwiki/directive.mdwn | 17 | ||||
| -rw-r--r-- | ikiwiki/pagespec.mdwn | 4 | ||||
| -rw-r--r-- | ikiwiki/pagespec/sorting.mdwn | 6 | ||||
| -rw-r--r-- | shortcuts.mdwn | 46 | ||||
| -rw-r--r-- | style.css | 71 | ||||
| -rw-r--r-- | templates.mdwn | 48 | ||||
| -rw-r--r-- | wikiicons/revert.png | bin | 0 -> 397 bytes |
8 files changed, 147 insertions, 49 deletions
@@ -1,6 +1,6 @@ From: Jonas Smedegaard <dr@jones.dk> -Subject: [PATCH] typos +Subject: [PATCH] master -Typos. +virtual copy of origin branch ikiwiki. Signed-off-by: Jonas Smedegaard <dr@jones.dk> diff --git a/ikiwiki/directive.mdwn b/ikiwiki/directive.mdwn index fb88aa7..1dc1e51 100644 --- a/ikiwiki/directive.mdwn +++ b/ikiwiki/directive.mdwn @@ -20,13 +20,26 @@ wrapped to multiple lines if you like: Also, multiple lines of *quoted* text can be used for a value. To allow quote marks inside the quoted text, delimit the block -of text with triple-quotes: +of text with triple-double-quotes or triple-single-quotes: \[[!directive text=""" 1. "foo" 2. "bar" 3. "baz" - """]] + """ othertext=''' + 1. 'quux' + 2. "foo" + ''']] + +If you want to put text with triple quotes into a parameter value, you can +use perl-style here-doc syntax, even nesting it like this: + + \[[!directive text=<<OUTER + [[!otherdirective <<INNER + inner text + INNER]] + outer text + OUTER]] ikiwiki also has an older syntax for directives, which requires a space in directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This diff --git a/ikiwiki/pagespec.mdwn b/ikiwiki/pagespec.mdwn index 6aec561..0f298ad 100644 --- a/ikiwiki/pagespec.mdwn +++ b/ikiwiki/pagespec.mdwn @@ -32,6 +32,7 @@ Some more elaborate limits can be added to what matches using these functions: tags matched by a glob) * "`backlink(page)`" - matches only pages that a given page links to * "`creation_month(month)`" - matches only files created on the given month + number * "`creation_day(mday)`" - or day of the month * "`creation_year(year)`" - or year * "`created_after(page)`" - matches only files created after the given page @@ -50,7 +51,8 @@ Some more elaborate limits can be added to what matches using these functions: * "`admin()`" - tests whether a modification is being made by one of the wiki admins. * "`ip(address)`" - tests whether a modification is being made from the - specified IP address. + specified IP address. Glob patterns can be used in the address. For + example, `ip(127.0.0.*)` * "`comment(glob)`" - matches comments to a page matching the glob. * "`comment_pending(glob)`" - matches unmoderated, pending comments. * "`postcomment(glob)`" - matches only when comments are being diff --git a/ikiwiki/pagespec/sorting.mdwn b/ikiwiki/pagespec/sorting.mdwn index ccd7f7e..0c6cc74 100644 --- a/ikiwiki/pagespec/sorting.mdwn +++ b/ikiwiki/pagespec/sorting.mdwn @@ -7,10 +7,14 @@ orders can be specified. * `mtime` - List pages with the most recently modified first. -* `title` - Order by title (page name). +* `title` - Order by title (page name), e.g. "z/a a/b a/c" + +* `path` - Order by page name including parents, e.g. "a/b a/c z/a" [[!if test="enabled(sortnaturally)" then=""" * `title_natural` - Orders by title, but numbers in the title are treated as such, ("1 2 9 10 20" instead of "1 10 2 20 9") + +* `path_natural` - Like `path`, but numbers in the title are treated as such """]] [[!if test="enabled(meta)" then=""" * `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]` diff --git a/shortcuts.mdwn b/shortcuts.mdwn index cafe3f5..b4f6d8e 100644 --- a/shortcuts.mdwn +++ b/shortcuts.mdwn @@ -7,33 +7,33 @@ Some examples of using shortcuts include: \[[!google foo]] \[[!wikipedia War_of_1812]] \[[!debbug 12345]] - Check the \[[!cia ikiwiki desc="CIA page for %s"]]. + Check the \[[!google ikiwiki desc="google search for %s"]]. This page controls what shortcut links the wiki supports. * [[!shortcut name=google url="https://encrypted.google.com/search?q=%s"]] * [[!shortcut name=archive url="http://web.archive.org/*/%S"]] -* [[!shortcut name=gmap url="http://maps.google.com/maps?q=%s"]] -* [[!shortcut name=gmsg url="http://groups.google.com/groups?selm=%s"]] -* [[!shortcut name=wikipedia url="https://secure.wikimedia.org/wikipedia/en/wiki/%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/%W"]] * [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]] -* [[!shortcut name=wiktionary url="https://secure.wikimedia.org/wiktionary/en/wiki/%s"]] +* [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]] * [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]] -* [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]] +* [[!shortcut name=deblist url="https://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]] * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]] * [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]] * [[!shortcut name=debpts url="http://packages.qa.debian.org/%s"]] -* [[!shortcut name=debmsg url="http://lists.debian.org/msgid-search/%s"]] +* [[!shortcut name=debmsg url="https://lists.debian.org/msgid-search/%s"]] * [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]] -* [[!shortcut name=debss url="http://snapshot.debian.net/package/%s"]] - * Usage: `\[[!debss package]]`, `\[[!debss package#version]]`, or `\[[!debss package/version]]`. See http://snapshot.debian.net for details. -* [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]] +* [[!shortcut name=debss url="http://snapshot.debian.org/package/%s/"]] + * Usage: `\[[!debss package]]` or `\[[!debss package/version]]`. See <http://snapshot.debian.org/> for details. +* [[!shortcut name=debwiki url="https://wiki.debian.org/%s"]] * [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]] * [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]] -* [[!shortcut name=gnomebug url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]] -* [[!shortcut name=linuxbug url="http://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]] +* [[!shortcut name=gnomebug url="https://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]] +* [[!shortcut name=linuxbug url="https://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]] * [[!shortcut name=mozbug url="https://bugzilla.mozilla.org/show_bug.cgi?id=%s" desc="Mozilla bug #%s"]] -* [[!shortcut name=gnulist url="http://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]] +* [[!shortcut name=gnulist url="https://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]] * [[!shortcut name=marcmsg url="http://marc.info/?i=%s"]] * [[!shortcut name=marclist url="http://marc.info/?l=%s"]] * [[!shortcut name=gmane url="http://dir.gmane.org/gmane.%s" desc="gmane.%s"]] @@ -43,7 +43,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=hoogle url="http://haskell.org/hoogle/?q=%s"]] * [[!shortcut name=iki url="http://ikiwiki.info/%S/"]] * [[!shortcut name=ljuser url="http://%s.livejournal.com/"]] -* [[!shortcut name=rfc url="http://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]] +* [[!shortcut name=rfc url="https://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]] * [[!shortcut name=c2 url="http://c2.com/cgi/wiki?%s"]] * [[!shortcut name=meatballwiki url="http://www.usemod.com/cgi-bin/mb.pl?%s"]] * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]] @@ -53,20 +53,24 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]] * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]] * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]] -* [[!shortcut name=cve url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]] -* [[!shortcut name=cia url="http://cia.vc/stats/project/%s"]] -* [[!shortcut name=ciauser url="http://cia.vc/stats/user/%s"]] -* [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]] +* [[!shortcut name=cve url="https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]] +* [[!shortcut name=flickr url="https://secure.flickr.com/photos/%s"]] * [[!shortcut name=man url="http://linux.die.net/man/%s"]] -* [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]] +* [[!shortcut name=ohloh url="https://www.ohloh.net/p/%s"]] * [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]] * [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]] +* [[!shortcut name=ubupkg url="http://packages.ubuntu.com/%s"]] +* [[!shortcut name=mozillazinekb url="http://kb.mozillazine.org/%s"]] +* [[!shortcut name=freebsdwiki url="http://wiki.freebsd.org/%s"]] +* [[!shortcut name=hackage url="http://hackage.haskell.org/package/%s"]] 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 @@ -58,7 +58,8 @@ nav { border-bottom: 1px solid #000; } -.inlinecontent { +.inlinecontent, +.inlineenclosure { margin-top: .4em; } @@ -172,13 +173,14 @@ div.recentchanges { width: 35%; font-size: small; } -.recentchanges .pagelinks { +.recentchanges .pagelinks, +.recentchanges .revert { float: right; margin: 0; width: 60%; } -#blogform { +.blogform, #blogform { padding: 10px 10px; border: 1px solid #aaa; background: #eee; @@ -201,6 +203,13 @@ div.recentchanges { margin-top: 1em; } +.archivepagedate { + font-style: italic; +} +.archivepage { + margin-bottom: 1em; +} + .error { color: #C00; } @@ -246,6 +255,9 @@ span.color { .comment-subject { font-weight: bold; } +.comment-avatar { + float: right; +} .comment { border: 1px solid #aaa; padding: 3px; @@ -271,9 +283,10 @@ div.progress-done { @media print { .actions { display: none; } .tags { display: none; } + .trails { display: none; } .feedbutton { display: none; } #searchform { display: none; } - #blogform { display: none; } + .blogform, #blogform { display: none; } #backlinks { display: none; } } @@ -311,6 +324,7 @@ div.progress-done { .popup .paren, .popup .expand { display: none; + text-align: left; } .popup:hover .balloon, .popup:focus .balloon { @@ -484,8 +498,55 @@ a.openid_large_btn:focus { outline: none; } a.openid_large_btn:focus { - -moz-outline-style: none; + outline-style: none; } .openid_selected { border: 4px solid #DDD; } + +.fileupload-content .ui-progressbar { + width: 200px; + height: 20px; +} +.fileupload-content .ui-progressbar-value { + background: url(ikiwiki/images/pbar-ani.gif); +} + +.trails { + margin-top: 1em; + margin-bottom: 1em; +} +.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 bfb6a43..d0f891c 100644 --- a/templates.mdwn +++ b/templates.mdwn @@ -1,10 +1,5 @@ [[Ikiwiki]] uses many templates for many purposes. By editing its templates, -you can fully customise this site. - -Templates are located in `/usr/share/ikiwiki/templates` by default; -the `templatedir` setting can be used to make another directory be -searched first. Customised templates can also be placed inside the -"templates/" directory in your wiki's source. +you can fully customise its appearance, and avoid duplicate content. Ikiwiki uses the HTML::Template module as its template engine. This supports things like conditionals and loops in templates and is pretty @@ -16,17 +11,19 @@ easy to learn. All you really need to know to modify templates is this: * To use one block of text if a variable is set and a second if it's not, use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>` -[[!if test="enabled(template)" then=""" +[[!if test="enabled(template) or enabled(edittemplate)" then=""" ## template pages +Template pages are regular wiki pages that are used as templates for other +pages. +"""]] + +[[!if test="enabled(template)" then=""" The [[!iki ikiwiki/directive/template desc="template directive"]] allows -wiki pages to be used as templates, filled out and inserted into other -pages in the wiki. +template pages to be filled out and inserted into other pages in the wiki. """]] [[!if test="enabled(edittemplate)" then=""" -## default content for new pages - The [[!iki ikiwiki/directive/edittemplate desc="edittemplate directive"]] can be used to make new pages default to containing text from a template page, which can be filled out as the page is edited. @@ -34,18 +31,30 @@ page, which can be filled out as the page is edited. [[!if test="(enabled(template) or enabled(edittemplate)) and enabled(inline)" then=""" +These template pages are currently available: + [[!inline pages="templates/* and !*.tmpl and !templates/*/* and !*/discussion" feeds=no archive=yes sort=title template=titlepage -rootpage=templates postformtext="Add a new template named:"]] +rootpage=templates postformtext="Add a new template page named:"]] """]] -## wiki templates +## template files + +Template files are unlike template pages in that they have the extension +`.tmpl`. Template files are used extensively by Ikiwiki to generate html. +They can contain html that would not normally be allowed on a wiki page. -These templates are used to build the wiki. The aim is to keep almost all -html out of ikiwiki and in the templates. +Template files are located in `/usr/share/ikiwiki/templates` by default; +the `templatedir` setting can be used to make another directory be +searched first. Customised template files can also be placed inside the +"templates/" directory in your wiki's source -- files placed there override +ones in the `templatedir`. + +Here is a full list of the template files used: * `page.tmpl` - Used for displaying all regular wiki pages. This is the - key template to customise. [[!if test="enabled(pagetemplate)" then=""" + key template to customise to change the look and feel of Ikiwiki. + [[!if test="enabled(pagetemplate)" then=""" (The [[!iki ikiwiki/directive/pagetemplate desc="pagetemplate directive"]] can be used to make a page use a different template than `page.tmpl`.)"""]] * `rsspage.tmpl` - Used for generating rss feeds for blogs. @@ -71,10 +80,15 @@ html out of ikiwiki and in the templates. * `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. +* `notifyemail.tmpl` - Used by the notifymail plugin to generate mails about + changed pages. * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`, `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`, `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`, - `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user + `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user interface; do not normally need to be customised. + [[!meta robots="noindex, follow"]] diff --git a/wikiicons/revert.png b/wikiicons/revert.png Binary files differnew file mode 100644 index 0000000..c39e65c --- /dev/null +++ b/wikiicons/revert.png |
