Merge lp:~beuno/wikkid/fixes-on-a-plane into lp:wikkid

[Martin Albisetti]

I did a bunch of stuff on the plane:

* Edit pages now show a better title
* Added a test for the new edit page titles
* A few layout tweaks to the editing page
* Show a clickable URL when starting up

[Paul Hummer (rockstar)]

These changes look good. I see your comment about setting the host. Yes, in my paste branch, we'll be able to set the host. Unfortunately, I need to fiddle more with it before I'm ready to propose for merge myself (and fiddle with it a lot).

Anyway, back from that tangent, these changes look good to me.

review: Approve

[Tim Penhey (thumper)]

 review approve

Hi Martin,

My only extra suggestion would be to use the expanded wiki name instead of the
base name for the edit title.

Tim

review: Approve

[lp:~beuno/wikkid/fixes-on-a-plane]

42. By Martin Albisetti on 2010-06-01

Use expanded wiki name instead of the plain base name, per Tim's suggestion.

[Martin Albisetti (beuno)]

> My only extra suggestion would be to use the expanded wiki name instead of the
> base name for the edit title.

Great idea, done.

Should I go ahead and land this?

[Tim Penhey (thumper)]

I've merged it into trunk and fixed your now failing test :)

=== modified file 'wikkid/skin/default/edit.html'
--- wikkid/skin/default/edit.html	2010-05-19 10:00:43 +0000
+++ wikkid/skin/default/edit.html	2010-06-01 05:22:22 +0000
@@ -6,12 +6,12 @@
 {% endif %}
 <form method="post" action="{{ view.request_path }}">
   <textarea name="content">{{ view.content }}</textarea>
-  Describe the change: <input type="text" name="message" value=""/>
+  Describe the change: <input type="text" id="message" name="message" value=""/>
   {% if view.rev_id %}
   <input type="hidden" name="rev-id" value="{{ view.rev_id }}"/>
   {% endif %}
-  <div>
-  <input type="Submit" name="action" value="save" />
+  <div class="save-cancel">
+  <input type="Submit" name="action" value="Save" />
   or <a href="{{ view.cancel_url }}">Cancel</a>
   </div>
 </form>

=== modified file 'wikkid/skin/default/static/default.css'
--- wikkid/skin/default/static/default.css	2010-05-25 22:12:26 +0000
+++ wikkid/skin/default/static/default.css	2010-06-01 05:22:22 +0000
@@ -59,9 +59,10 @@
     clear:both;
     visibility:hidden;
 }
-/* -----------------------
-Page layout
------------------------ */
+
+/*********************************************
+ * Page layout
+*********************************************/
 #container {
     width:100%;
     color:#333;
@@ -98,6 +99,16 @@
     border-top:1px solid #fff;
 }
 
+#message {
+    width: 76em;
+}
+
+.save-cancel {
+    margin: 1em 0 2em 0;
+}
+.save-cancel input {
+    font-size: 120%;
+}
 
 /***********************************
  *  Fonts

=== modified file 'wikkid/tests/views/__init__.py'
--- wikkid/tests/views/__init__.py	2010-05-12 10:39:13 +0000
+++ wikkid/tests/views/__init__.py	2010-06-01 05:22:22 +0000
@@ -13,6 +13,7 @@
     names = [
         'breadcrumbs',
         'utils',
+        'edit',
         ]
     module_names = ['wikkid.tests.views.test_' + name for name in names]
     loader = unittest.TestLoader()

=== added file 'wikkid/tests/views/test_edit.py'
--- wikkid/tests/views/test_edit.py	1970-01-01 00:00:00 +0000
+++ wikkid/tests/views/test_edit.py	2010-06-01 05:22:22 +0000
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2010 Wikkid Developers.
+#
+# This software is licensed under the GNU Affero General Public License
+# version 3 (see the file LICENSE).
+
+"""Tests the edit views."""
+
+from wikkid.dispatcher import get_view
+from wikkid.tests.factory import FactoryTestCase
+from wikkid.tests.fakes import TestRequest, TestUser
+
+
+class TestEdit(FactoryTestCase):
+    """Test the edit view."""
+
+    def setUp(self):
+        super(TestEdit, self).setUp()
+        self.user = TestUser('[e-mail]', 'Test User')
+        self.request = TestRequest()
+
+    def test_title_nexted(self):
+        """Test that a nested page returns the expected title"""
+        factory = self.make_factory([
+                ('SomePage/SubPage/Nested.txt', 'some text')])
+        info = factory.get_resource_at_path('/SomePage/SubPage')
+        view = get_view(info, 'edit', self.request, self.user)
+        self.assertEqual('Editing "SubPage"', view.title)
+

=== modified file 'wikkid/twistedserver.py'
--- wikkid/twistedserver.py	2010-05-12 10:39:13 +0000
+++ wikkid/twistedserver.py	2010-06-01 05:22:22 +0000
@@ -78,7 +78,8 @@
         self.skin = Skin(skin_name)
 
     def run(self):
-        self.logger.info('Listening on port %d' % self.port)
+        # Is there anyway to set the host?
+        self.logger.info('Wiki instance running at http://localhost:%d' % self.port)
         root = TwistedPage(
             self.resource_factory, self.logger, self.user_factory, self.skin)
         if self.skin.favicon is not None:

=== modified file 'wikkid/view/edit.py'
--- wikkid/view/edit.py	2010-05-19 10:00:43 +0000
+++ wikkid/view/edit.py	2010-06-01 05:22:22 +0000
@@ -7,6 +7,7 @@
 """View base class for editing text pages."""
 
 from wikkid.view.base import BaseView
+from wikkid.view.utils import expand_wiki_name
 
 
 class BaseEditView(BaseView):
@@ -16,6 +17,10 @@
     template = 'edit_page'
 
     @property
+    def title(self):
+        return 'Editing "%s"' % expand_wiki_name(self.context.base_name)
+
+    @property
     def cancel_url(self):
         """The link for the cancel button."""
         return self.context.preferred_path