diff options
Diffstat (limited to 'basewiki')
| l---------[-rw-r--r--] | basewiki/blog.mdwn | 36 | ||||
| l---------[-rw-r--r--] | basewiki/favicon.ico | bin | 393 -> 18 bytes | |||
| l---------[-rw-r--r--] | basewiki/helponformatting.mdwn | 79 | ||||
| l---------[-rw-r--r--] | basewiki/local.css | 4 | ||||
| l---------[-rw-r--r--] | basewiki/markdown.mdwn | 11 | ||||
| l---------[-rw-r--r--] | basewiki/openid.mdwn | 35 | ||||
| l---------[-rw-r--r--] | basewiki/pagespec.mdwn | 72 | ||||
| l---------[-rw-r--r--] | basewiki/preprocessordirective.mdwn | 34 | ||||
| l---------[-rw-r--r--] | basewiki/shortcuts.mdwn | 19 | ||||
| l---------[-rw-r--r--] | basewiki/smileys.mdwn | 51 | ||||
| -rw-r--r-- | basewiki/smileys/alert.png | bin | 220 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/angry.png | bin | 295 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/attention.png | bin | 164 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/biggrin.png | bin | 173 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/checkmark.png | bin | 133 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/devil.png | bin | 354 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/frown.png | bin | 168 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/icon-error.png | bin | 159 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/icon-info.png | bin | 177 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/idea.png | bin | 372 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/ohwell.png | bin | 167 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/prio1.png | bin | 153 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/prio2.png | bin | 159 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/prio3.png | bin | 154 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/redface.png | bin | 306 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/sad.png | bin | 299 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/smile.png | bin | 356 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/smile2.png | bin | 334 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/smile3.png | bin | 326 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/smile4.png | bin | 275 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/star_off.png | bin | 297 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/star_on.png | bin | 374 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/thumbs-up.png | bin | 118 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/tired.png | bin | 157 -> 0 bytes | |||
| -rw-r--r-- | basewiki/smileys/tongue.png | bin | 176 -> 0 bytes | |||
| l---------[-rw-r--r--] | basewiki/style.css | 229 | ||||
| l---------[-rw-r--r--] | basewiki/subpage.mdwn | 12 | ||||
| -rw-r--r-- | basewiki/subpage/linkingrules.mdwn | 32 | ||||
| -rw-r--r-- | basewiki/wikiicons/diff.png | bin | 219 -> 0 bytes | |||
| l---------[-rw-r--r--] | basewiki/wikilink.mdwn | 24 |
40 files changed, 12 insertions, 626 deletions
diff --git a/basewiki/blog.mdwn b/basewiki/blog.mdwn index 859fa6aaa..1b35deb8a 100644..120000 --- a/basewiki/blog.mdwn +++ b/basewiki/blog.mdwn @@ -1,35 +1 @@ -You can turn any page on this wiki into a weblog by inserting a -[[PreProcessorDirective]]. Like this: - - \[[inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]] - -Any pages that match the specified [[PageSpec]] (in the example, any -[[SubPage]] of "blog") will be part of the blog, and the newest 10 -of them will appear in the page. Note that if files that are not pages -match the [[PageSpec]], they will be included in the feed using RSS -enclosures, which is useful for podcasting. - -The optional `rootpage` parameter tells the wiki that new posts to this blog -should default to being [[SubPage]]s of "blog", and enables a form at the -top of the blog that can be used to add new items. - -If you want your blog to have an archive page listing every post ever made -to it, you can accomplish that like this: - - \[[inline pages="blog/* and !*/Discussion" archive="yes"]] - -You can even create an automatically generated list of all the pages on the -wiki, with the most recently added at the top, like this: - - \[[inline pages="* and !*/Discussion" archive="yes"]] - -If you want to be able to add pages to a given blog feed by tagging them, -you can do that too. To tag a page, just make it link to a page or pages -that represent its tags. Then use the special link() [[PageSpec]] to match -all pages that have a given tag: - - \[[inline pages="link(life)"]] - -Or include some tags and exclude others: - - \[[inline pages="link(debian) and !link(social)"]] +../doc/blog.mdwn
\ No newline at end of file diff --git a/basewiki/favicon.ico b/basewiki/favicon.ico Binary files differindex 354b627f0..0572371db 100644..120000 --- a/basewiki/favicon.ico +++ b/basewiki/favicon.ico diff --git a/basewiki/helponformatting.mdwn b/basewiki/helponformatting.mdwn index 3a0ddb9f2..56c810f3c 100644..120000 --- a/basewiki/helponformatting.mdwn +++ b/basewiki/helponformatting.mdwn @@ -1,78 +1 @@ -# Help on formatting text - -Text on this wiki is, by default, written in a form very close to how you -might write text for an email message. This style of text formatting is -called [[MarkDown]], and it works like this: - -Leave blank lines between paragraphs. - -You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it -in single or double asterisks. - -To create a list, start each line with an asterisk: - -* "* this is my list" -* "* another item" - -To make a numbered list, start each line with a number (any number will -do) followed by a period: - -1. "1. first line" -2. "2. second line" -2. "2. third line" - -To create a header, start a line with one or more `#` characters followed -by a space and the header text. The number of `#` characters controls the -size of the header: - -# # h1 -## ## h2 -### ### h3 -#### #### h4 -##### ##### h5 -###### ###### h6 - -You can also make the first two levels of heading by underlining text with -equals or dash: - -heading 1 -========= - - heading 1 - ========= - -heading 2 ---------- - - heading 2 - --------- - -To create a horizontal rule, just write three or more dashes or stars on -their own line: - ----- - -To quote someone, prefix the quote with ">": - -> To be or not to be, -> that is the question. - -To write a code block, indent each line with a tab or 4 spaces: - - 10 PRINT "Hello, world!" - 20 GOTO 10 - -To link to another page on the wiki, place the page's name inside double -square brackets, so you would use `\[[WikiLink]]` to link to [[WikiLink]]. - -To link to any other web page, or to an email address, you can just put the url in angle brackets: <<http://ikiwiki.kitenet.net>>, or you can use the form -\[link text\]\(url\) - ----- - -You can also use [[PreProcessorDirective]]s to do additional cool stuff. - -[[if test="enabled(smiley)" then=""" -Also, because this wiki has the smiley plugin enabled, you can -insert [[smileys]] and some other useful symbols. -"""]] +../doc/helponformatting.mdwn
\ No newline at end of file diff --git a/basewiki/local.css b/basewiki/local.css index a0dec8cfd..f081a6a60 100644..120000 --- a/basewiki/local.css +++ b/basewiki/local.css @@ -1,3 +1 @@ -/* ikiwiki local style sheet */ - -/* Add local styling here, instead of modifying style.css. */ +../doc/local.css
\ No newline at end of file diff --git a/basewiki/markdown.mdwn b/basewiki/markdown.mdwn index 317a17db9..1724caec2 100644..120000 --- a/basewiki/markdown.mdwn +++ b/basewiki/markdown.mdwn @@ -1,10 +1 @@ -[Markdown](http://daringfireball.net/projects/markdown/) -is a minimal markup language that resembles plain text as used in -email messages. It is the markup language used by this wiki by default. - -For documentation about the markdown syntax, see [[HelpOnFormatting]] and -[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). - -Note that [[WikiLink]]s and [[PreProcessorDirective]]s are not part of the -markdown syntax, and are the only bit of markup that this wiki handles -internally. +../doc/markdown.mdwn
\ No newline at end of file diff --git a/basewiki/openid.mdwn b/basewiki/openid.mdwn index 7c6d2bda7..3a37eab73 100644..120000 --- a/basewiki/openid.mdwn +++ b/basewiki/openid.mdwn @@ -1,34 +1 @@ -[[meta title="OpenID"]] - -[[template id=note text=""" -[[if test="enabled(openid)" - then="This wiki has OpenID **enabled**." - else="This wiki has OpenID **disabled**."]] -"""]] - -[OpenID](http://openid.net) is a decentralized authentication mechanism -that allows you to have one login that you can use on a growing number of -websites. - -To sign up for an OpenID, visit one of the following identity providers: - -* [MyOpenID](https://www.myopenid.com/) -* [GetOpenID](https://getopenid.com/) -* [Videntity](http://videntity.org/) -* [LiveJournal](http://www.livejournal.com/openid/) -* or any of the many others out there.. - -Your OpenID is the URL that you are given when you sign up. -[[if test="enabled(openid)" then=""" -To sign in to this wiki using OpenID, just enter it in the OpenID field in the -signin form. You do not need to give this wiki a password or go through any -registration process when using OpenID. -"""]] - ---- - -It's also possible to make a page in the wiki usable as an OpenID url, -by delegating it to an openid server. Here's an example of how to do that: - - \[[meta link="http://www.myopenid.com/server" rel="openid.server"]] - \[[meta link="http://yourid.myopenid.com/" rel="openid.delegate"]] +../doc/openid.mdwn
\ No newline at end of file diff --git a/basewiki/pagespec.mdwn b/basewiki/pagespec.mdwn index 53519e7f0..71ea44d15 100644..120000 --- a/basewiki/pagespec.mdwn +++ b/basewiki/pagespec.mdwn @@ -1,71 +1 @@ -To select a set of pages, such as pages that are locked, pages -whose commit emails you want subscribe to, or pages to combine into a -blog, the wiki uses a PageSpec. This is an expression that matches -a set of pages. - -The simplest PageSpec is a simple list of pages. For example, this matches -any of the three listed pages: - - foo or bar or baz - -More often you will want to match any pages that have a particular thing in -their name. You can do this using a glob pattern. "`*`" stands for any part -of a page name, and "`?`" for any single letter of a page name. So this -matches all pages about music, and any [[SubPage]]s of the SandBox, but does -not match the SandBox itself: - - *music* or SandBox/* - -You can also prefix an item with "`!`" to skip pages that match it. So to -match all pages except for Discussion pages and the SandBox: - - * and !SandBox and !*/Discussion - -Some more elaborate limits can be added to what matches using any of these -functions: - -* "`link(page)`" - match only pages that link to a given page -* "`backlink(page)`" - match only pages that a given page links to -* "`creation_month(month)`" - match only pages created on the given month -* "`creation_day(mday)`" - or day of the month -* "`creation_year(year)`" - or year -* "`created_after(page)`" - match only pages created after the given page - was created -* "`created_before(page)`" - match only pages created before the given page - was created - -For example, to match all pages in a blog that link to the page about music -and were written in 2005: - - blog/* and link(music) and creation_year(2005) - -More complex expressions can also be created, by using parentheses for -grouping. For example, to match pages in a blog that are tagged with either -of two tags, use: - - blog/* and (link(tag/foo) or link(tag/bar)) - -Note that page names in PageSpecs are matched against the absolute -filenames of the pages in the wiki, so a pagespec "foo" used on page -"a/b" will not match a page named "a/foo" or "a/b/foo". To match -relative to the directory of the page containing the pagespec, you can -use "./". For example, "./foo" on page "a/b" matches page "a/foo". - -## Old syntax - -The old PageSpec syntax was called a "GlobList", and worked differently in -two ways: - -1. "and" and "or" were not used; any page matching any item from the list - matched. -2. If an item was prefixed with "`!`", then no page matching that item - matched, even if it matched an earlier list item. - -For example, here is the old way to match all pages except for the SandBox -and Discussion pages: - - * !SandBox !*/Discussion - -Using this old syntax is still supported. However, the old syntax is -deprecated and will be removed at some point, and using the new syntax is -recommended. +../doc/pagespec.mdwn
\ No newline at end of file diff --git a/basewiki/preprocessordirective.mdwn b/basewiki/preprocessordirective.mdwn index 1e2332c09..f786ed33b 100644..120000 --- a/basewiki/preprocessordirective.mdwn +++ b/basewiki/preprocessordirective.mdwn @@ -1,33 +1 @@ -Preprocessor directives are similar to a [[WikiLink]] in form, except they -contain spaces and parameters. The general form is: - - \[[directive param="value" param="value"]] - -This gets expanded before the rest of the page is processed, and can be used -to transform the page in various ways. - -The quotes around values can be omitted if the value is a simple word. -Also, some directives may use parameters without values, for example: - - \[[tag foo]] - -Note that if a preprocessor directive has no parameters, a space still must -be put after its name, to avoid confusion with a [[WikiLink]]. For example: - - \[[pagecount ]] - -A preprocessor directive does not need to all be on one line, it can be -wrapped to multiple lines if you like: - - \[[directive foo="baldersnatch" - bar="supercalifragalisticexpealadocious" baz=11]] - -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: - - \[[directive text=""" - 1. "foo" - 2. "bar" - 3. "baz" - """]] +../doc/preprocessordirective.mdwn
\ No newline at end of file diff --git a/basewiki/shortcuts.mdwn b/basewiki/shortcuts.mdwn index f9d586bbf..33892d73a 100644..120000 --- a/basewiki/shortcuts.mdwn +++ b/basewiki/shortcuts.mdwn @@ -1,18 +1 @@ -This page controls what shortcut links the wiki supports. - -* [[shortcut name=google url="http://www.google.com/search?q=%s"]] -* [[shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]] -* [[shortcut name=debbug url="http://bugs.debian.org/%s" desc="bug #%s"]] -* [[shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]] -* [[shortcut name=debpkg url="http://packages.debian.org/%s"]] -* [[shortcut name=debpts url="http://packages.qa.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=cpan url="http://search.cpan.org/search?mode=dist&query=%s"]] -* [[shortcut name=ctan url="http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s"]] -* [[shortcut name=iki url="http://ikiwiki.kitenet.net/%s.html"]] -* [[shortcut name=ljuser url="http://%s.livejournal.com/"]] - -To add a new shortcut, use the "shortcut" preprocessor directive. "%s" is -replaced with the text passed to the named shortcut. The optional desc -parameter controls the description of the link. +../doc/shortcuts.mdwn
\ No newline at end of file diff --git a/basewiki/smileys.mdwn b/basewiki/smileys.mdwn index e5377ced2..057df5adf 100644..120000 --- a/basewiki/smileys.mdwn +++ b/basewiki/smileys.mdwn @@ -1,50 +1 @@ -This page is used to control what smileys are supported by the wiki. -Just write the text of a smiley to display it. - -* \:) [[smileys/smile.png]] -* \:-) [[smileys/smile.png]] -* \:D [[smileys/biggrin.png]] -* \:-D [[smileys/biggrin.png]] -* \B) [[smileys/smile2.png]] -* \B-) [[smileys/smile2.png]] -* \:)) [[smileys/smile3.png]] -* \:-)) [[smileys/smile3.png]] -* \;) [[smileys/smile4.png]] -* \;-) [[smileys/smile4.png]] -* \:\ [[smileys/ohwell.png]] -* \:/ [[smileys/ohwell.png]] -* \:-/ [[smileys/ohwell.png]] -* \>:> [[smileys/devil.png]] -* \X-( [[smileys/angry.png]] -* \<:( [[smileys/frown.png]] -* \:( [[smileys/sad.png]] -* \:-( [[smileys/sad.png]] -* \:-? [[smileys/tongue.png]] -* \:o [[smileys/redface.png]] -* \|) [[smileys/tired.png]] -* \|-) [[smileys/tired.png]] -* \{OK} [[smileys/thumbs-up.png]] -* \{X} [[smileys/icon-error.png]] -* \{i} [[smileys/icon-info.png]] -* \(./) [[smileys/checkmark.png]] -* \(!) [[smileys/idea.png]] -* \[!] [[smileys/attention.png]] -* \/!\ [[smileys/alert.png]] -* \{*} [[smileys/star_on.png]] -* \{o} [[smileys/star_off.png]] -* \{1} [[smileys/prio1.png]] -* \{2} [[smileys/prio2.png]] -* \{3} [[smileys/prio3.png]] - -For example: {*} B) {*} - ----- - -To change the supported smileys, just edit the lists on this page. -Note that the format is important; each list item should start with the -text that is turned into the smiley, escaped so that users can see what -produces it, followed by a [[WikiLink]] to the image to display. - -/!\ Bear in mind that the link to the image needs to be written in a way that -will work if it's copied to other pages on the wiki. So be sure to include the -smileys directory in the path to the file. +../doc/smileys.mdwn
\ No newline at end of file diff --git a/basewiki/smileys/alert.png b/basewiki/smileys/alert.png Binary files differdeleted file mode 100644 index 5bb87e33f..000000000 --- a/basewiki/smileys/alert.png +++ /dev/null diff --git a/basewiki/smileys/angry.png b/basewiki/smileys/angry.png Binary files differdeleted file mode 100644 index 05bc69f74..000000000 --- a/basewiki/smileys/angry.png +++ /dev/null diff --git a/basewiki/smileys/attention.png b/basewiki/smileys/attention.png Binary files differdeleted file mode 100644 index 7e064566d..000000000 --- a/basewiki/smileys/attention.png +++ /dev/null diff --git a/basewiki/smileys/biggrin.png b/basewiki/smileys/biggrin.png Binary files differdeleted file mode 100644 index f71b42c11..000000000 --- a/basewiki/smileys/biggrin.png +++ /dev/null diff --git a/basewiki/smileys/checkmark.png b/basewiki/smileys/checkmark.png Binary files differdeleted file mode 100644 index 8869caa19..000000000 --- a/basewiki/smileys/checkmark.png +++ /dev/null diff --git a/basewiki/smileys/devil.png b/basewiki/smileys/devil.png Binary files differdeleted file mode 100644 index 8684c3970..000000000 --- a/basewiki/smileys/devil.png +++ /dev/null diff --git a/basewiki/smileys/frown.png b/basewiki/smileys/frown.png Binary files differdeleted file mode 100644 index 2999b55ea..000000000 --- a/basewiki/smileys/frown.png +++ /dev/null diff --git a/basewiki/smileys/icon-error.png b/basewiki/smileys/icon-error.png Binary files differdeleted file mode 100644 index 53b1055f6..000000000 --- a/basewiki/smileys/icon-error.png +++ /dev/null diff --git a/basewiki/smileys/icon-info.png b/basewiki/smileys/icon-info.png Binary files differdeleted file mode 100644 index c08b08d74..000000000 --- a/basewiki/smileys/icon-info.png +++ /dev/null diff --git a/basewiki/smileys/idea.png b/basewiki/smileys/idea.png Binary files differdeleted file mode 100644 index 37bc02ddc..000000000 --- a/basewiki/smileys/idea.png +++ /dev/null diff --git a/basewiki/smileys/ohwell.png b/basewiki/smileys/ohwell.png Binary files differdeleted file mode 100644 index a83adfbf5..000000000 --- a/basewiki/smileys/ohwell.png +++ /dev/null diff --git a/basewiki/smileys/prio1.png b/basewiki/smileys/prio1.png Binary files differdeleted file mode 100644 index 774d34d65..000000000 --- a/basewiki/smileys/prio1.png +++ /dev/null diff --git a/basewiki/smileys/prio2.png b/basewiki/smileys/prio2.png Binary files differdeleted file mode 100644 index 3c6fac54f..000000000 --- a/basewiki/smileys/prio2.png +++ /dev/null diff --git a/basewiki/smileys/prio3.png b/basewiki/smileys/prio3.png Binary files differdeleted file mode 100644 index 2d03e62ce..000000000 --- a/basewiki/smileys/prio3.png +++ /dev/null diff --git a/basewiki/smileys/redface.png b/basewiki/smileys/redface.png Binary files differdeleted file mode 100644 index 9a8739253..000000000 --- a/basewiki/smileys/redface.png +++ /dev/null diff --git a/basewiki/smileys/sad.png b/basewiki/smileys/sad.png Binary files differdeleted file mode 100644 index 68d9966cf..000000000 --- a/basewiki/smileys/sad.png +++ /dev/null diff --git a/basewiki/smileys/smile.png b/basewiki/smileys/smile.png Binary files differdeleted file mode 100644 index b51b3ff49..000000000 --- a/basewiki/smileys/smile.png +++ /dev/null diff --git a/basewiki/smileys/smile2.png b/basewiki/smileys/smile2.png Binary files differdeleted file mode 100644 index 43ea05f9d..000000000 --- a/basewiki/smileys/smile2.png +++ /dev/null diff --git a/basewiki/smileys/smile3.png b/basewiki/smileys/smile3.png Binary files differdeleted file mode 100644 index c690ccc2f..000000000 --- a/basewiki/smileys/smile3.png +++ /dev/null diff --git a/basewiki/smileys/smile4.png b/basewiki/smileys/smile4.png Binary files differdeleted file mode 100644 index f8f5b523d..000000000 --- a/basewiki/smileys/smile4.png +++ /dev/null diff --git a/basewiki/smileys/star_off.png b/basewiki/smileys/star_off.png Binary files differdeleted file mode 100644 index c5535c3de..000000000 --- a/basewiki/smileys/star_off.png +++ /dev/null diff --git a/basewiki/smileys/star_on.png b/basewiki/smileys/star_on.png Binary files differdeleted file mode 100644 index ec5c03097..000000000 --- a/basewiki/smileys/star_on.png +++ /dev/null diff --git a/basewiki/smileys/thumbs-up.png b/basewiki/smileys/thumbs-up.png Binary files differdeleted file mode 100644 index 1faabace7..000000000 --- a/basewiki/smileys/thumbs-up.png +++ /dev/null diff --git a/basewiki/smileys/tired.png b/basewiki/smileys/tired.png Binary files differdeleted file mode 100644 index a3d5c56fb..000000000 --- a/basewiki/smileys/tired.png +++ /dev/null diff --git a/basewiki/smileys/tongue.png b/basewiki/smileys/tongue.png Binary files differdeleted file mode 100644 index 65105407c..000000000 --- a/basewiki/smileys/tongue.png +++ /dev/null diff --git a/basewiki/style.css b/basewiki/style.css index 3b8a24d9a..f32009635 100644..120000 --- a/basewiki/style.css +++ b/basewiki/style.css @@ -1,228 +1 @@ -/* ikiwiki style sheet */ - -/* Note that instead of modifying this style sheet, you can instead edit - * local.css and use it to override or change settings in this one. - */ - -.header { - margin: 0; - font-size: 22px; - font-weight: bold; - line-height: 1em; - display: block; -} - -.author { - margin: 0; - font-size: 18px; - font-weight: bold; - display: block; -} - -.actions ul { - margin: 0; - padding: 6px; - list-style-type: none; - border-bottom: 1px solid #000; -} - -.inlinepage .actions ul { - border-bottom: 0; -} - -.actions li { - display: inline; - padding: .2em .4em; -} - -#backlinks { - margin: 1em 0; -} - -.tags { - clear: both; -} - -div.tags { - border-top: 1px solid #000; -} - -#footer { - margin: 1em 0; -} - -#searchform { - display: inline; - float: right; -} - -#editcontent { - width: 100%; -} - -/* Stuff for the RecentChanges table. */ -tr.changeheader { - background: #eee; - color: black !important; -} -tr.changeinfo { - background: #eee; - color: black !important; -} -th.changeheader { - padding: 1px .3em; -} -td.changeinfo { - padding: 1px .3em; -} -td.changetime { - white-space: nowrap; - padding: 1px .3em; -} -td.changelog { - font-style: italic; -} - -.pagecloud { - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; -} - -/* Used for adding a blog page. */ -#blogform { - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; -} - -.inlinepage { - padding: 10px 10px; - border: 1px solid #aaa; -} - -.pageinfo { - clear: both; - font-style: italic; - display: block; -} - -/* Used for invalid form fields. */ -.fb_invalid { - color: red; - background: white !important; -} - -/* Used for required form fields. */ -.fb_required { - font-weight: bold; -} - -/* Orange feed button. */ -.feedbutton { - background: #ff6600; - color: white !important; - border-left: 1px solid #cc9966; - border-top: 1px solid #ccaa99; - border-right: 1px solid #993300; - border-bottom: 1px solid #331100; - padding: 0px 0.5em 0px 0.5em; - font-family: sans-serif; - font-weight: bold; - font-size: small; - text-decoration: none; - margin-top: 1em; -} -.feedbutton:hover { - color: white !important; - background: #ff9900; -} - -/* Tag cloud. */ -.pagecloud { - float: right; - width: 30%; - text-align: center; -} -.smallestPC { font-size: 70%; } -.smallPC { font-size: 85%; } -.normalPC { font-size: 100%; } -.bigPC { font-size: 115%; } -.biggestPC { font-size: 130%; } - -#sidebar { - line-height: 3ex; - width: 20ex; - float: right; - margin-left: 40px; - margin-bottom: 40px; - padding: 2ex 2ex; -} - -.infobox { - float: right; - margin-left: 2ex; - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; -} - -.notebox { - float: right; - margin-left: 2ex; - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; - width: 25% -} - -/* outlines */ -li.L1 { - list-style: upper-roman; -} -li.L2 { - list-style: decimal; -} -li.L3 { - list-style: lower-alpha; -} -li.L4 { - list-style: disc; -} -li.L5 { - list-style: square; -} -li.L6 { - list-style: circle; -} -li.L7 { - list-style: lower-roman; -} -li.L8 { - list-style: upper-alpha; -} - -hr.poll { - height: 10pt; - color: white !important; - background: #eee; - border: 2px solid black; -} -div.poll { - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; -} - -input#openid_url { - background: url(http://openid.net/login-bg.gif) no-repeat; - background-color: #fff; - background-position: 0 50%; - color: #000; - padding-left: 18px; -} +../doc/style.css
\ No newline at end of file diff --git a/basewiki/subpage.mdwn b/basewiki/subpage.mdwn index 43669209c..04ec383fc 100644..120000 --- a/basewiki/subpage.mdwn +++ b/basewiki/subpage.mdwn @@ -1,11 +1 @@ -ikiwiki supports placing pages in a directory hierarchy. For example, -this page, [[SubPage]] has some related pages placed under it, like -[[SubPage/LinkingRules]]. This is a useful way to add some order to your -wiki rather than just having a great big directory full of pages. - -To add a SubPage, just make a subdirectory and put pages in it. For -example, this page is SubPage.mdwn in this wiki's source, and there is also -a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages -can be nested as deeply as you'd like. - -Linking to and from a SubPage is explained in [[LinkingRules]]. +../doc/subpage.mdwn
\ No newline at end of file diff --git a/basewiki/subpage/linkingrules.mdwn b/basewiki/subpage/linkingrules.mdwn deleted file mode 100644 index c1062304a..000000000 --- a/basewiki/subpage/linkingrules.mdwn +++ /dev/null @@ -1,32 +0,0 @@ -To link to or from a [[SubPage]], you can normally use a regular -[[WikiLink]] that does not contain the name of the parent directory of -the [[SubPage]]. Ikiwiki descends the directory hierarchy looking for a -page that matches your link. - -For example, if FooBar/SubPage links to "OtherPage", ikiwiki will first -prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next -to FooBar/OtherPage and finally to OtherPage in the root of the wiki. - -Note that this means that if a link on FooBar/SomePage to "OtherPage" -currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage -is created, the link will _change_ to point to FooBar/OtherPage. On the -other hand, a link from BazBar to "OtherPage" would be unchanged by this -creation of a [[SubPage]] of FooBar. - -You can also specify a link that contains a directory name, like -"FooBar/OtherPage" to more exactly specify what page to link to. This is -the only way to link to an unrelated [[SubPage]]. - -You can use this to, for example, to link from BazBar to "FooBar/SubPage", -or from BazBar/SubPage to "FooBar/SubPage". - -You can also use "/" at the start of a link, to specify exactly which page -to link to, when there are multiple pages with similar names and the link -goes to the wrong page by default. For example, linking from -"FooBar/SubPage" to "/OtherPage" will link to the "OtherPage" in the root -of the wiki, even if there is a "FooBar/OtherPage". - -Also, if the wiki is configured with a userdir, you can link to pages -within the userdir without specifying a path to them. This is to allow for -easy linking to a user's page in the userdir, to sign a comment. These -links are checked for last of all. diff --git a/basewiki/wikiicons/diff.png b/basewiki/wikiicons/diff.png Binary files differdeleted file mode 100644 index 0b98d79ac..000000000 --- a/basewiki/wikiicons/diff.png +++ /dev/null diff --git a/basewiki/wikilink.mdwn b/basewiki/wikilink.mdwn index 46da8c301..f63c38ed2 100644..120000 --- a/basewiki/wikilink.mdwn +++ b/basewiki/wikilink.mdwn @@ -1,23 +1 @@ -WikiLinks provide easy linking between pages of the wiki. To create a -[[WikiLink]], just put the name of the page to link to in double brackets. -For example "\[[WikiLink]]". - -If you ever need to write something like "\[[WikiLink]] without creating a -wikilink, just prefix it with a "\", like "\\\\[[WikiLink]]". - -There are some special [[SubPage/LinkingRules]] that come into play when -linking between [[SubPages|SubPage]]. - -Also, if the file linked to by a WikiLink looks like an image, it will -be displayed inline on the page. - -WikiLinks are matched with page names in a case-insensitive manner, so you -don't need to worry about getting the case the same, and can capitalise -links at the start of a sentence, and so on. - -It's also possible to write a WikiLink that uses something other than the -page name as the link text. For example "\[[foo_bar|SandBox]]" links to the -SandBox page, but the link will appear like this: [[foo_bar|SandBox]] - -**Note that you cannot use spaces in WikiLinks**. Replace spaces with -underscores. +../doc/wikilink.mdwn
\ No newline at end of file |
