diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-21 11:33:43 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-21 11:34:49 -0400 |
commit | d5e65e582a34ae2494fee493ddcb2b959e4a4bce (patch) | |
tree | 14bf1f7a604406ecb98523eda42c2e864321e1d0 /doc/plugins/conditional | |
parent | d13200f92b74aa3d4e315809c78f1c2ec6c925a7 (diff) | |
parent | e3a84952715cdd625258e1695cb74898006c31f3 (diff) |
Merge commit 'smcv/prefix'
Conflicts:
doc/news/version_2.49.mdwn
Also fixed the newest news file (and my wikiannounce script).
Diffstat (limited to 'doc/plugins/conditional')
-rw-r--r-- | doc/plugins/conditional/discussion.mdwn | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/plugins/conditional/discussion.mdwn b/doc/plugins/conditional/discussion.mdwn index 79b8390fa..629d05940 100644 --- a/doc/plugins/conditional/discussion.mdwn +++ b/doc/plugins/conditional/discussion.mdwn @@ -14,9 +14,9 @@ is supposed to have *no* blank lines between... > The blank lines in this example are coming from the newline after `then="`, and also from the newline before the close quote. If you remove those newlines, I think it should work. --[[Joey]] >> No, that's unfortunately not it, see here: ->> [[if test="enabled(trallala)" then="foot"]] +>> [[!if test="enabled(trallala)" then="foot"]] >> Continued. But on the other ->> [[if test="enabled(trallala)" then="foot" else="hand:"]] +>> [[!if test="enabled(trallala)" then="foot" else="hand:"]] >> Continued. --[[tschwinge]] >>> Seems ok, no? The only linebreaks I see in the source are the ones you @@ -25,9 +25,9 @@ is supposed to have *no* blank lines between... >>>> Okay, that would explain the linebreak between 1 and 3. But then, why are all linebreaks removed between 3 and 5? >>>> 1 No, that's unfortunately not it, see here: ->>>> [[if test="enabled(trallala)" then="foot"]] +>>>> [[!if test="enabled(trallala)" then="foot"]] >>>> 3 Continued. But on the other ->>>> [[if test="enabled(trallala)" then="foot" else="hand:"]] +>>>> [[!if test="enabled(trallala)" then="foot" else="hand:"]] >>>> 5 Continued. --[[tschwinge]] >>>>> The conditional after 1 evaluates to "", so there's a blank line @@ -38,10 +38,10 @@ I have a sidebar that contains <pre> #### Archives - \[[calendar type="year" months_per_row="6" pages="blog/* and !*/Discussion"]] - \[[calendar type="month" pages="blog/* and !*/Discussion"]] + \[[!calendar type="year" months_per_row="6" pages="blog/* and !*/Discussion"]] + \[[!calendar type="month" pages="blog/* and !*/Discussion"]] <h4>Indices</h4> - \[[map pages="archives/* and !*/Discussion"]] + \[[!map pages="archives/* and !*/Discussion"]] </pre> I am trying to make it so that the archives and index only show up if the destpage is either blog/* or / -- the top of the wiki. Unfortunately, I don't think I am getting the conditional right -- I have a "]] left over at the end (looking at the rendered html). Ideally, I would like to be able to do todays calendar on the top level pagel and |