urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'joey' into revert

master
Peter Gammie 2010-10-01 09:48:03 +10:00
parent ce411663cf e46f15f371
commit eba5c71514
5 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn
View File

@ -50,3 +50,12 @@ Any suggestions gladly received. -- [[Jon]]
>>> As always, if you'd like to mail me a larger test case that reproduces a
>>> problem for you, I can take a look at it. --[[Joey]]
>>>> <s>Thank you for the offer. I might still take you up on it. I've just proven that this
>>>> does work for a clean repo / bare bones test case. -- [[Jon]]</s> Figured it out. The
>>>> problem was I'd copied a page (old_new) which had two images embedded in it to test.
>>>> I'd stored the images under a subdir "old_new". The new page was called "old_new_test"
>>>> and the images thus could not be found by a pagespec "some-image.jpg". Adjusting the
>>>> href argument to the template (consequently the src argument to img) to
>>>> "old_new/some-image.jpg" fixed it all. [[done]], PEBKAC. Thank you for your time :)
>>>> -- [[Jon]]

2
doc/css_market.mdwn
View File

@ -47,7 +47,7 @@ included in the [[theme_plugin|plugins/theme]].
* **[contraste.css][4]**, contributed by [[Blanko]]. Can be seen on [Contraste Demo][5]. Local.css and templates available [here][6].
* **[[css_market/actiontabs.css]]**, contributed by [[svend]]. This style sheet displays
the action list (Edit, RecentChanges, etc.) as tabs.
the action list (Edit, RecentChanges, etc.) as tabs. This is in use at [branchable](http://www.branchable.com/).
[[!meta stylesheet="actiontabs"]]
* **[wiki.css](http://cyborginstitute.net/includes/wiki.css)** by [[tychoish]].

12
doc/sandbox/bullet_list_and_code_test.mdwn 100644
View File

@ -0,0 +1,12 @@
paragraph.
code
* bullet list
* bullet list
more code
* bullet list continued
tailing code

6
doc/todo/configurable_tidy_command_for_htmltidy.mdwn 100644
View File

@ -0,0 +1,6 @@
[[!tag patch patch]]
I was trying to get htmltidy to [play nicely with MathML][play]. Unfortunately, I couldn't construct a command line that I was happy with, but along the way I altered htmltidy to allow a configurable command line. This seemed like a generally useful thing, so I've published my [patch][] as a Git branch.
[play]: http://lists.w3.org/Archives/Public/html-tidy/2006JanMar/0052.html
[patch]: http://www.physics.drexel.edu/~wking/code/git/git.php?p=ikiwiki.git&a=commitdiff&h=408ee89fd7c1dc70510385a7cf263a05862dda97&hb=e65ce4f0937eaf622846c02a9d39fa7aebe4af12

2
doc/todo/latex.mdwn
View File

@ -9,6 +9,8 @@ of the ikiwiki [[/logo]].
> [[users/JasonBlevins]] has also a plugin for including [[LaTeX]] expressions (by means of `itex2MML`) -- [[plugins/mdwn_itex]] (look at his page for the link). --Ivan Z.
>> I've [updated](http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/mdwn_itex/) Jason's plugin for ikiwiki 3.x. --W. Trevor King
----
ikiwiki could also support LaTeX as a document type, again rendering to HTML.