Merge lp:~henninge/wikkid/edit_preview into lp:wikkid

[Henning Eggers]

I added a preview button to the edit page which is quite handy when trying out the markup.

I also fixed a little mixup in the edit form where "message" was referring to two different things and the commit message got lost between reloads.

I did not write any tests but I can still add those. Anything else this branch is missing?

[Tim Penhey (thumper)]

Hi Henning,

Looks pretty good. Why do we have a red message style now?

Nice preview image.

How about a test?

review: Needs Information

[Henning Eggers (henninge)]

Am 25.10.2010 07:27, schrieb Tim Penhey:
> Looks pretty good.

Thanks!

> Why do we have a red message style now?

Well, I missed the message on the screen until I saw in the template that
there should be one. It's just a way to make it more visible. This can still
be improved visually and also let the color indicate severity.

>
> How about a test?

I have started on a view test but missed some infrastructure to simulate post
requests. I started to add that, too, but my first attempt did not work. I
have not yet been able to spend more time on that.

Henning

=== modified file 'wikkid/skin/default/edit.html'
--- wikkid/skin/default/edit.html	2010-06-17 10:45:52 +0000
+++ wikkid/skin/default/edit.html	2010-10-19 21:51:51 +0000
@@ -6,13 +6,22 @@
 {% endif %}
 <form method="post" action="{{ view.save_url }}">
   <textarea name="content">{{ view.content }}</textarea>
-  Describe the change: <input type="text" id="message" name="message" value=""/>
+  Describe the change:
+  <input type="text" id="description" name="description"
+    value="{{ view.description }}" />
   {% if view.rev_id %}
   <input type="hidden" name="rev-id" value="{{ view.rev_id }}"/>
   {% endif %}
   <div class="save-cancel">
-  <input type="Submit" name="action" value="Save" />
+  <input type="Submit" name="save" value="Save" />
+  <input type="Submit" name="preview" value="Preview" />
   or <a href="{{ view.cancel_url }}">Cancel</a>
   </div>
 </form>
+{% if view.preview_content %}
+<hr />
+<div class="preview">
+{{ view.preview_content }}
+</div>
+{% endif %}
 {% endblock %}

=== modified file 'wikkid/skin/default/static/default.css'
--- wikkid/skin/default/static/default.css	2010-07-12 18:22:25 +0000
+++ wikkid/skin/default/static/default.css	2010-10-19 21:51:51 +0000
@@ -99,7 +99,7 @@
     border-top:1px solid #fff;
 }
 
-#message {
+#description {
     width: 76em;
 }
 
@@ -110,6 +110,14 @@
     font-size: 120%;
 }
 
+.message {
+    color: red;
+}
+
+.preview {
+    background-image: url("preview.png");
+}
+
 /***********************************
  *  Fonts
  **********************************/

=== added file 'wikkid/skin/default/static/preview.png'
Binary files wikkid/skin/default/static/preview.png	1970-01-01 00:00:00 +0000 and wikkid/skin/default/static/preview.png	2010-10-19 21:51:51 +0000 differ
=== modified file 'wikkid/view/textfile.py'
--- wikkid/view/textfile.py	2010-06-17 10:45:52 +0000
+++ wikkid/view/textfile.py	2010-10-19 21:51:51 +0000
@@ -11,9 +11,11 @@
 from webob.exc import HTTPSeeOther
 
 from wikkid.errors import UpdateConflicts
+from wikkid.formatter.registry import get_wiki_formatter
 from wikkid.interface.resource import ITextFile
 from wikkid.view.base import BaseView
 from wikkid.view.edit import BaseEditView
+from wikkid.view.wiki import format_content
 
 
 class EditTextFile(BaseEditView):
@@ -38,7 +40,7 @@
                 return byte_string.decode('ascii', 'replace')
 
 
-class SaveNewTextContent(BaseView):
+class SaveNewTextContent(BaseEditView):
     """Update the text of a file."""
 
     name = 'save'
@@ -53,26 +55,31 @@
         # TODO: barf if there is no user.
         params = self.request.params
         content = params['content']
-        message = params['message']
-        if 'rev-id' in params:
-            rev_id = params['rev-id']
+        description = params['description']
+        rev_id = params.get('rev-id', None)
+        preview = params.get('preview', None)
+        if preview is not None:
+            self.rev_id = rev_id
+            self.description = description
+            self.content = content
+            self.preview_content = format_content(
+                content, self.context.base_name)
         else:
-            rev_id = None
-        try:
-            self.context.put_bytes(
-                content, self.user.committer_id, rev_id, message)
-
-            raise HTTPSeeOther(location=self.context.path)
-        except UpdateConflicts, e:
-            # Show the edit page again.
-            logger = logging.getLogger('wikkid')
-            logger.info('Conflicts detected: \n%r\n', e.content)
-            self.template = 'edit_page'
-            self.rev_id = e.basis_rev
-            self.content = e.content
-            self.message = "Conflicts detected during merge."
-            self.cancel_url = self.context.preferred_path
-            return super(SaveNewTextContent, self)._render(skin)
+            try:
+                self.context.put_bytes(
+                    content, self.user.committer_id, rev_id, description)
+
+                raise HTTPSeeOther(location=self.context.path)
+            except UpdateConflicts, e:
+                # Show the edit page again.
+                logger = logging.getLogger('wikkid')
+                logger.info('Conflicts detected: \n%r\n', e.content)
+                self.rev_id = e.basis_rev
+                self.content = e.content
+                self.message = "Conflicts detected during merge."
+
+        self.description = description
+        return super(SaveNewTextContent, self)._render(skin)
 
 
 class UpdateTextFile(SaveNewTextContent):

=== modified file 'wikkid/view/wiki.py'
--- wikkid/view/wiki.py	2010-06-17 10:12:31 +0000
+++ wikkid/view/wiki.py	2010-10-19 21:51:51 +0000
@@ -13,6 +13,17 @@
 from wikkid.view.base import BaseView
 
 
+def format_content(bytes, base_name):
+    """ Format the content with the right formatter.
+
+    Check the first line of the content to see if it specifies a
+    formatter. The default is currently ReST, but we should have it
+    configurable shortly.
+    """
+    content, formatter = get_wiki_formatter(bytes, 'rest')
+    return formatter.format(base_name, content)
+    
+
 class WikiPage(BaseView):
     """A wiki page is a page that is going to be rendered for viewing."""
 
@@ -24,11 +35,7 @@
     @property
     def content(self):
         bytes = self.context.get_bytes()
-        # Check the first line of the content to see if it specifies a
-        # formatter. The default is currently ReST, but we should have it
-        # configurable shortly.
-        content, formatter = get_wiki_formatter(bytes, 'rest')
-        return formatter.format(self.context.base_name, content)
+        return format_content(bytes, self.context.base_name)
 
     def _render(self, skin):
         """If the page is not being viewed with the preferred path, redirect.