summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ikiwiki/pagespec.mdwn4
-rw-r--r--style.css1
-rw-r--r--templates/popup.mdwn2
-rw-r--r--wikiicons/email.pngbin550 -> 550 bytes
-rw-r--r--wikiicons/revert.pngbin397 -> 397 bytes
5 files changed, 6 insertions, 1 deletions
diff --git a/ikiwiki/pagespec.mdwn b/ikiwiki/pagespec.mdwn
index 0f298ad..59a0506 100644
--- a/ikiwiki/pagespec.mdwn
+++ b/ikiwiki/pagespec.mdwn
@@ -69,6 +69,10 @@ want to combine expression like that; "or" when it's enough for a page to
match one expression. Note that it doesn't make sense to say "index and
SandBox", since no page can match both expressions.
+If you want to include only one level of subpages, you can use
+
+ blog/* and !blog/*/*
+
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:
diff --git a/style.css b/style.css
index 8c16e7a..9f82899 100644
--- a/style.css
+++ b/style.css
@@ -286,6 +286,7 @@ div.progress-done {
#searchform { display: none; }
.blogform, #blogform { display: none; }
#backlinks { display: none; }
+ .addcomment { display: none; }
}
/* infobox template */
diff --git a/templates/popup.mdwn b/templates/popup.mdwn
index b721a95..f552bb5 100644
--- a/templates/popup.mdwn
+++ b/templates/popup.mdwn
@@ -10,7 +10,7 @@ large for good usability.
Note that browsers that do not support the CSS will display the popup
inline in the page, inside square brackets.
-[[templatebody <<ENDBODY
+[[!templatebody <<ENDBODY
<span class="popup"><TMPL_VAR mouseover>
<span class="paren">[</span><span class="balloon"><TMPL_VAR popup></span><span class="paren">]</span>
</span>
diff --git a/wikiicons/email.png b/wikiicons/email.png
index fa4f253..a2b2c89 100644
--- a/wikiicons/email.png
+++ b/wikiicons/email.png
Binary files differ
diff --git a/wikiicons/revert.png b/wikiicons/revert.png
index 9da94ad..dfd706b 100644
--- a/wikiicons/revert.png
+++ b/wikiicons/revert.png
Binary files differ