[CMF-checkins] CVS: CMF/CMFWiki/skins/zpt_wiki - wiki_recentchanges.pt:1.2.20.1 wikipage_backlinks.pt:1.2.18.1

[Shane Hathaway]

Update of /cvs-repository/CMF/CMFWiki/skins/zpt_wiki
In directory cvs.zope.org:/tmp/cvs-serv27999/CMFWiki/skins/zpt_wiki

Modified Files:
      Tag: cmf-pre-1_3-branch
	wiki_recentchanges.pt wikipage_backlinks.pt 
Log Message:
Merged changes from head, with a small change: the types tool does not need
to be extended in such a complex way.  I took out the type_type registry and
the __bobo_traverse__ hook and replaced it with the original code with only
minor mods that give you the same extensibility without all the hacking.
(If anyone actually wants to use the extensibility, which I suspect no one
is actually interested in doing, I will happily provide instructions and
will create a corrected unit test.)


=== CMF/CMFWiki/skins/zpt_wiki/wiki_recentchanges.pt 1.2 => 1.2.20.1 ===
 >
 
-<p> Most recently changed pages in this CMFWikiWeb.  See also 
+<h3> <em tal:content="here/getId">PageID</em> Changes </h3>
+
+<p> Wiki page changes, most recent to least.  See also 
     <a href="wiki_allpages">All Pages</a>.
 </p>
 
 <table border="0">
 
- <tr>
-  <th align="left">Page</th>
-  <th align="left">Size</th>
-  <th align="left">Last modified</th>
- </tr>
-
- <tr tal:repeat="page pages">
-
-  <td>
-   <a href="PageID"
-      tal:attributes="href page/getId"
-      tal:content="page/getId"
-   >PageID</a>
-  </td>
-  <td align="left" tal:content="page/getSize">
-    1234
-  </td>
-  <td tal:content="python: page.bobobase_modification_time().aCommon()">
-    2001/01/01 08:00:00 CST
-  </td>
- </tr>
+  <tr>
+    <th align="left"> Page </th>
+    <th align="left"> Size </th>
+    <th align="left"> By </th>
+    <th align="left"> Modified </th>
+  </tr>
+
+
+  <tbody tal:repeat="page pages">
+
+    <tr>
+
+     <td>
+      <a href="PageID"
+         tal:attributes="href page/getId"
+         tal:content="page/getId"
+      >PageID</a>
+     </td>
+     <td align="left" tal:content="page/getSize">
+       1234
+     </td>
+     <td tal:content="python: (page.last_editor or page.Creator())[:15]">
+        LAST EDITOR
+     </td>
+     <td tal:content="python: page.bobobase_modification_time().aCommon()">
+       2001/01/01 08:00:00 CST
+     </td>
+    </tr>
+    <tr tal:condition="page/last_log">
+      <td colspan=4>
+        <font color="gray">
+          <span tal:replace="python: page.last_log[:70]"> LAST LOG </span>
+        </font>
+      </td>
+    </tr>
+  </tbody>
 </table>
 
 <p> (<span tal:content="python: len( pages )">123</span> pages) </p>


=== CMF/CMFWiki/skins/zpt_wiki/wikipage_backlinks.pt 1.2 => 1.2.18.1 ===
 <h2> Backlinks and Nesting Information </h2>
 
-<p> <a href="thispage" tal:attributes="href thispage"
+<p> <a href="thispage" tal:attributes="href here/wiki_page_url"
     ><span tal:replace="thispage">thispage</span></a>
     is linked on the following pages:
 </p>
@@ -51,7 +51,8 @@
                               disabled python: not mover">
   </td>
   <td> <a href="../thispage"
-          tal:attributes="href python: '../%s' % link['pageid']"
+          tal:attributes="href python: '%s/%s' % (here.wiki_base_url(),
+                                                  link['pageid'])"
           tal:content="link/pageid"
        >referrer</a>
   </td>