diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/plugins/contrib/showdiff.mdwn | 32 | ||||
| -rw-r--r-- | doc/plugins/editdiff.mdwn | 13 |
2 files changed, 13 insertions, 32 deletions
diff --git a/doc/plugins/contrib/showdiff.mdwn b/doc/plugins/contrib/showdiff.mdwn deleted file mode 100644 index 0436fdef6..000000000 --- a/doc/plugins/contrib/showdiff.mdwn +++ /dev/null @@ -1,32 +0,0 @@ -[[template id=plugin name=showdiff author="[[JeremieKoenig]]"]] -[[tag type/useful]] - -This plugin, which can be downloaded -[here](http://www.jk.fr.eu.org/ikiwiki/showdiff.pm), -adds a "Show Diff" button to the page edition template. -When clicked, a diff between the stored page and provided content -is shown in the "Page Preview" area. - -It depends on -[this patch](http://www.jk.fr.eu.org/ikiwiki/pluggable_editpage_buttons.diff), -which does the following: - - * add a title to the editpage form; - * pass a reference to the list of buttons to the formbuilder_setup - hooks, so we can add ours; - * relax asumption about the possible submit values (use "Save Page" - explicitly); - * de-hardcode the submit buttons from the editpage template - (was this intended to work around something?). - -> That was there to work around a bug in CGI::FormBuilder 3.0401 -> that broke FORM-SUBMIT on customised templates. That seems to be -> fixed in the newer version ikiwiki already depends on. Patch accepted. -> --[[Joey]] - -## Problems - -No special handling is done of concurrent edits: changes introduced -independently will show up in the requested diff, although they will -be merged when the page is saved. I suspect even detecting this case -would require changes in the RCS backends. diff --git a/doc/plugins/editdiff.mdwn b/doc/plugins/editdiff.mdwn new file mode 100644 index 000000000..edd820a62 --- /dev/null +++ b/doc/plugins/editdiff.mdwn @@ -0,0 +1,13 @@ +[[template id=plugin name=editdiff author="[[JeremieKoenig]]"]] +[[tag type/useful]] + +This plugin adds a "Diff" button when a page is being added. +When clicked, a diff between the stored page and provided content +is shown in the "Page Preview" area. + +## Problems + +No special handling is done of concurrent edits: changes introduced +independently will show up in the requested diff, although they will +be merged when the page is saved. I suspect even detecting this case +would require changes in the RCS backends. |