From ab69b32156a6a5b814b825762fed199d11632938 Mon Sep 17 00:00:00 2001 From: Bernie Innocenti <bernie@codewiz.org> Date: Mon, 17 Aug 2009 22:29:53 +0200 Subject: [PATCH] Implement page editor ad a wiki page --- geekigeeki.py | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/geekigeeki.py b/geekigeeki.py index 4b95368..1dda0ca 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -341,7 +341,7 @@ def send_footer(mod_string=None): cgi.print_arguments() cgi.print_form(form) cgi.print_environ() - link_inline("sys/footer", kvargs= { 'LAST_MODIFIED': mod_string }) + link_inline("sys/footer", kvargs = { 'LAST_MODIFIED': mod_string }) print("</body></html>") def _macro_ELAPSED_TIME(*args, **kvargs): @@ -745,35 +745,14 @@ class Page: send_guru("Write access denied by ACLs", "error") return - filename = '' - if 'file' in form: - filename = form['file'].value - - print(('<p><b>Editing ' + self.page_name - + ' for ' + cgi.escape(remote_user()) - + ' from ' + cgi.escape(get_hostname(remote_host())) - + '</b></p>')) - print('<div class="editor"><form name="editform" method="post" enctype="multipart/form-data" action="%s">' % relative_url(self.page_name)) - print('<input type="hidden" name="a" value="edit" /><input type="hidden" name="q" value="' + self.page_name + '" />') - print('<input type="input" id="editor" name="changelog" value="Edit page %s" accesskey="c" /><br />' % (self.page_name)) - print('<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100" accesskey="e">%s</textarea>' \ - % cgi.escape(preview or self.get_raw_body(default=''))) - print('<label for="file" accesskey="u">Or Upload a file:</label> <input type="file" name="file" value="%s" />' % filename) - print(""" - <br /> - <input type="submit" name="save" value="Save" accesskey="s"> - <input type="submit" name="preview" value="Preview" accesskey="p" /> - <input type="reset" value="Reset" /> - <input type="submit" name="cancel" value="Cancel" /> - <br /> - </form></div> - <script language="javascript"> - <!-- - document.editform.savetext.focus() - //--> - </script> - """) - print("<p>" + link_tag('EditingTips') + "</p>") + if preview is None: + preview = self.get_raw_body(default='') + + link_inline("sys/EditPage", kvargs = { + 'EDIT_BODY': cgi.escape(preview), + #'EDIT_PREVIEW': WikiFormatter(preview).print_html(), + }) + if preview: print("<div class='preview'>") WikiFormatter(preview).print_html() -- 2.34.1