[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_content - content_publish_form.pt:1.3 content_reject_form.pt:1.3 content_retract_form.pt:1.3 content_submit_form.pt:1.3 document_edit_form.pt:1.4 file_edit_form.pt:1.3 folder_edit_form.pt:1.3 full_metadata_edit_form.pt:1.3 image_edit_form.pt:1.3 link_edit_form.pt:1.3 metadata_edit_form.pt:1.4 newsitem_edit_form.pt:1.4

[Tres Seaver]

Update of /cvs-repository/CMF/CMFDefault/skins/zpt_content
In directory cvs.zope.org:/tmp/cvs-serv16001/CMFDefault/skins/zpt_content

Modified Files:
	content_publish_form.pt content_reject_form.pt 
	content_retract_form.pt content_submit_form.pt 
	document_edit_form.pt file_edit_form.pt folder_edit_form.pt 
	full_metadata_edit_form.pt image_edit_form.pt 
	link_edit_form.pt metadata_edit_form.pt newsitem_edit_form.pt 
Log Message:
 - Merge fixes for Tracker #468 from branch.

=== CMF/CMFDefault/skins/zpt_content/content_publish_form.pt 1.2 => 1.3 ===
 
 
-<form method="post" action="content_status_modify">
+<form method="post" action="content_status_modify"
+      tal:attributes="action string:${here/absolute_url}/content_status_modify"
+>
   <input type="hidden" name="workflow_action" value="publish">
   <table class="FormLayout">
     <tr>


=== CMF/CMFDefault/skins/zpt_content/content_reject_form.pt 1.2 => 1.3 ===
 
 <h1> Reject <span tal:replace="here/getId">Me</span> </h1>
+
 <p>Use this form to reject the publication of a content item and set its 
    status to <b>Private</b>, thereby making it unavailable to 
    other portal members and visitors.</p>
-<form method="post" action="content_status_modify">
+
+<form method="post" action="content_status_modify"
+      tal:attributes="action string:${here/absolute_url}/content_status_modify"
+>
 <input type="hidden" name="workflow_action" value="reject">
  <table class="FormLayout">
   <tr>


=== CMF/CMFDefault/skins/zpt_content/content_retract_form.pt 1.2 => 1.3 ===
 
 <h1> Retract <span tal:replace="here/getId">Me</span> </h1>
+
 <p>Use this form to retract a content item by setting its 
    status to <b>Private</b>, thereby making it unavailable to
    other portal members and visitors.</p>
 
 
-<form method="post" action="content_status_modify">
+<form method="post" action="content_status_modify"
+      tal:attributes="action string:${here/absolute_url}/content_status_modify"
+>
   <input type="hidden" name="workflow_action" value="retract">
   <table class="FormLayout">
     <tr>


=== CMF/CMFDefault/skins/zpt_content/content_submit_form.pt 1.2 => 1.3 ===
 
 
-<form method="post" action="content_status_modify">
+<form method="post" action="content_status_modify"
+      tal:attributes="action string:${here/absolute_url}/content_status_modify"
+>
  <table class="FormLayout">
   <tr>
    <td valign=top align=left>
@@ -65,4 +67,4 @@
 </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>


=== CMF/CMFDefault/skins/zpt_content/document_edit_form.pt 1.3 => 1.4 ===
 <h2>Edit <span tal:replace="here/getId">ID</span></h2>
 
-<form action="document_edit" method="post" enctype="multipart/form-data">
+<form action="document_edit" method="post" enctype="multipart/form-data"
+      tal:attributes="action string:${here/absolute_url}/document_edit"
+>
 
  <input type="hidden" name="SafetyBelt" value=""
         tal:attributes="value here/SafetyBelt">


=== CMF/CMFDefault/skins/zpt_content/file_edit_form.pt 1.2 => 1.3 ===
 <h2>Edit <span tal:replace="here/id">My ID</span></h2>
 
-<form action="file_edit" method="post" enctype="multipart/form-data">
+<form action="file_edit" method="post" enctype="multipart/form-data"
+      tal:attributes="action string:${here/absolute_url}/file_edit"
+>
 <table class="FormLayout">
 
  <tr>


=== CMF/CMFDefault/skins/zpt_content/folder_edit_form.pt 1.2 => 1.3 ===
 <h2>Edit: <span tal:replace="here/getId">My ID</span></h2>
  
-<form action="folder_edit" method="post">
+<form action="folder_edit" method="post"
+      tal:attributes="action string:${here/absolute_url}/folder_edit"
+>
 <table class="FormLayout">
  
  <tr valign="top">


=== CMF/CMFDefault/skins/zpt_content/full_metadata_edit_form.pt 1.2 => 1.3 ===
 
 <h2>Resource Metadata </h2>
-<form action="metadata_edit" method="post">
+
+<form action="metadata_edit" method="post"
+      tal:attributes="action string:${here/absolute_url}/metadata_edit"
+>
 <table class="FormLayout">
  <tr>
   <th>


=== CMF/CMFDefault/skins/zpt_content/image_edit_form.pt 1.2 => 1.3 ===
 <h2>Edit <span tal:replace="here/getId">My ID</span></h2>
 
-<form action="image_edit" method="post" enctype="multipart/form-data">
+<form action="image_edit" method="post" enctype="multipart/form-data"
+      tal:attributes="action string:${here/absolute_url}/image_edit"
+>
 <table class="FormLayout">
 
  <tr>


=== CMF/CMFDefault/skins/zpt_content/link_edit_form.pt 1.2 => 1.3 ===
 <h2>Edit <span tal:replace="here/getId">My ID</span></h2>
 
-<form action="link_edit" method="post">
+<form action="link_edit" method="post"
+      tal:attributes="action string:${here/absolute_url}/link_edit"
+>
 <table class="FormLayout">
  <tr>
   <th>


=== CMF/CMFDefault/skins/zpt_content/metadata_edit_form.pt 1.3 => 1.4 ===
 <h2>Standard Resource Metadata </h2>
 
-<form action="metadata_edit" method="post">
+<form action="metadata_edit" method="post"
+      tal:attributes="action string:${here/absolute_url}/metadata_edit"
+>
 <table class="FormLayout">
 
  <tr valign="top">


=== CMF/CMFDefault/skins/zpt_content/newsitem_edit_form.pt 1.3 => 1.4 ===
 <h2>Edit <span tal:replace="here/getId">My ID</span></h2>
 
-<form action="newsitem_edit" method="post">
+<form action="newsitem_edit" method="post"
+      tal:attributes="action string:${here/absolute_url}/newsitem_edit"
+>
 <table class="FormLayout">
 
  <tr>