Merge branch 'master' of ssh://git.ikiwiki.info

master
Joey Hess 2011-06-23 17:42:48 -04:00
commit 09c70360f5
7 changed files with 63 additions and 0 deletions

View File

@ -62,3 +62,5 @@ The real bug was that the preprocess hook for comments didn't run
in the scan phase; my branch fixes that, streamlines that hook a bit
when run in the scan phase (so it doesn't htmlize, and only runs nested
directives in scan mode), and adds a regression test. --[[smcv]]
[[!tag patch]]

View File

@ -0,0 +1,11 @@
Hi there,
I tried yesterday to make a slide-show for my frontpage. I enabled the [[!iki plugins/meta desc=meta]] and the [[!iki plugins/html desc=html]] plugins, then, on my frontpage, I pointed to the .js files that do the trick and I added the html code to actually run the slide-show. I also set [[!iki plugins/htmlscrubber desc=htmlscrubber]] to skip everything except the Discussion pages. I used this code [[http://www.dynamicdrive.com/dynamicindex14/fadeinslideshow.htm]].
In theory this should have worked but unfortunately it didn't worked at all. I know I can use [[!iki plugins/rawhtml desc=rawhtml]] plugin but with this I get a page that is treated as data, I need the page to be treated as source so I can use directives. I'm now wondering if this is even possible in ikiwiki...
Anyway, I thought to check with you guys. The main idea is to have a simple slide-show with 4 or 5 slides that change every 3 seconds and each slide should link to a different page. Any ideas are extremely welcomed!
Thanks
Marius

View File

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://smcv.pseudorandom.co.uk/"
nickname="smcv"
subject="comment 1"
date="2011-06-23T07:52:04Z"
content="""
See [[tips/embedding_content]], which applies equally to any scripting or other \"unsafe\" markup.
"""]]

View File

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://smcv.pseudorandom.co.uk/"
nickname="smcv"
subject="comment 2"
date="2011-06-23T07:54:06Z"
content="""
Oh, sorry, you already said you disabled the htmlscrubber. In that case,
please define \"doesn't work\" - it might be helpful to compare the IkiWiki
output with similar code that you've added to a static copy of the HTML?
"""]]

View File

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawk3MUhMRflE8-Vg4fevsT1sadSetiAxVKg"
nickname="Marius"
subject="IT WORKS!!! Ikiwiki rules!"
date="2011-06-23T09:42:00Z"
content="""
Well, surprise, I tried a different approach and this time it worked perfectly. So, how I did it?...
I created externally a html file with the slid-show I wanted and then put it (along with the javascript files and the images) in the source directory. I rebuilt the wiki and then inlined that html page in the wiki page where I wanted the slide-show.
So, from now on my wiki will look like any wordpress or drupal eye-candy website but without all that bloat.
Short outline:
- put the slid-show files in the source directory
- rebuild the wiki
- on the wiki page you want some eye-candy inline the html page that contains the slid-show
- that's it ;)
Marius
"""]]

View File

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawk3MUhMRflE8-Vg4fevsT1sadSetiAxVKg"
nickname="Marius"
subject="comment 4"
date="2011-06-23T09:49:29Z"
content="""
Oh, I forgot to mention. It seems that you have to have both [[!iki plugins/html desc=html]] and [[!iki plugins/rawhtml desc=rawhtml]] plugins enabled for this to work.
Marius
"""]]

View File

@ -5,3 +5,4 @@ Recent changes to this wiki:
[[!inline pages="internal(recentchanges/change_*) and !*/Discussion"
template=recentchanges show=0]]
|''{http://google.co.in#/Active?'|'Shift'in`¶|¦`http://www.home-network-help.com((|))Subscribe'To,Site,!~AT@`|`http://standards.ieee.org{#`/\/?'|' web@``About 104,000,000 results;|images@``About 169,000,000 results;|video@``About 339 results;|