[CMF-checkins] CVS: CMF - actions_box.dtml:1.6 discussion_thread_view.dtml:1.2 folder_contents.dtml:1.5 folder_rename_form.dtml:1.4 search.dtml:1.4 showThreads.dtml:1.2

[Martijn Pieters]

Update of /cvs-repository/CMF/CMFDefault/skins/generic
In directory korak:/tmp/cvs-serv6594/CMFDefault/skins/generic

Modified Files:
	actions_box.dtml discussion_thread_view.dtml 
	folder_contents.dtml folder_rename_form.dtml search.dtml 
	showThreads.dtml 
Log Message:
Merge getId changes from branch.



--- Updated File actions_box.dtml in package CMF --
--- actions_box.dtml	2001/04/08 19:18:20	1.5
+++ actions_box.dtml	2001/04/09 20:21:06	1.6
@@ -38,7 +38,8 @@
 <dtml-if object_actions>
  <tr class="&dtml-AuthClass;">
   <td class="ActionTitle">
-   <dtml-let icon="_.getattr(obj, 'icon', '')"
+   <dtml-let getIcon="_.hasattr(obj, 'getIcon') and obj.getIcon()"
+             icon="getIcon or _.getattr(obj, 'icon', '')"
              typ="_.getattr(obj, 'Type', '')"
              objID="obj.getId()"
    >

--- Updated File discussion_thread_view.dtml in package CMF --
--- discussion_thread_view.dtml	2001/02/23 14:24:09	1.1
+++ discussion_thread_view.dtml	2001/04/09 20:21:06	1.2
@@ -12,7 +12,7 @@
 </dtml-if>
 
 <dtml-tree branches="getReplies">
- <a href="&dtml-absolute_url;"><img border=0 src="<dtml-var SCRIPT_NAME><dtml-var icon>"></a>
+ <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>

--- Updated File folder_contents.dtml in package CMF --
--- folder_contents.dtml	2001/04/08 19:18:20	1.4
+++ folder_contents.dtml	2001/04/09 20:21:06	1.5
@@ -79,7 +79,8 @@
                      and obj.isPortalContent"
            methodID="folderish and '/folder_contents' or ( portalish
                      and '/view' or '' )"
-           icon="_.getattr(obj, 'icon', 0)"
+           getIcon="_.hasattr(obj, 'getIcon') and obj.getIcon()"
+           icon="getIcon or _.getattr(obj, 'icon', '')"
  >
      <tr valign="top">
       <td>

--- Updated File folder_rename_form.dtml in package CMF --
--- folder_rename_form.dtml	2001/04/08 19:18:20	1.3
+++ folder_rename_form.dtml	2001/04/09 20:21:06	1.4
@@ -11,9 +11,11 @@
 <TABLE class="FormLayout">
 <TR>
   <TD ALIGN="LEFT" VALIGN="TOP">
+  <dtml-let getIcon="_.hasattr(this(), 'getIcon') and getIcon()"
+            icon="getIcon or _.getattr(this(), 'icon', '')">
   <dtml-if icon>
   <IMG SRC="&dtml-BASEPATH1;/&dtml-icon;" ALT="" BORDER="0">
-  </dtml-if>
+  </dtml-if></dtml-let>
   </TD>
   <TD ALIGN="LEFT" VALIGN="TOP">
   <dtml-var getId>

--- Updated File search.dtml in package CMF --
--- search.dtml	2001/03/02 20:16:45	1.3
+++ search.dtml	2001/04/09 20:21:06	1.4
@@ -26,9 +26,10 @@
  </dtml-if>
 
  <tr>
-  <td><dtml-if icon>
+  <td>
+   <dtml-if getIcon>
    <a href="&dtml-objURL;"><img
-    src="&dtml-BASEPATH1;/&dtml-icon;" border="0"
+    src="&dtml-BASEPATH1;/&dtml-getIcon;" border="0"
     alt="[&dtml.missing-Type;]"
     title="[&dtml.missing-Type;]"></a>
    </dtml-if>

--- Updated File showThreads.dtml in package CMF --
--- showThreads.dtml	2001/02/23 14:24:10	1.1
+++ showThreads.dtml	2001/04/09 20:21:06	1.2
@@ -14,14 +14,14 @@
 
 <dtml-if expr="PARENTS[0].meta_type == 'Discussion Item'">
   <dtml-tree name="id" branches="getReplies">
-   <a href="&dtml-absolute_url;"><img border=0 src="<dtml-var SCRIPT_NAME><dtml-var icon>"></a>
+   <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 icon>"></a>
+   <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>