summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/comments_not_searchable.mdwn2
-rw-r--r--doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn2
-rw-r--r--doc/plugins/po/discussion.mdwn2
-rw-r--r--doc/plugins/write.mdwn10
-rw-r--r--doc/style.css219
-rw-r--r--doc/users/KarlMW/discussion.mdwn2
6 files changed, 117 insertions, 120 deletions
diff --git a/doc/bugs/comments_not_searchable.mdwn b/doc/bugs/comments_not_searchable.mdwn
index 72f7bf30f..6fda89bd2 100644
--- a/doc/bugs/comments_not_searchable.mdwn
+++ b/doc/bugs/comments_not_searchable.mdwn
@@ -15,3 +15,5 @@ However, the search postscan hook tells xapian the page url,
and uses `urlto($page)` to do it. And that won't work for
an internal page. Guess it could be modified to tell xapian the
permalink. --[[Joey]]
+
+> [[done]] --[[Joey]]
diff --git a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
index be14e5126..c6e3cd4fd 100644
--- a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
+++ b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
@@ -144,7 +144,7 @@ So, looking at your meta branch: --[[Joey]]
has no title, then A will display the link as "B". Now page B is modified
and a title is added. Nothing updates "A".
The added overhead of rebuilding every page that links to B when B is
- changed (as the `postscan` hook of the po plugin does) is IMHO a killer.
+ changed (as the `indexhtml` hook of the po plugin does) is IMHO a killer.
That could be hundreds or thousands of pages, making interactive editing
way slow. This is probably the main reason I had not attempted this whole
thing myself. IMHO this calls for some kind of intellegent dependency
diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn
index ab822e76c..27683f1ea 100644
--- a/doc/plugins/po/discussion.mdwn
+++ b/doc/plugins/po/discussion.mdwn
@@ -513,7 +513,7 @@ finish it at some point in the first quarter of 2009. --[[intrigeri]]
>>>>
>>>>> Done. --[[intrigeri]]
>>>
-> * I'm very fearful of the `add_depends` in `postscan`.
+> * I'm very fearful of the `add_depends` in `indexhtml`.
> Does this make every page depend on every page that links
> to it? Won't this absurdly bloat the dependency pagespecs
> and slow everything down? And since nicepagetitle is given
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 3b1d770eb..193005565 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -39,7 +39,7 @@ built.
Now that it knows what pages it needs to build, ikiwiki runs two
compile passes. First, it runs `scan` hooks, which collect metadata about
the pages. Then it runs a page rendering pipeline, by calling in turn these
-hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `postscan`,
+hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `indexhtml`,
`pagetemplate`, `sanitize`, `format`.
After all necessary pages are built, it calls the `change` hook. Finally,
@@ -282,16 +282,16 @@ like `Makefile` that have no extension.
If `hook` is passed an optional "longname" parameter, this value is used
when prompting a user to choose a page type on the edit page form.
-### postscan
+### indexhtml
- hook(type => "postscan", id => "foo", call => \&postscan);
+ hook(type => "indexhtml", id => "foo", call => \&indexhtml);
This hook is called once the page has been converted to html (but before
the generated html is put in a template). The most common use is to
update search indexes. Added in ikiwiki 2.54.
-The function is passed named parameters "page" and "content". Its return
-value is ignored.
+The function is passed named parameters "page", "destpage", and "content".
+Its return value is ignored.
### pagetemplate
diff --git a/doc/style.css b/doc/style.css
index f2f558497..5f77037e4 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -4,6 +4,7 @@
* local.css and use it to override or change settings in this one.
*/
+/* html5 compat */
article,
header,
footer,
@@ -164,7 +165,6 @@ div.recentchanges {
width: 60%;
}
-/* Used for adding a blog page. */
#blogform {
padding: 10px 10px;
border: 1px solid #aaa;
@@ -189,53 +189,6 @@ div.recentchanges {
color: #C00;
}
-/* 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;
- padding: 10px 10px;
- border: 1px solid #aaa;
- background: #eee;
- color: black !important;
-}
-.smallestPC { font-size: 70%; }
-.smallPC { font-size: 85%; }
-.normalPC { font-size: 100%; }
-.bigPC { font-size: 115%; }
-.biggestPC { font-size: 130%; }
-
.sidebar {
width: 30ex;
float: right;
@@ -248,32 +201,6 @@ div.recentchanges {
color: black !important;
}
-/* 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;
@@ -287,6 +214,27 @@ div.poll {
border: 1px solid #aaa;
}
+span.color {
+ padding: 2px;
+}
+
+.comment-header,
+.microblog-header {
+ font-style: italic;
+ margin-top: .3em;
+}
+.comment .author,
+.microblog .author {
+ font-weight: bold;
+}
+.comment-subject {
+ font-weight: bold;
+}
+.comment {
+ border: 1px solid #aaa;
+ padding: 3px;
+}
+
div.progress {
margin-top: 1ex;
margin-bottom: 1ex;
@@ -303,23 +251,7 @@ div.progress-done {
padding: 1px;
}
-input#openid_url {
- background: url(wikiicons/openidlogin-bg.gif) no-repeat;
- background-color: #fff;
- background-position: 0 50%;
- color: #000;
- padding-left: 18px;
-}
-
-input#searchbox {
- background: url(wikiicons/search-bg.gif) no-repeat;
- background-color: #fff;
- background-position: 100% 50%;
- color: #000;
- padding-right: 16px;
-}
-
-/* Things to hide in printouts. */
+/* things to hide in printouts */
@media print {
.actions { display: none; }
.tags { display: none; }
@@ -329,7 +261,7 @@ input#searchbox {
#backlinks { display: none; }
}
-/* Provided for use by template plugin for floating info boxes. */
+/* infobox template */
.infobox {
float: right;
margin-left: 2ex;
@@ -341,7 +273,7 @@ input#searchbox {
color: black !important;
}
-/* Provided for use by template plugin for floating note boxes. */
+/* notebox template */
.notebox {
float: right;
margin-left: 2ex;
@@ -354,7 +286,7 @@ input#searchbox {
color: black !important;
}
-/* Used by the popup template and for backlinks hiding. */
+/* popup template and backlinks hiding */
.popup {
border-bottom: 1px dotted #366;
color: #366;
@@ -375,7 +307,7 @@ input#searchbox {
color: black;
}
-/* Formbuilder styling */
+/* form styling */
fieldset {
margin: 1ex 0;
border: 1px solid black;
@@ -397,29 +329,44 @@ legend {
background: #eee;
color: black !important;
}
-
-span.color {
- padding: 2px;
+label.block {
+ display: block;
}
-
-.comment-header,
-.microblog-header {
- font-style: italic;
- margin-top: .3em;
+label.inline {
+ display: inline;
}
-.comment .author,
-.microblog .author {
- font-weight: bold;
+ol.form {
+ list-style: none;
+ padding: 0;
}
-.comment-subject {
- font-weight: bold;
+li.form {
+ padding-bottom: 1em;
}
-.comment {
- border: 1px solid #aaa;
- padding: 3px;
+input#openid_url {
+ background: url(wikiicons/openidlogin-bg.gif) no-repeat;
+ background-color: #fff;
+ background-position: 0 50%;
+ color: #000;
+ padding-left: 18px;
+}
+input#searchbox {
+ background: url(wikiicons/search-bg.gif) no-repeat;
+ background-color: #fff;
+ background-position: 100% 50%;
+ color: #000;
+ padding-right: 16px;
+}
+/* invalid form fields */
+.fb_invalid {
+ color: red;
+ background: white !important;
+}
+/* required form fields */
+.fb_required {
+ font-weight: bold;
}
-/* Used by the highlight plugin. */
+/* highlight plugin */
pre.hl { color:#000000; background-color:#ffffff; }
.hl.num { color:#2928ff; }
.hl.esc { color:#ff00ff; }
@@ -436,7 +383,7 @@ pre.hl { color:#000000; background-color:#ffffff; }
.hl.kwc { color:#000000; font-weight:bold; }
.hl.kwd { color:#010181; }
-/* For the calendar plugin. */
+/* calendar plugin */
.month-calendar-day-this-day { background-color: #eee; }
.year-calendar-this-month { background-color: #eee; }
.month-calendar-arrow A:link,
@@ -447,3 +394,49 @@ pre.hl { color:#000000; background-color:#ffffff; }
font-weight: normal;
font-size: 150%;
}
+
+/* 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; }
+
+/* tag cloud */
+.pagecloud {
+ float: right;
+ width: 30%;
+ text-align: center;
+ padding: 10px 10px;
+ border: 1px solid #aaa;
+ background: #eee;
+ color: black !important;
+}
+.smallestPC { font-size: 70%; }
+.smallPC { font-size: 85%; }
+.normalPC { font-size: 100%; }
+.bigPC { font-size: 115%; }
+.biggestPC { font-size: 130%; }
+
+/* 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;
+}
diff --git a/doc/users/KarlMW/discussion.mdwn b/doc/users/KarlMW/discussion.mdwn
index 9117abcab..4a111a3f9 100644
--- a/doc/users/KarlMW/discussion.mdwn
+++ b/doc/users/KarlMW/discussion.mdwn
@@ -23,3 +23,5 @@ things that need changing then I will probably need help/guidance.
>> I suspect that asciidoc can't really be made to play nice to the extent that I would want casual users/abusers to have it as a markup option on a live wiki - it's fine for a personal site where you can look at the output before putting it online, but I think it would be a hideously gaping integrity hole for anything more than that. However, for a personal site (as I am using it), it does seem to have its uses.
>> I'll keep an eye on the format_escape plugin, and assuming it is accepted into ikiwiki, will see if I can apply it to asciidoc. --[[KarlMW]]
+
+Is there any way to enable latexmath rendering? It semes that ikiwiki strips the necessary javascript and/or style sheet information from the HTML page generated by asciidoc. --Peter
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-13 20:56:57 +0000