Preview support for blog entries (mostly intended for testing markdown syntax)

Signed-off-by: Priit Laes <plaes@plaes.org>
---
 forms.py                           |    3 ++-
 shared/admin/style.css             |    4 ++++
 templates/admin/_form_helpers.html |   12 ++++++++++++
 templates/admin/edit_entry.html    |   23 ++++++++++++++---------
 utils/admin.py                     |    5 ++++-
 views/admin.py                     |   15 +++++++++++++++
 6 files changed, 51 insertions(+), 11 deletions(-)

diff -r 067c3aad0df2 zine/forms.py
--- a/zine/forms.py	Mon Apr 06 00:05:01 2009 +0200
+++ b/zine/forms.py	Thu Apr 23 21:54:24 2009 +0300
@@ -312,10 +312,11 @@
             raise ValidationError(_('Selected parser is no longer '
                                     'available on the system.'))
 
-    def as_widget(self):
+    def as_widget(self, preview=False):
         widget = forms.Form.as_widget(self)
         widget.new = self.post is None
         widget.post = self.post
+        widget.preview = preview
         widget.parser_missing = self.parser_missing
         return widget
 
diff -r 067c3aad0df2 zine/shared/admin/style.css
--- a/zine/shared/admin/style.css	Mon Apr 06 00:05:01 2009 +0200
+++ b/zine/shared/admin/style.css	Thu Apr 23 21:54:24 2009 +0300
@@ -468,6 +468,10 @@
     padding: 5px 0 5px 10px;
 }
 
+div.preview {
+    border: 1px solid #FCF7F7; padding: 1em;
+}
+
 ul.errors {
     background-color: #FCF7F7;
     border: 1px solid #E8B5B5;
diff -r 067c3aad0df2 zine/templates/admin/_form_helpers.html
--- a/zine/templates/admin/_form_helpers.html	Mon Apr 06 00:05:01 2009 +0200
+++ b/zine/templates/admin/_form_helpers.html	Thu Apr 23 21:54:24 2009 +0300
@@ -5,3 +5,15 @@
     {{ caller() if caller else field() }}
   </div>
 {% endmacro %}
+
+{% macro render_post_actions(form) %}
+  <div class="actions">
+    <input type="submit" name="save" value="{{ _('Save') }}">
+    <input type="submit" name="save_and_continue" value="{{ _('Save and continue editing') }}">
+    {%- if not form.new %}
+      <input type="submit" name="delete" value="{{ _('Delete') }}">
+    {%- endif %}
+    <input type="submit" name="cancel" value="{{ _('Cancel') }}">
+    <input type="submit" name="preview" value="{{ _('Preview') }}">
+  </div>
+{% endmacro %}
diff -r 067c3aad0df2 zine/templates/admin/edit_entry.html
--- a/zine/templates/admin/edit_entry.html	Mon Apr 06 00:05:01 2009 +0200
+++ b/zine/templates/admin/edit_entry.html	Thu Apr 23 21:54:24 2009 +0300
@@ -1,10 +1,21 @@
 {% extends "admin/layout.html" %}
-{% from "admin/_form_helpers.html" import render_formbox %}
+{% from "admin/_form_helpers.html" import render_formbox, render_post_actions %}
 {% block title %}{{
   _("New Entry") if form.new else _("Edit Entry “%s”") % form.post.title
 }}{% endblock %}
 {% block contents %}
+  {% if form.preview %}
+  <fieldset id="preview">
+    <legend>{{_('Preview')}} (<a href="#form_start">{{_('skip')}})</a></legend>
+    <div class="preview">
+      <div class="text">
+      {{text}}
+      </div>
+    </div>
+  </fieldset>
+  {% endif %}
   <h1>{{ self.title() }}</h1>
+  <a name="form_start" /></a>
   {% call form() %}
     {%- if form.parser_missing %}
       <ul class="errors">
@@ -22,6 +33,7 @@
       <h3>{{ form.text.label() }}</h3>
       {{ form.text(rows=12) }}
     </div>
+    {{ render_post_actions(form) }}
     {{ render_formbox(form.status, collapsed=false) }}
     {{ render_formbox(form.tags) }}
     <div class="formbox toggleable collapsed">
@@ -46,13 +58,6 @@
       </p>
     {% endif %}
     <div class="post-bookmarklets"></div>
-    <div class="actions">
-      <input type="submit" name="save" value="{{ _('Save') }}">
-      <input type="submit" name="save_and_continue" value="{{ _('Save and continue editing') }}">
-      {%- if not form.new %}
-        <input type="submit" name="delete" value="{{ _('Delete') }}">
-      {%- endif %}
-      <input type="submit" name="cancel" value="{{ _('Cancel') }}">
-    </div>
+    {{ render_post_actions(form) }}
   {% endcall %}
 {% endblock %}
diff -r 067c3aad0df2 zine/utils/admin.py
--- a/zine/utils/admin.py	Mon Apr 06 00:05:01 2009 +0200
+++ b/zine/utils/admin.py	Thu Apr 23 21:54:24 2009 +0300
@@ -29,9 +29,12 @@
 
     The flashes messages appear only in the admin interface!
     """
-    assert type in ('info', 'add', 'remove', 'error', 'ok', 'configure')
+    assert type in \
+        ('info', 'add', 'remove', 'error', 'ok', 'configure', 'warning')
     if type == 'error':
         msg = (u'<strong>%s:</strong> ' % _('Error')) + msg
+    if type == 'warning':
+        msg = (u'<strong>%s:</strong> ' % _('Warning')) + msg
     local.request.session.setdefault('admin/flashed_messages', []).\
             append((type, msg))
 
diff -r 067c3aad0df2 zine/views/admin.py
--- a/zine/views/admin.py	Mon Apr 06 00:05:01 2009 +0200
+++ b/zine/views/admin.py	Thu Apr 23 21:54:24 2009 +0300
@@ -40,6 +40,7 @@
      list_timezones, has_timezone, list_languages, has_language
 from zine.importers import list_import_queue, load_import_dump, \
      delete_import_dump
+from zine.parsers import parse
 from zine.pluginsystem import install_package, InstallationError, \
      SetupError, get_object_name
 from zine.pingback import pingback, PingbackError
@@ -348,6 +349,20 @@
             return form.redirect('admin/manage_entries')
         elif 'delete' in request.form:
             return redirect_to('admin/delete_post', post_id=post.id)
+        elif 'preview' in request.form:
+            form = EntryForm(post, request.form)
+            text = request.form['text']
+            parser = request.form['parser']
+            try:
+                text = parse(text, parser=parser)
+            except ValueError:
+                flash(_('Parser "%s" does not exist. Displaying raw text instead.' % escape(parser)), type='error')
+
+            if not request.form['title']:
+                flash(_('Entry is missing title'), type='warning')
+            return render_admin_response('admin/edit_entry.html', active_tab,
+                                         form=form.as_widget(True),
+                                         text=text)
         elif form.validate(request.form):
             if post is None:
                 post = form.make_post()