[z3-checkins] r6942 - z3/xicken/trunk/src/xicken

[tseaver at codespeak.net]

Author: tseaver
Date: Fri Oct 15 00:17:00 2004
New Revision: 6942

Modified:
   z3/xicken/trunk/src/xicken/browser.py
   z3/xicken/trunk/src/xicken/content.py
   z3/xicken/trunk/src/xicken/interfaces.py
   z3/xicken/trunk/src/xicken/xicken.css
   z3/xicken/trunk/src/xicken/xicken_macros.pt
   z3/xicken/trunk/src/xicken/xicken_view.pt
Log:
Minor cleanups.

 - Suppress display of 'Xicken CMS' (use site title instead, which does
   not yet have UI for modification).

 - Restore special formatting for errors, and distinguish from "normal"
   message.

 - Give action links IDs (so that we might be able to transform them later).

 - No one-line triple-quoted doctsrings!



Modified: z3/xicken/trunk/src/xicken/browser.py
==============================================================================
--- z3/xicken/trunk/src/xicken/browser.py	(original)
+++ z3/xicken/trunk/src/xicken/browser.py	Fri Oct 15 00:17:00 2004
@@ -96,22 +96,25 @@
         return self.add_status
 
     def removePage(self, page):
-        message = ''
+        message = error = ''
 
         if page == 'FrontPage':
-            message = 'Cannot remove FrontPage'
-
-        if not message:
+            error = 'Cannot remove FrontPage'
+        else:
             try:
                 del self.context[page]
             except KeyError:
-                message = 'Page not found: %s' % page
+                error = 'Page not found: %s' % page
             else:
                 message = 'Page removed: %s' % page
 
-        self.request.response.redirect('%s/FrontPage?message=%s'
-                                        % (self.site_url(), message))
-        return message
+        if error:
+            self.request.response.redirect('%s/FrontPage?error=%s'
+                                            % (self.site_url(), error))
+        else:
+            self.request.response.redirect('%s/FrontPage?message=%s'
+                                            % (self.site_url(), message))
+        return error or message
 
 class XickenPageView(XickenBaseView):
 

Modified: z3/xicken/trunk/src/xicken/content.py
==============================================================================
--- z3/xicken/trunk/src/xicken/content.py	(original)
+++ z3/xicken/trunk/src/xicken/content.py	Fri Oct 15 00:17:00 2004
@@ -17,9 +17,13 @@
 
     __parent__ = __name__ = None
 
+    title = 'Web Site'
+
     def __init__(self):
         super(XickenSite, self).__init__()
         front_page = XickenPage('FrontPage')
+        front_page.title = 'Front Page'
+        front_page.body = 'Enter content here.'
         self['FrontPage'] = front_page
 
 class XickenPage(File):

Modified: z3/xicken/trunk/src/xicken/interfaces.py
==============================================================================
--- z3/xicken/trunk/src/xicken/interfaces.py	(original)
+++ z3/xicken/trunk/src/xicken/interfaces.py	Fri Oct 15 00:17:00 2004
@@ -13,11 +13,13 @@
 _ = MessageIDFactory('xicken')
 
 class IXickenSite(IFolder):
-    """A Xicken Site is a simple CM appliction for creating pages."""
+    """A Xicken Site is a simple CM appliction for creating pages.
+    """
+    title = TextLine(title=_('Site Title'))
 
 class IXickenPage(IFile):
-    """A simple web page."""
-
+    """A simple web page.
+    """
     title = TextLine(title=_('Page Title'))
 
     body = Text(title=_('Page Body'))

Modified: z3/xicken/trunk/src/xicken/xicken.css
==============================================================================
--- z3/xicken/trunk/src/xicken/xicken.css	(original)
+++ z3/xicken/trunk/src/xicken/xicken.css	Fri Oct 15 00:17:00 2004
@@ -37,3 +37,11 @@
     left: 15em;
 }
 
+#error {
+    color: red;
+    font-style: italic;
+}
+
+#message {
+    font-style: italic;
+}

Modified: z3/xicken/trunk/src/xicken/xicken_macros.pt
==============================================================================
--- z3/xicken/trunk/src/xicken/xicken_macros.pt	(original)
+++ z3/xicken/trunk/src/xicken/xicken_macros.pt	Fri Oct 15 00:17:00 2004
@@ -1,30 +1,38 @@
-<html metal:define-macro="xicken" i18n:domain="xicken">
+<html metal:define-macro="xicken"
+      i18n:domain="xicken"
+      tal:define="site view/getSite"
+>
 
 <head>
-    <title> Xicken.CMS </title>
+    <title tal:content="string:${site/title}: ${context/title}"
+    > Xicken CMS </title>
     <link rel="stylesheet" href="/@@/xicken.css" />
 </head>
 
 <body>
 
     <div id="header">
-        <h1> Xicken CMS </h1>
+        <h1 tal:content="site/title"> Xicken CMS </h1>
     </div>
 
     <div id="toolbox">
     <ul>
-        <li><a tal:condition="python: view.__name__ == 'edit.html'"
+        <li id="view_action">
+         <a tal:condition="python: view.__name__ == 'edit.html'"
             tal:attributes="href string:${view/context_url}/@@index.html">
             View
         </a></li>
-        <li><a tal:condition="python: view.__name__ != 'edit.html'"
+        <li id="edit_action">
+         <a tal:condition="python: view.__name__ != 'edit.html'"
             tal:attributes="href string:${view/context_url}/@@edit.html">
             Edit
         </a></li>
-        <li><a tal:attributes="href string:${view/site_url}/@@addPage.html">
+        <li id="add_action">
+         <a tal:attributes="href string:${view/site_url}/@@addPage.html">
             Add
         </a></li>
-        <li><a tal:attributes="href string:${view/site_url}/@@removePage.html?page=${context/__name__}">
+        <li id="remove_action">
+         <a tal:attributes="href string:${view/site_url}/@@removePage.html?page=${context/__name__}">
             Remove 
         </a></li>
     </div>

Modified: z3/xicken/trunk/src/xicken/xicken_view.pt
==============================================================================
--- z3/xicken/trunk/src/xicken/xicken_view.pt	(original)
+++ z3/xicken/trunk/src/xicken/xicken_view.pt	Fri Oct 15 00:17:00 2004
@@ -3,8 +3,13 @@
 
   <div metal:fill-slot="content">
 
+   <p id="error"
+      tal:condition="request/error | nothing"
+      tal:content="request/error" />
+
    <p id="message"
-      tal:content="request/message | default" />
+      tal:condition="request/message | nothing"
+      tal:content="request/message" />
 
    <h1 tal:content="view/context/title"> FRONT PAGE </h1>