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

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

Conflicts:
	doc/todo/mdwn_preview.mdwn
master
Joey Hess 2009-03-08 12:50:24 -04:00
parent 1dba400c2c 5e60e13a20
commit 311182a699
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
doc/todo/mdwn_preview.mdwn
View File

@ -27,29 +27,53 @@ add to ikiwiki.
>>> editing something other than Markdown source). I've >>> editing something other than Markdown source). I've
>>> removed the done tag so this is visible as a patch. -- [[Will]] >>> removed the done tag so this is visible as a patch. -- [[Will]]
>>> Hmm, it would be good if it turned off for !mdwn. Although this could >>>> Hmm, it would be good if it turned off for !mdwn. Although this could
>>> be difficult for a new page, since there is a dropdown selector to >>>> be difficult for a new page, since there is a dropdown selector to
>>> choose the markup language then. But it should be doable for editing an >>>> choose the markup language then. But it should be doable for editing an
>>> existing page. >>>> existing page.
>>>
>>> Can I get a license statement (ie, GPL-2+) ffrom you for the plugin? >>>>> I agree. I'm working on this for for both new pages and existing pages.
>>> --[[Joey]] >>>>> It shouldn't be hard once I get WMD going through the javascript API.
>>>>> At the moment that is inexplicably failing, and I haven't had time to have a good look at why.
>>>>> I may not get a chance to look at this again for a few weeks.
>>>> Can I get a license statement (ie, GPL-2+) ffrom you for the plugin?
>>>> --[[Joey]]
>>>>> Certainly. You're free to use the code I posted below under the GPL-2+ license. You'll note
>>>>> however that I haven't said anything about the WMD code itself. The WMD web page says:
>>>>>> "I'm refactoring the code, and will be releasing WMD under the MIT license soon. For now you can download the most recent release (wmd-1.0.1.zip) and use it freely."
>>>>> It might be best to contact <support@attacklab.net> to for an explicit license on that if you want to include it.
>>>>> -- [[Will]]
> So, I wonder if I should add a copy of the WMD source to ikiwiki, or rely > So, I wonder if I should add a copy of the WMD source to ikiwiki, or rely
> on the user or distribution providing it. It does not seem to be packaged > on the user or distribution providing it. It does not seem to be packaged
> for Debian yet. Hmm, I also can't find any copyright or license info in > for Debian yet. Hmm, I also can't find any copyright or license info in
> the zip file. --[[Joey]] > the zip file. --[[Joey]]
>> This is a good question. My thought is that it will probably not be packaged any time soon,
>> so you're better off adding it to IkiWiki. I'd contact the author of WMD and ask them. They
>> may have more insight. -- [[Will]]
Note that the WMD plugin does **not** handle directives. For this reason the normal `preview` button Note that the WMD plugin does **not** handle directives. For this reason the normal `preview` button
remains. Some CSS to clean up the display of the live WMD preview would be good. remains. Some CSS to clean up the display of the live WMD preview would be good.
> Can you elucidate the CSS comment -- or will it be obvious what you mean > Can you elucidate the CSS comment -- or will it be obvious what you mean
> when I try it? Is it what's needed for the live preview? --[[Joey]] > when I try it? Is it what's needed for the live preview? --[[Joey]]
>> In the version of the plugin below, a new `div` is added just below the form. WMD
>> populates this div with the HTML it generates from the Markdown source. This is not very
>> pretty at the moment - it appears in the same place as the preview used to, but with no
>> header or anything. Any standard IkiWiki preview will appear below the WMD live preview.
>> I recommend having a look at <http://wmd-editor.com/examples/splitscreen>
>> for what a little CSS could achieve. -- [[Will]]
> Hmm, now that I've tried it, I notice that it does live preview by > Hmm, now that I've tried it, I notice that it does live preview by
> default, below the edit window. Which is nice, but then if I hit the > default, below the edit window. Which is nice, but then if I hit the
> preview button, I get two previews.. which is confusing. (Also, minor, > preview button, I get two previews.. which is confusing. (Also, minor,
> but: the live preview is missing the >Page Preview:" header.) --[[Joey]] > but: the live preview is missing the "Page Preview:" header.) --[[Joey]]
> I wonder how annoying it would be to add some kind of simplistic wikilink > I wonder how annoying it would be to add some kind of simplistic wikilink
> support to wmd's preview? And/or a wikilink button? While not supporting > support to wmd's preview? And/or a wikilink button? While not supporting

4
doc/todo/need_global_renamepage_hook.mdwn
View File

@ -103,3 +103,7 @@ hashes is desired, it could return the full set of hashes.
>> plugins use the hook; plugin A would see when plugin B adds a new file >> plugins use the hook; plugin A would see when plugin B adds a new file
>> to be renamed. And the subpage renaming stuff could probably be moved >> to be renamed. And the subpage renaming stuff could probably be moved
>> into the rename hook too. --[[Joey]] >> into the rename hook too. --[[Joey]]
>>>
>>> I've implemented this nice solution in my po branch, please review.
>>> I'm slowly coming back to do the last bits needed to get my po and
>>> meta branch merged. --[[intrigeri]]