[CMF-checkins] CVS: CMF - discussion_reply_form.dtml:1.4 discussion_reply_preview.dtml:1.4 showThreads.dtml:1.5 viewThreadsAtBottom.dtml:1.2

[tseaver@digicool.com]

Update of /cvs-repository/CMF/CMFDefault/skins/generic
In directory korak.digicool.com:/tmp/cvs-serv28068/CMFDefault/skins/generic

Modified Files:
	discussion_reply_form.dtml discussion_reply_preview.dtml 
	showThreads.dtml viewThreadsAtBottom.dtml 
Log Message:
 - Merge 'discussiongeddon' patch.


--- Updated File discussion_reply_form.dtml in package CMF --
--- discussion_reply_form.dtml	2001/04/08 19:18:20	1.3
+++ discussion_reply_form.dtml	2001/06/17 19:21:06	1.4
@@ -27,7 +27,7 @@
   <td></td>
   <td>
    <input type="submit" value="Preview" name="&dtml-getId;/discussion_reply_preview:method">
-   <input type="submit" value="Reply" name="createReply:method">
+   <input type="submit" value="Reply" name="discussion_reply:method">
   </td>
  </tr>
 </table>

--- Updated File discussion_reply_preview.dtml in package CMF --
--- discussion_reply_preview.dtml	2001/04/08 19:18:20	1.3
+++ discussion_reply_preview.dtml	2001/06/17 19:21:06	1.4
@@ -21,7 +21,7 @@
   <td>
    <input type="submit" value="Edit"
           name="&dtml-getId;/discussion_reply_form:method">
-   <input type="submit" value="Reply" name="createReply:method">
+   <input type="submit" value="Reply" name="discussion_reply:method">
   </td>
  </tr></table>
 </form>

--- Updated File showThreads.dtml in package CMF --
--- showThreads.dtml	2001/05/25 17:46:04	1.4
+++ showThreads.dtml	2001/06/17 19:21:06	1.5
@@ -2,33 +2,18 @@
  showThreads.dtml 
  Generate a simple tree view of message threads to include on a page.
 </dtml-comment>
+<!-- showThreads -->
 
-<dtml-if "_.hasattr(this().talkback, 'parentsInThread') and talkback.parentsInThread(1)">
- Above in thread:
- <dtml-if "_.len(this().talkback.parentsInThread()) > 5">... :</dtml-if>
- <dtml-in "talkback.parentsInThread(5)">
-  <a href="&dtml-absolute_url;">&dtml-title;</a>
-  <dtml-unless sequence-end>:</dtml-unless>
- </dtml-in>
- <p>
-</dtml-if>
-
+<dtml-comment>
+  The following lamosity brought to you courtesy of the tree tag,
+  which has to use the 'URL' value from the MD.
+</dtml-comment>
 <dtml-let URL=absolute_url>
-<dtml-if expr="PARENTS[0].meta_type == 'Discussion Item'">
- Replies:
-  <dtml-tree branches="getReplies">
-   <a href="&dtml-absolute_url;"><img border=0 src="<dtml-var SCRIPT_NAME><dtml-var getIcon>"></a>
-   <a href="&dtml-absolute_url;">&dtml-title;</a>,
-   by <dtml-var Creator>
-   on <dtml-var Date>
-  </dtml-tree>
-<dtml-else>
-  <dtml-tree name="talkback" branches="getReplies">
-   <a href="&dtml-absolute_url;"><img border=0 src="<dtml-var SCRIPT_NAME><dtml-var getIcon>"></a>
-   <a href="&dtml-absolute_url;">&dtml-title;</a>,
-   by <dtml-var Creator>
-   on <dtml-var Date>
-  </dtml-tree>
-</dtml-if>
+<dtml-tree branches_expr="talkback.getReplies()">
+ <a href="&dtml-absolute_url;"
+ ><img border=0 src="&dtml-portal_url;/&dtml-getIcon;"></a>
+ <a href="&dtml-absolute_url;">&dtml-Title;</a>,
+ by <dtml-var Creator>
+ on <dtml-var CreationDate>
+</dtml-tree>
 </dtml-let>
-

--- Updated File viewThreadsAtBottom.dtml in package CMF --
--- viewThreadsAtBottom.dtml	2001/02/23 14:24:10	1.1
+++ viewThreadsAtBottom.dtml	2001/06/17 19:21:06	1.2
@@ -4,10 +4,13 @@
  really should be defined by an acquired property or some such...
 </dtml-comment>
 
-<dtml-if expr="_.hasattr(this(), 'talkback')">
-  <dtml-if expr="talkback.hasReplies()">
-    <h4>Comments:</h4>
+<!-- viewThreadsAtBottom -->
+
+<dtml-if talkback>
 
+    <dtml-if expr="talkback.hasReplies()">
+    <h4>Comments:</h4>
     <dtml-var showThreads>
-  </dtml-if>
+    </dtml-if>
+
 </dtml-if>