[CMF-checkins] CVS: CMF - actions_box.dtml:1.5 discussion_reply_form.dtml:1.3 discussion_reply_preview.dtml:1.3 folder_contents.dtml:1.4 folder_rename_form.dtml:1.3

[Martijn Pieters]

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

Modified Files:
	actions_box.dtml discussion_reply_form.dtml 
	discussion_reply_preview.dtml folder_contents.dtml 
	folder_rename_form.dtml 
Log Message:
Fix for issue PTK(241)[]: use of .id instead of getId().

- Replace all usage of SimpleItem.id with SimpleItem.getId(). Hold on to
  your butts! I am pretty sure that I didn't miss anything and that I didn't
  break anything, but you never know.

- Remove surplus > from CMFDefault/dtml/discussionEdit.dtml.

- Add missing > to CMFTopic/skins/topic/topic_edit.dtml, this fixes the ugly
  layout.



--- Updated File actions_box.dtml in package CMF --
--- actions_box.dtml	2001/03/29 23:52:12	1.4
+++ actions_box.dtml	2001/04/08 19:18:20	1.5
@@ -40,7 +40,7 @@
   <td class="ActionTitle">
    <dtml-let icon="_.getattr(obj, 'icon', '')"
              typ="_.getattr(obj, 'Type', '')"
-             objID="obj.id"
+             objID="obj.getId()"
    >
      <dtml-if icon>
      <img src="&dtml-BASEPATH1;/&dtml-icon;" align="left" alt="&dtml-typ;" />

--- Updated File discussion_reply_form.dtml in package CMF --
--- discussion_reply_form.dtml	2001/03/23 02:11:55	1.2
+++ discussion_reply_form.dtml	2001/04/08 19:18:20	1.3
@@ -26,7 +26,7 @@
  <tr>
   <td></td>
   <td>
-   <input type="submit" value="Preview" name="&dtml-id;/discussion_reply_preview:method">
+   <input type="submit" value="Preview" name="&dtml-getId;/discussion_reply_preview:method">
    <input type="submit" value="Reply" name="createReply:method">
   </td>
  </tr>

--- Updated File discussion_reply_preview.dtml in package CMF --
--- discussion_reply_preview.dtml	2001/03/28 22:13:00	1.2
+++ discussion_reply_preview.dtml	2001/04/08 19:18:20	1.3
@@ -20,7 +20,7 @@
   <td width="15%"></td>
   <td>
    <input type="submit" value="Edit"
-          name="&dtml-id;/discussion_reply_form:method">
+          name="&dtml-getId;/discussion_reply_form:method">
    <input type="submit" value="Reply" name="createReply:method">
   </td>
  </tr></table>

--- Updated File folder_contents.dtml in package CMF --
--- folder_contents.dtml	2001/03/13 22:20:09	1.3
+++ folder_contents.dtml	2001/04/08 19:18:20	1.4
@@ -39,7 +39,7 @@
      <dtml-if "portal_membership.checkPermission( 'Access contents information'
                                                 , this(), 'aq_parent')">
       <dtml-let upNav="_.hasattr(this().aq_parent, 'portal_url')"
-                upID="this().aq_parent.id"
+                upID="this().aq_parent.getId()"
       >
       <tr valign="top">
       <td width="16"><br></td>
@@ -64,7 +64,7 @@
 
 <dtml-in expr="contentValues(filter=decodeFolderFilter(
          REQUEST.get('folderfilter', '')))"
-         sort="id" size="19" start=qs skip_unauthorized>
+         sort="getId" size="19" start=qs skip_unauthorized>
  <dtml-if next-sequence>
   <dtml-call "REQUEST.set('next-sequence'
                          , _['next-sequence-start-number'])">
@@ -83,19 +83,19 @@
  >
      <tr valign="top">
       <td>
-         <input type="checkbox" name="ids:list" value="&dtml-id;"
-          id="cb_&dtml-id;" />
+         <input type="checkbox" name="ids:list" value="&dtml-getId;"
+          id="cb_&dtml-getId;" />
       </td>
       <td>
          <dtml-if icon>
-         <a href="&dtml.url_quote-id;&dtml-methodID;"
+         <a href="&dtml.url_quote-getId;&dtml-methodID;"
           ><img src="&dtml-BASEPATH1;/&dtml-icon;"
                 alt="&dtml-Type;" border="0"></a> 
          </dtml-if>
       </td>
       <td>
-         <a href="&dtml.url_quote-id;&dtml-methodID;"
-           >&dtml-id;<dtml-if title> (&dtml-title;)</dtml-if></a>
+         <a href="&dtml.url_quote-getId;&dtml-methodID;"
+           >&dtml-getId;<dtml-if title> (&dtml-title;)</dtml-if></a>
       </td>
      </tr>
 

--- Updated File folder_rename_form.dtml in package CMF --
--- folder_rename_form.dtml	2001/03/02 20:16:45	1.2
+++ folder_rename_form.dtml	2001/04/08 19:18:20	1.3
@@ -16,7 +16,7 @@
   </dtml-if>
   </TD>
   <TD ALIGN="LEFT" VALIGN="TOP">
-  <dtml-var id>
+  <dtml-var getId>
   </TD>
 </TR>
 <TR>
@@ -24,13 +24,13 @@
   <STRONG>to:</STRONG>
   </TD>
   <TD ALIGN="LEFT" VALIGN="TOP">
-  <INPUT TYPE="TEXT" NAME="new_id" value="&dtml-id;" SIZE="20">
+  <INPUT TYPE="TEXT" NAME="new_id" value="&dtml-getId;" SIZE="20">
   </TD>
 </TR>
 <TR>
 <TD></TD>
 <TD>
-  <INPUT TYPE="HIDDEN" NAME="id" VALUE="&dtml-id;">
+  <INPUT TYPE="HIDDEN" NAME="id" VALUE="&dtml-getId;">
   <INPUT TYPE="submit" VALUE=" Ok ">
 </TD>
 </TR>
@@ -38,7 +38,7 @@
 </FORM>
 <dtml-else>
 <FORM ACTION="folder_contents" METHOD="GET">
-<p>The item <EM>&dtml-id;</EM> does not support this operation.</P>
+<p>The item <EM>&dtml-getId;</EM> does not support this operation.</P>
 <INPUT TYPE="submit" NAME="submit" VALUE=" Ok ">
 </FORM>
 </dtml-if>