[CMF-checkins] CVS: CMF - listc_edit.dtml:1.2.2.1 sic_edit.dtml:1.2.2.1 topic_criteria.dtml:1.1.2.1 topic_edit.dtml:1.2.2.1 topic_subtopics.dtml:1.2.2.1

[Martijn Pieters]

Update of /cvs-repository/CMF/CMFTopic/skins/topic
In directory korak:/tmp/cvs-serv5396/CMFTopic/skins/topic

Modified Files:
      Tag: CMF-1_0-branch
	listc_edit.dtml sic_edit.dtml topic_criteria.dtml 
	topic_edit.dtml topic_subtopics.dtml 
Log Message:
Merge 'getId()' fix from trunk.



--- Updated File listc_edit.dtml in package CMF --
--- listc_edit.dtml	2001/03/01 16:59:06	1.2
+++ listc_edit.dtml	2001/04/09 15:48:04	1.2.2.1
@@ -5,11 +5,11 @@
     name="criterion_ids:list" id="cb_&dtml-getId;">
   </td>
   <td align="left">
-   <label for="cb_&dtml-id;">
+   <label for="cb_&dtml-getId;">
     <strong title="&dtml-Description;">List:</strong>
     <tt>&dtml-Field;</tt>
    </label>
-   <input type="hidden" name="criteria.id:records" value="&dtml-id;">
+   <input type="hidden" name="criteria.id:records" value="&dtml-getId;">
   </td>
  </tr>
  <tr valign="top">

--- Updated File sic_edit.dtml in package CMF --
--- sic_edit.dtml	2001/03/01 16:59:06	1.2
+++ sic_edit.dtml	2001/04/09 15:48:04	1.2.2.1
@@ -5,7 +5,7 @@
     name="criterion_ids:list" id="cb_&dtml-getId;">
   </td>
   <td align="left">
-   <label for="cb_&dtml-id;">
+   <label for="cb_&dtml-getId;">
     <strong title="&dtml-Description;">Integer:</strong> 
     <tt>&dtml-Field;</tt>
    </label>
@@ -27,17 +27,17 @@
    <dtml-let minChecked="direction=='min' and 'checked' or ''"
              maxChecked="direction=='max' and 'checked' or ''"
              minmaxChecked="direction=='min:max' and 'checked' or ''">
-   <input type="radio" name="criteria.direction__&dtml-id;:records"
-    value="min" &dtml-minChecked; id="&dtml-id;_min" /> 
-      <label for="&dtml-id;_min">Minimum</label>
+   <input type="radio" name="criteria.direction__&dtml-getId;:records"
+    value="min" &dtml-minChecked; id="&dtml-getId;_min" /> 
+      <label for="&dtml-getId;_min">Minimum</label>
 
-   <input type="radio" name="criteria.direction__&dtml-id;:records"
-    value="max" &dtml-maxChecked; id="&dtml-id;_max" />
-      <label for="&dtml-id;_max">Maximum</label>
+   <input type="radio" name="criteria.direction__&dtml-getId;:records"
+    value="max" &dtml-maxChecked; id="&dtml-getId;_max" />
+      <label for="&dtml-getId;_max">Maximum</label>
 
-   <input type="radio" name="criteria.direction__&dtml-id;:records" 
-    value="min:max" &dtml-minmaxChecked; id="&dtml-id;_minmax">
-      <label for="&dtml-id;_minmax">Min/Max</label>
+   <input type="radio" name="criteria.direction__&dtml-getId;:records" 
+    value="min:max" &dtml-minmaxChecked; id="&dtml-getId;_minmax">
+      <label for="&dtml-getId;_minmax">Min/Max</label>
    </dtml-let>
   </td>
 </table>

--- Updated File topic_criteria.dtml in package CMF --
--- topic_criteria.dtml	2001/02/28 21:25:20	1.1
+++ topic_criteria.dtml	2001/04/09 15:48:04	1.1.2.1
@@ -4,7 +4,7 @@
 
 <div class="Topic">
 
-<h2> Topic Criteria: &dtml-id; </h2>
+<h2> Topic Criteria: &dtml-getId; </h2>
 
 <form action="&dtml-absolute_url;" method="post">
 

--- Updated File topic_edit.dtml in package CMF --
--- topic_edit.dtml	2001/03/05 16:28:38	1.2
+++ topic_edit.dtml	2001/04/09 15:48:04	1.2.2.1
@@ -4,7 +4,7 @@
 
 <div class="Topic">
 
-<h2> Edit Topic: <dtml-var id> </h2>
+<h2> Edit Topic: <dtml-var getId> </h2>
 
 <form action="&dtml-absolute_url;" method="post">
 <table class="FormLayout">
@@ -13,7 +13,7 @@
   <th align="right"> Title: </th>
   <td><input type="text" name="title" value="&dtml-title;" size="30" /></td>
  </tr>
- <tr valign="top"
+ <tr valign="top">
   <th align="right"> Description: </th>
   <td><textarea name="description:test" rows="5" cols="65"
        >&dtml-Description;</textarea></td>

--- Updated File topic_subtopics.dtml in package CMF --
--- topic_subtopics.dtml	2001/03/02 19:54:34	1.2
+++ topic_subtopics.dtml	2001/04/09 15:48:04	1.2.2.1
@@ -4,7 +4,7 @@
 
 <div class="Topic">
 
-<h2> Topic Subtopics: <dtml-var id> </h2>
+<h2> Topic Subtopics: <dtml-var getId> </h2>
 
 <form action="&dtml-absolute_url;" method="post">
 <table class="FormLayout">
@@ -12,7 +12,7 @@
 <dtml-in listSubtopics>
 
  <tr valign="top">
-  <td> <input type="checkbox" name="ids:list" value="&dtml-id;"> </td>
+  <td> <input type="checkbox" name="ids:list" value="&dtml-getId;"> </td>
   <td> 
    <a href="&dtml-getId;">&dtml-getId;</a>
    <dtml-with buildQuery>