Thu, 6 Dec 2001 17:44:14 -0500

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

Added Files:
	content_publish_form.pt content_reject_form.pt 
	content_retract_form.pt content_status_history.pt 
	content_submit_form.pt discussionitem_view.pt 
	document_edit_form.pt document_view.pt favorite_view.pt 
	file_edit_form.pt file_view.pt folder_edit_form.pt 
	full_metadata_edit_form.pt image_edit_form.pt image_view.pt 
	link_edit_form.pt link_view.pt metadata_edit_form.pt 
	newsitem_edit_form.pt newsitem_view.pt subjectsList.py 
Log Message:
 - Recover from CVS weirdness in moving ZPT skins to CMFDefault.

=== CMF/CMFDefault/skins/zpt_content/content_publish_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">
+<div class="Desktop"
+     tal:define="review_state python: here.portal_workflow.getInfoFor(here, 'review_state');
+	 review_history python: here.portal_workflow.getInfoFor(here, 'review_history')">
+
+
+<h1> Publish <span tal:replace="here/getId">Item</span></h1>
+
+<p>A <b>published</b> item is available to the general
+   member base and anonymous visitors.</p>
+
+<p>Another way to control the visibility of an item is with its <b>effective
+   date</b>.  An item is not publicly available before its effective date,
+   <em>even if its status is <b>published</b></em>.</p>
+
+
+<form method="post" action="content_status_modify">
+  <input type="hidden" name="workflow_action" value="publish">
+  <table class="FormLayout">
+    <tr>
+     <td valign=top align=left>
+       <strong>Status</strong>
+     </td>
+     <td valign=top align=left>
+       This item is currently in <b><span tal:replace="review_state">Private</span></b> status.
+     </td>
+   </tr>
+   <tr>
+     <td valign=top align=left colspan=2>
+      <strong><em>Comments</em></strong><br>
+      <textarea name="comment" cols="60" rows="5" wrap="soft"
+                style="width: 100%"></textarea>
+     </td>
+   </tr>
+   <tr>
+     <td colspan="2"><input type="submit" value=" Publish this Item "></td>
+   </tr>
+  </table>
+</form>
+
+<div tal:condition="review_history">
+      <p><strong>Reviewing history</strong>
+	  <br>
+    <div tal:repeat="items python: here.reverseList(review_history)">
+	<span tal:replace="python: items['time'].aCommon()" />
+	<span tal:replace="items/action" />
+  <span tal:condition="items/effective_date|nothing">
+  (effective: <span tal:replace="python: items['effective_date'].aCommon()"></span>)
+  </span>
+  
+  by <span tal:replace="items/actor">Actor</span><br>
+   <div tal:define="rhComments items/comments"
+		 tal:replace="rhComments">Comments</div>
+ </div>
+ </div>
+</div>
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/content_reject_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">
+<div class="Desktop"
+     tal:define="review_state python: here.portal_workflow.getInfoFor(here, 'review_state');
+	 review_history python: here.portal_workflow.getInfoFor(here, 'review_history')">
+
+
+<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">
+<input type="hidden" name="workflow_action" value="reject">
+ <table class="FormLayout">
+  <tr>
+   <td valign=top align=left>
+    <strong>Status</strong>
+   </td>
+   <td valign=top align=left>
+     This item is currently in <b><span tal:replace="review_state">Private</span></b> status.
+   </td>
+  </tr>
+  <tr>
+   <td valign=top align=left colspan=2>
+    <strong><em>Comments</em></strong><br>
+    <textarea name="comment" cols="60" rows="5" wrap="soft"
+              style="width: 100%"></textarea>
+   </td>
+  </tr>
+  <tr>
+   <td colspan="2"><input type="submit" value=" Reject this Item "></td>
+  </tr>
+ </table>
+</form>
+
+<div tal:condition="review_history|nothing">
+      <p><strong>Reviewing history</strong>
+	  <br>
+    <div tal:repeat="items python: here.reverseList(review_history)">
+	<span tal:replace="python: items['time'].aCommon()" />
+	<span tal:replace="items/action" />
+  <span tal:condition="items/effective_date|nothing">
+  (effective: <span tal:replace="python: items['effective_date'].aCommon()"></span>)
+  </span>
+  
+  by <span tal:replace="items/actor">Actor</span><br>
+   <div tal:define="rhComments items/comments"
+		 tal:replace="rhComments">Comments</div>
+ </div>
+ </div>
+</div>
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/content_retract_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">
+<div class="Desktop"
+     tal:define="review_state python: here.portal_workflow.getInfoFor(here, 'review_state');
+	 review_history python: here.portal_workflow.getInfoFor(here, 'review_history')">
+
+
+<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">
+  <input type="hidden" name="workflow_action" value="retract">
+  <table class="FormLayout">
+    <tr>
+     <td valign=top align=left>
+      <strong>Status</strong>
+     </td>
+     <td valign=top align=left>
+       This item is currently in <b><span tal:replace="review_state">Private</span></b> status.
+	 </td>
+   </tr>
+   <tr>
+     <td valign=top align=left colspan=2>
+      <strong><em>Comments</em></strong><br>
+      <textarea name="comment" cols="60" rows="5" wrap="soft"
+                style="width: 100%"></textarea>
+     </td>
+   </tr>
+   <tr>
+    <td colspan="2"><input type="submit" value=" Retract this Item "></td>
+   </tr>
+  </table>
+</form>
+<div tal:condition="review_history|nothing">
+      <p><strong>Reviewing history</strong>
+	  <br>
+    <div tal:repeat="items python: here.reverseList(review_history)">
+	<span tal:replace="python: items['time'].aCommon()" />
+	<span tal:replace="items/action" />
+  <span tal:condition="items/effective_date|nothing">
+  (effective: <span tal:replace="python: items['effective_date'].aCommon()"></span>)
+  </span>
+  
+  by <span tal:replace="items/actor">Actor</span><br>
+   <div tal:define="rhComments items/comments"
+		 tal:replace="rhComments">Comments</div>
+ </div>
+ </div>
+</div>
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/content_status_history.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">
+<div class="Desktop"
+     tal:define="review_state python: here.portal_workflow.getInfoFor(here, 'review_state');
+	 review_history python: here.portal_workflow.getInfoFor(here, 'review_history')">
+<h1>Content Item status history</h1>
+
+<div>An item's status (also called its review state) determines who can see it.
+   A <b>private</b> item can only be viewed by its Owner and by the site
+   management.  Only <b>published</b> items are available to the general
+   member base and anonymous visitors.  To make an item published, it
+   has to be reviewed by one of the site's Reviewers.  You can request
+   that an item be reviewed by setting its status to <b>pending</b>.</div>
+
+<div>Another way to control the visibility of an item is with its <b>effective
+   date</b>.  An item is not publicly available before its effective date,
+   <em>even if its status is <b>published</b></em>.</div>
+
+<h2>Current state</h2>
+This item is in <b><span tal:replace="review_state">Private</span></b> state.
+
+<div tal:condition="review_history|nothing">
+      <h3><strong>Reviewing history</strong></h3>
+    <div tal:repeat="items python: here.reverseList(review_history)">
+	  <span tal:replace="python: items['time'].aCommon()" />
+	  <span tal:replace="items/action" />
+      <span tal:condition="items/effective_date|nothing">
+        (effective: <span tal:replace="python: items['effective_date'].aCommon()"></span>)
+      </span>
+     by <span tal:replace="items/actor">Actor</span><br>
+      <div tal:define="rhComments items/comments"
+		 tal:replace="rhComments">Comments</div>
+    </div>
+</div>
+<div tal:condition="python: not(review_history)">This item has not had any status changes.</div>
+ </div>
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/content_submit_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">
+<div class="Desktop"
+     tal:define="member python: here.portal_membership.getAuthenticatedMember(); 
+     review_state python: here.portal_workflow.getInfoFor(here, 'review_state');
+	 review_history python: here.portal_workflow.getInfoFor(here, 'review_history')">
+
+
+<h1> Submit <span tal:replace="here/getId">Me</span> for Review </h1>
+<span tal:replace="request/message"
+   tal:condition="message|nothing"><hr></span>
+
+<p>To make an item published, it
+   has to be reviewed by one of the site's reviewers. 
+   A <b>published</b> item is available to the general
+   member base and anonymous visitors.</p>
+
+<p>Another way to control the visibility of an item is with its <b>effective
+   date</b>.  An item is not publicly available before its effective date,
+   <em>even if its status is <b>published</b></em>.</p>
+
+
+<form method="post" action="content_status_modify">
+ <table class="FormLayout">
+  <tr>
+   <td valign=top align=left>
+    <strong>Status</strong>
+   </td>
+   <td valign=top align=left>
+     This item is currently in <b><span tal:replace="review_state">Private</span></b> status.
+     <input type="hidden" name="workflow_action" value="submit">
+   </td>
+  </tr>
+  <tr>
+   <td valign=top align=left colspan=2>
+    <strong><em>Comments</em></strong><br>
+    <textarea name="comment" cols="60" rows="5" wrap="soft"
+     style="width: 100%"></textarea>
+   </td>
+  </tr>
+  <tr>
+   <td></td>
+   <td><input type="submit" value=" Submit Item "></td>
+  </tr>
+ </table>
+</form>
+<div tal:condition="review_history">
+      <p><strong>Reviewing history</strong>
+	  <br>
+    <div tal:repeat="items python: here.reverseList(review_history)">
+	<span tal:replace="python: items['time'].aCommon()"></span>
+	<span tal:replace="items/action"></span>
+  <span tal:condition="items/effective_date|nothing">
+  (effective: <span tal:replace="python: items['effective_date'].aCommon()"></span>)
+  </span>
+  
+  by <span tal:replace="items/actor">Actor</span><br>
+   <div tal:define="rhComments items/comments"
+		 tal:replace="rhComments">Comments</div>
+ </div>
+ </div>
+</div>
+</div>
+</body>
+</html>
\ No newline at end of file


=== CMF/CMFDefault/skins/zpt_content/discussionitem_view.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+    <metal:block fill-slot="base">
+        <base href=""
+              tal:attributes="href python: here.absolute_url() + '/'">
+    </metal:block>
+<body>
+
+<div metal:fill-slot="header">
+
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
+
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
+
+  <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+
+</div>
+
+<div metal:fill-slot="main">	  
+
+  <div id="DiscussionAbove">
+   <span tal:replace="structure here/aboveInThread"></span>
+  </div>
+
+  <div tal:replace="structure here/CookedBody">Body</div>
+
+  <div class="Discussion">
+   <span tal:replace="structure here/viewThreadsAtBottom"
+        tal:condition="here/viewThreadsAtBottom|nothing">Dicussions</span>
+  </div>
+
+</div>
+
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/document_edit_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">	  
+<div class="Desktop">
+<h2>Edit <span tal:replace="here/getId">ID</span></h2>
+
+<form action="document_edit" method="post" enctype="multipart/form-data">
+
+ <input type="hidden" name="SafetyBelt" value=""
+        tal:attributes="value here/SafetyBelt">
+
+<table class="FormLayout">
+ <tr>
+  <th>
+    Title
+  </th>
+  <td>
+   <span tal:replace="here/Title">Title</span>
+  </td>
+ </tr>
+
+ <tr>
+  <th>
+    Description
+  </th>
+  <td>
+   <span tal:replace="here/description">Description</span>
+  </td>
+ </tr>
+
+ <tr>
+  <th>
+   Format
+  </th>
+  <td>
+   <input type="radio" name="text_format"
+                     value="structured-text"
+                     tal:attributes="checked python: path('here/text_format') == 'structured-text'" />
+	      <label for="cb_structuredtext">structured-text</label>
+	      <input type="radio" name="text_format" value="html"
+              tal:attributes="checked python: path('here/text_format') == 'html'" />
+	      <label for="cb_html">html</label>
+  </td>
+ </tr>
+
+ <tr>
+  <th> Upload </th>
+  <td>
+   <input type="file" name="file" size="25">
+  </td>
+ </tr>
+
+ <tr>
+  <th class="TextField"> Edit </th>
+  <td class="TextField">
+   <textarea name="text:text" rows="20" cols="80" wrap="soft"
+                    tal:content="here/EditableBody"></textarea>
+  </td>
+ </tr>
+
+ <tr>
+  <td> <br> </td>
+  <td>
+    <input type="submit" name="choice" value=" Change ">
+    <input type="submit" name="choice" value=" Change and View ">
+  </td>
+ </tr>
+</table>
+</form>
+</div>
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/document_view.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+  <metal:block fill-slot="base">
+      <base href=""
+            tal:attributes="href python: here.absolute_url() + '/'">
+  </metal:block>
+<body>
+
+<div metal:fill-slot="header">
+
+    <h1 id="DesktopTitle"
+        tal:content="here/Title">Document Title</h1>
+
+    <div id="DesktopDescription" tal:content="here/Description">
+        Document Description goes here.
+    </div>
+
+    <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+
+</div>
+
+<div metal:fill-slot="main">
+
+<div tal:replace="structure here/CookedBody">Cooked Body</div>
+
+<div class="Discussion">
+   <span tal:replace="structure here/viewThreadsAtBottom"
+         tal:condition="here/viewThreadsAtBottom|nothing"></span>
+</div>
+
+</div>
+
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/favorite_view.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+    <metal:block fill-slot="base">
+          <base href=""
+                tal:attributes="href python: here.absolute_url() + '/'">
+    </metal:block>
+<body>
+
+<div metal:fill-slot="header">
+
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
+
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
+
+  <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+
+</div>
+
+<div metal:fill-slot="main">
+
+ <p> Link: <a href=""
+              tal:attributes="href here/remote_url"
+              tal:content="here/remote_url"
+           >/index_html</a></p>
+
+ <div class="Discussion">
+    <span tal:replace="structure here/viewThreadsAtBottom"
+          tal:condition="here/viewThreadsAtBottom|nothing"></span>
+ </div>
+
+</div>
+
+</body>
+</html>
+


=== CMF/CMFDefault/skins/zpt_content/file_edit_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+
+<div metal:fill-slot="main">
+<div class="Desktop">
+<span tal:replace="request/message"
+   tal:condition="request/message|nothing"><hr></span>
+
+<h2>Edit <span tal:replace="here/id">My ID</span></h2>
+
+<form action="file_edit" method="post" enctype="multipart/form-data">
+<table class="FormLayout">
+
+ <tr>
+  <th>Title</th>
+  <td> <span tal:replace="here/Title">My Title</span></td>
+ </tr>
+
+ <tr>
+  <th>Description</th>
+  <td> <span tal:replace="here/Description">My Description</span></td>
+ </tr>
+
+ <tr>
+  <th>Content type</th>
+  <td> <span tal:replace="here/Format">html/text</span></td>
+ </tr>
+
+ <tr>
+  <th>Upload file</th>
+  <td> <input type="file" name="file" size="35"> </td>
+ </tr>
+
+ <tr>
+  <td> <br> </td>
+  <td><input type="submit" name="choice" value=" Change " />
+      <input type="submit" name="choice" value=" Change and View ">
+  </td>
+ </tr>
+
+</table>
+</form>
+</div>
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/file_view.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+    <metal:block fill-slot="base">
+        <base href=""
+              tal:attributes="href python: here.absolute_url() + '/'">
+    </metal:block>
+<body>
+
+
+<div metal:fill-slot="header">
+
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
+
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
+
+  <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+
+</div>
+
+<div metal:fill-slot="main">
+
+<h2> File Properties </h2>
+
+ <table>
+
+  <tr>
+   <th align="right">Filename</th>
+   <td tal:content="here/getId">My ID</td>
+  </tr>
+
+  <tr>
+   <th align="right">Size</th>
+   <td tal:content="here/size">1024K</td>
+  </tr>
+  
+  <tr>
+   <th align="right">Content-type</th>
+   <td tal:content="here/content_type">application/gzip</td>
+  <tr>
+
+  <tr>
+   <td> <br> </td>
+   <td> 
+   </td>
+  </tr>
+ </table>
+
+<h2> Download File </h2>
+
+<p> <a href="." title="Download File"
+           tal:define="file here/absolute_url"
+           tal:attributes="href file; title here/Title"
+           tal:content="string:Download ${here/Title}">Download File</a>
+</p>
+
+ <div class="Discussion">
+    <span tal:replace="structure here/viewThreadsAtBottom"
+          tal:condition="here/viewThreadsAtBottom|nothing"></span>
+ </div>
+
+</div>
+
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/folder_edit_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">	  
+<div class="Desktop">
+<h2>Edit: <span tal:replace="here/getId">My ID</span></h2>
+ 
+<form action="folder_edit" method="post">
+<table class="FormLayout">
+ 
+ <tr valign="top">
+  <th align="right"> Title
+  </th>
+  <td colspan="3">
+   <input type="text"
+          name="title"
+          value=""
+		  tal:attributes="value here/title"
+          size="65">
+  </td>
+  
+ <tr valign="top">
+  <th align="right"> Description
+  </th>
+  <td colspan="3">
+   <textarea name="description:text" rows="5"
+             cols="65" wrap="soft"
+			 tal:content="here/description">
+   </textarea>
+  </td>
+ </tr>
+
+ <tr valign="top">
+  <td> <br> </td>
+  <td>
+   <input type="submit" name="choice" value=" Change ">
+   <input type="submit" name="choice" value=" Change and View ">
+  </td>
+ </tr>
+ 
+</table>
+</form>
+</div>
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/full_metadata_edit_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">	  
+<div class="Desktop">
+
+
+<span tal:replace="request/message"
+   tal:condition="request/message|nothing"><hr></span>
+
+
+<div class="Metadata">
+
+<h2>Resource Metadata </h2>
+<form action="metadata_edit" method="post">
+<table class="FormLayout">
+ <tr>
+  <th>
+    Enable Discussion?
+  </th>
+  <td colspan="3">
+    <select name="allowDiscussion"
+            tal:define="val here/isDiscussable">
+        <option value="None"
+                tal:attributes="selected python: val == None"> Default </option>
+        <option value="0"
+                tal:attributes="selected python: val == 0"> Off </option>
+        <option value="1"
+                tal:attributes="selected python: val == 1"> On </option>
+     </select>
+  </td>
+ </tr>
+ <tr valign="top">
+  <th align="right"> Identifier
+  </th>
+  <td colspan="3"> <span tal:replace="here/Identifier"></span>
+  </td>
+ </tr>
+ <tr valign="top">
+  <th align="right"> Title
+  </th>
+  <td colspan="3">
+   <input type="text"
+          name="title"
+          value=""
+          size="65"
+		  tal:attributes="value here/Title">
+  </td>
+ </tr>
+ <tr valign="top">
+  <th align="right"> Description
+  </th>
+  <td colspan="3">
+   <textarea name="description:text" rows="5"
+             cols="65" wrap="soft"
+			 tal:content="here/Description"></textarea>
+  </td>
+ </tr>
+
+ <tr valign="top">
+  <th align="right"> Subject </th>
+  <td>
+   <textarea name="subject:lines" rows="3"
+               cols="20" wrap="soft"
+			   tal:define="lines here/subjectsList"><span tal:repeat="line lines" tal:replace="line"></span></textarea>
+ <br> 
+   <select name="subject:list" multiple>
+     <option value=""
+		   tal:define="items python: here.portal_metadata.listAllowedSubjects(here); subjects here/Subject"
+		   tal:repeat="item items"
+		   tal:attributes="value item; selected python: item in subjects"
+		   tal:content="item">
+      </option>
+    </select> 
+  </td>
+  <th align="right"> Contributors </th>
+  <td>
+   <textarea name="contributors:lines" rows="5"
+             cols="30" wrap="soft"
+			 tal:define="items here/Contributors"
+			 tal:repeat="item items"
+			 tal:content="item"></textarea>
+  </td>
+ </tr>
+ <tr valign="top">
+  <th align="right"> Creation Date
+  </th>
+  <td> <span tal:replace="here/CreationDate"></span>
+  </td>
+  <th align="right"> Last Modified Date
+  </th>
+  <td> <span tal:replace="here/ModificationDate"></span>
+  </td>
+ </tr>
+ <tr valign="top">
+  <th align="right"> Effective Date
+  </th>
+  <td> <input type="text" name="effective_date"
+                          value=""
+						  tal:define="effectiveString python: here.effective_date and here.effective_date.ISO() or 'None'"
+						  tal:attributes="value effectiveString">
+  </td>
+  <th align="right"> Expiration Date
+  </th>
+  <td> <input type="text" name="expiration_date"
+                          value=""
+						  tal:define="expirationString python: here.expiration_date and here.expiration_date.ISO() or 'None'"
+						  tal:attributes="value expirationString">
+  </td>
+ </tr>
+ <tr valign="top">
+  <th align="right"> Format
+  </th>
+  <td> <input type="text" name="format" value=""
+  		tal:attributes="value here/Format">
+  </td>
+ </tr>
+ <tr valign="top">
+  <th align="right"> Language
+  </th>
+  <td> <input type="text" name="language" value=""
+  		tal:attributes="value here/Language">
+  </td>
+ </tr>
+ <tr valign="top">
+  <th align="right"> Rights
+  </th>
+  <td> <input type="text" name="rights" value=""
+        tal:attributes="value here/Rights">
+  </td>
+ </tr>
+ <tr valign="top">
+  <td> <br> </td>
+  <td>
+   <input type="submit" value=" Change ">
+  </td>
+ </tr>
+</table>
+</form>
+</div>
+</div>
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/image_edit_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">	  
+<div class="Desktop">
+
+
+<span tal:replace="request/message"
+   tal:condition="request/message|nothing"><hr></span>
+<div class="Image">
+
+<h2>Edit <span tal:replace="here/getId">My ID</span></h2>
+
+<form action="image_edit" method="post" enctype="multipart/form-data">
+<table class="FormLayout">
+
+ <tr>
+  <th> Title </th>
+  <td> <span tal:replace="here/Title">My Title</span> </td>
+ </tr>
+
+ <tr>
+  <th> Description </th>
+  <td> <span tal:replace="here/Description">My Description</span> </td>
+ </tr>
+
+ <tr>
+  <th> Content type </th>
+  <td> <span tal:replace="here/Format">text/html</span> </td>
+ </tr>
+
+ <tr>
+  <th> Upload image </th>
+  <td> <input type="file" name="file" size="25"> </td>
+ </tr>
+
+ <tr>
+  <td> <br> </td>
+  <td><input type="submit" name="choice" value=" Change ">
+      <input type="submit" name="choice" value=" Change and View ">
+  </td>
+ </tr>
+</table>
+</form>
+
+</div>
+</div>
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/image_view.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+    <metal:block fill-slot="base">
+           <base href=""
+                 tal:attributes="href python: here.absolute_url() + '/'">
+    </metal:block>
+<body>
+
+<div metal:fill-slot="header">
+
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
+
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
+
+  <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+
+</div>
+
+<div metal:fill-slot="main">
+
+ <span tal:replace="structure here/tag">Tag</span>
+
+ <div class="Discussion">
+ <span tal:replace="structure here/viewThreadsAtBottom"
+          tal:condition="here/viewThreadsAtBottom|nothing"></span>
+ </div>
+
+</div>
+
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/link_edit_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">	  
+<div class="Desktop">
+
+
+<span tal:replace="request/message"
+   tal:condition="request/message|nothing"><hr></span>
+
+<div class="Link">
+
+<h2>Edit <span tal:replace="here/getId">My ID</span></h2>
+
+<form action="link_edit" method="post">
+<table class="FormLayout">
+ <tr>
+  <th>
+   Title
+  </th>
+  <td> <span tal:replace="here/Title">My Title</span> </td>
+ </tr>
+ <tr>
+  <th>
+   URL
+  </th>
+  <td>
+   <input type="text" name="remote_url" value="" tal:attributes="value here/remote_url">
+  </td>
+ </tr>
+ <tr>
+  <td> <br> </td>
+  <td>
+   <input type="submit" name="choice" value=" Change ">
+   <input type="submit" name="choice" value=" Change and View ">
+  </td>
+ </tr>
+</table>
+</form>
+
+</div>
+</div>
+
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/link_view.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+    <metal:block fill-slot="base">
+            <base href=""
+                  tal:attributes="href python: here.absolute_url() + '/'">
+    </metal:block>
+<body>
+
+<div metal:fill-slot="header">
+
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
+
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
+
+  <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+
+</div>
+
+<div metal:fill-slot="main">
+
+ <p> Link: <a href=""
+              tal:attributes="href here/remote_url"
+              tal:content="here/remote_url"
+           >http://www.zope.org</a></p>
+
+ <div class="Discussion">
+    <span tal:replace="structure here/viewThreadsAtBottom"
+          tal:condition="here/viewThreadsAtBottom|nothing"></span>
+ </div>
+
+</div>
+
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/metadata_edit_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">	  
+<div class="Desktop">
+
+
+<span tal:replace="request/message"
+   tal:condition="request/message|nothing"><hr></span>
+
+<div class="Metadata">
+
+<h2>Standard Resource Metadata </h2>
+
+<form action="metadata_edit" method="post">
+<table class="FormLayout">
+
+ <tr valign="top">
+
+  <th>
+    Enable Discussion?
+  </th>
+  <td>
+    <select name="allowDiscussion"
+            tal:define="val here/isDiscussable">
+        <option value="None"
+                tal:attributes="selected python: val == None"> Default </option>
+        <option value="0"
+                tal:attributes="selected python: val == 0"> Off </option>
+        <option value="1"
+                tal:attributes="selected python: val == 1"> On </option>
+     </select>
+  </td>
+  <td colspan="2" align="right">
+   <a href="full_metadata_edit_form"> Edit all metadata </a>
+  </td>
+
+ </tr>
+
+ <tr valign="top">
+
+  <th align="right"> Identifier </th>
+  <td colspan="3"> <span tal:replace="here/Identifier" /> </td>
+
+ </tr>
+
+ <tr valign="top">
+
+  <th align="right"> Title </th>
+  <td colspan="3">
+   <input type="text"
+          name="title"
+          value=""
+          size="65"
+		  tal:attributes="value here/Title">
+  </td>
+
+ </tr>
+
+ <tr valign="top">
+
+  <th align="right"> Description </th>
+  <td colspan="3">
+   <textarea name="description:text" rows="5"
+             cols="65" wrap="soft"
+			 tal:content="here/Description"></textarea>
+  </td>
+
+ </tr>
+
+ <tr valign="top">
+       <th align="right"> Subject </th>
+  <td tal:define="subj_lines python: modules['string'].join(
+                                         here.subjectsList(), '\n' )">
+     <textarea name="subject:lines" rows="3" cols="20" wrap="soft"
+	           tal:content="subj_lines"></textarea>
+ <br> 
+   <select name="subject:list" multiple>
+     <option value=""
+		   tal:define="items python: here.portal_metadata.listAllowedSubjects(
+                                              here);
+                       subjects here/Subject;
+                      "
+		   tal:repeat="item items"
+		   tal:attributes="value item; selected python: item in subjects"
+		   tal:content="item">
+      </option>
+    </select> 
+  </td>
+
+  <th align="right"> Format </th>
+  <td> <input type="text" name="format" value="" tal:attributes="value here/Format">
+  <br> <input type="submit" name="change" value=" Change ">
+  <br> <input type="submit" name="change_and_edit" value=" Change & Edit ">
+  <br> <input type="submit" name="change_and_view" value=" Change & View ">
+  </td>
+
+ </tr>
+
+</table>
+
+</form>
+
+</div>
+
+</div>
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/newsitem_edit_form.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main">	  
+<div class="Desktop">
+
+
+<span tal:replace="request/message"
+   tal:condition="request/message|nothing"><hr></span>
+
+<div class="NewsItem">
+
+<h2>Edit <span tal:replace="here/getId">My ID</span></h2>
+
+<form action="newsitem_edit" method="post">
+<table class="FormLayout">
+ <tr>
+  <th> Title
+  </th>
+  <td> <span tal:replace="here/Title">My Title</span> </td>
+ </tr>
+ <tr>
+  <th class="TextField"> Lead-in </th>
+  <td class="TextField">
+   <textarea name="description:text" rows="10" wrap="soft"  
+             cols="65" tal:content="here/description"></textarea>
+  </td>
+ </tr>
+ <tr>
+  <th class="TextField"> Body
+  </th>
+  <td class="TextField">
+   <textarea name="text:text" rows="20" cols="65" wrap="soft"
+             tal:content="here/EditableBody"></textarea>
+  </td>
+ </tr>
+ <tr>
+  <th> <br> 
+  <td>
+   <input type="submit" name="choice" value=" Change ">
+   <input type="submit" name="choice" value=" Change and View ">
+  </td>
+ </tr>
+</table>
+</form>
+
+</div>
+</div>
+</div>
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/newsitem_view.pt 1.1 => 1.2 ===
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+    <metal:block fill-slot="base">
+            <base href=""
+                  tal:attributes="href python: here.absolute_url() + '/'">
+    </metal:block>
+<body>
+
+<div metal:fill-slot="header">
+
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
+
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
+
+  <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+
+</div>
+
+<div metal:fill-slot="main">
+
+ <div tal:replace="structure here/CookedBody">Body</div>
+
+ <div class="Discussion">
+  <span tal:replace="structure here/viewThreadsAtBottom"
+           tal:condition="here/viewThreadsAtBottom|nothing"></span>
+ </div>
+
+</div>
+
+</body>
+</html>


=== CMF/CMFDefault/skins/zpt_content/subjectsList.py 1.1 => 1.2 ===
+##title=List Subjects for Metadata Editing
+allowedSubjects=container.portal_metadata.listAllowedSubjects(context)
+item=[]
+for i in context.Subject():
+    if not i in allowedSubjects:
+        item.append(i)
+return item