[CMF-checkins] CVS: CMF - document_edit_form.dtml:1.1.2.1 file_edit_form.dtml:1.1.2.1 file_view.dtml:1.1.2.1 folder_edit_form.dtml:1.2.2.1 image_edit_form.dtml:1.1.2.1 link_edit_form.dtml:1.1.2.1 newsitem_edit_form.dtml:1.1.2.1

[Martijn Pieters]

Update of /cvs-repository/CMF/CMFDefault/skins/content
In directory korak:/tmp/cvs-serv5396/CMFDefault/skins/content

Modified Files:
      Tag: CMF-1_0-branch
	document_edit_form.dtml file_edit_form.dtml file_view.dtml 
	folder_edit_form.dtml image_edit_form.dtml link_edit_form.dtml 
	newsitem_edit_form.dtml 
Log Message:
Merge 'getId()' fix from trunk.



--- Updated File document_edit_form.dtml in package CMF --
--- document_edit_form.dtml	2001/02/23 14:24:09	1.1
+++ document_edit_form.dtml	2001/04/09 15:48:02	1.1.2.1
@@ -9,7 +9,7 @@
 
 <div class="Document">
 
-<h2>Edit &dtml-id;</h2>
+<h2>Edit &dtml-getId;</h2>
 
 <form action="document_edit" method="post" enctype="multipart/form-data">
 <table class="FormLayout">

--- Updated File file_edit_form.dtml in package CMF --
--- file_edit_form.dtml	2001/02/23 14:24:09	1.1
+++ file_edit_form.dtml	2001/04/09 15:48:02	1.1.2.1
@@ -9,7 +9,7 @@
 
 <div class="File">
 
-<h2>Edit &dtml-id;</h2>
+<h2>Edit &dtml-getId;</h2>
 
 <form action="file_edit" method="post" enctype="multipart/form-data">
 <table class="FormLayout">

--- Updated File file_view.dtml in package CMF --
--- file_view.dtml	2001/02/23 14:24:09	1.1
+++ file_view.dtml	2001/04/09 15:48:02	1.1.2.1
@@ -7,7 +7,7 @@
 <dtml-var content_byline>
 
 <p>
-<b>Filename</b>: <dtml-var id><br>
+<b>Filename</b>: <dtml-var getId><br>
 <b>Size</b>: <dtml-var size><br>
 <b>Content type</b>: <dtml-var content_type><br>
 <b>Description</b>: <dtml-var name="description" newline_to_br>

--- Updated File folder_edit_form.dtml in package CMF --
--- folder_edit_form.dtml	2001/03/04 22:29:04	1.2
+++ folder_edit_form.dtml	2001/04/09 15:48:02	1.2.2.1
@@ -9,7 +9,7 @@
  
 <div class="File">
  
-<h2>Edit &dtml-id;</h2>
+<h2>Edit &dtml-getId;</h2>
  
 <form action="folder_edit" method="post">
 <table class="FormLayout">

--- Updated File image_edit_form.dtml in package CMF --
--- image_edit_form.dtml	2001/02/23 14:24:09	1.1
+++ image_edit_form.dtml	2001/04/09 15:48:02	1.1.2.1
@@ -9,7 +9,7 @@
 
 <div class="Image">
 
-<h2>Edit &dtml-id;</h2>
+<h2>Edit &dtml-getId;</h2>
 
 <form action="image_edit" method="post" enctype="multipart/form-data">
 <table class="FormLayout">

--- Updated File link_edit_form.dtml in package CMF --
--- link_edit_form.dtml	2001/02/23 14:24:09	1.1
+++ link_edit_form.dtml	2001/04/09 15:48:02	1.1.2.1
@@ -9,7 +9,7 @@
 
 <div class="Link">
 
-<h2>Edit &dtml-id;</h2>
+<h2>Edit &dtml-getId;</h2>
 
 <form action="link_edit" method="post">
 <table class="FormLayout">

--- Updated File newsitem_edit_form.dtml in package CMF --
--- newsitem_edit_form.dtml	2001/02/23 14:24:09	1.1
+++ newsitem_edit_form.dtml	2001/04/09 15:48:02	1.1.2.1
@@ -9,7 +9,7 @@
 
 <div class="NewsItem">
 
-<h2>Edit &dtml-id;</h2>
+<h2>Edit &dtml-getId;</h2>
 
 <form action="newsitem_edit" method="post">
 <table class="FormLayout">