[CMF-checkins] CVS: Products/CMFDecor/skins/zpt_content - link_view.pt:1.1 content_publish_form.pt:1.2 content_reject_form.pt:1.2 content_retract_form.pt:1.2 content_status_history.pt:1.2 discussionitem_view.pt:1.4 document_edit_form.pt:1.5 document_view.pt:1.3 favorite_view.pt:1.2 file_edit_form.pt:1.2 file_view.pt:1.2 folder_edit_form.pt:1.2
Andrew Sawyers
andrew@digicool.com
Wed, 8 Aug 2001 17:33:34 -0400
Update of /cvs-repository/Products/CMFDecor/skins/zpt_content
In directory cvs.zope.org:/tmp/cvs-serv6062/skins/zpt_content
Modified Files:
content_publish_form.pt content_reject_form.pt
content_retract_form.pt content_status_history.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
Added Files:
link_view.pt
Log Message:
*cleanup and optimizations -- More to come.
=== Added File Products/CMFDecor/skins/zpt_content/link_view.pt ===
<html xmlns:tal="http://xml.zope.org/namespaces/tal"
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">
<div class="Link">
<div tal:replace="structure here/content_byline">By Me</div>
<p>
<a tal:attributes="href here/remote_url" href=""><span tal:replace="here/remote_url">www.zope.org</span></a></p>
<p></p>
<div tal:replace="here/Description">Description</div>
<div class="Discussion">
<span tal:replace="structure here/viewThreadsAtBottom"
tal:condition="here/viewThreadsAtBottom|nothing"></span>
</div>
</div>
</div>
</div>
</body>
</html>
=== Products/CMFDecor/skins/zpt_content/content_publish_form.pt 1.1 => 1.2 ===
<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');
+ 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>
-<span tal:replace="request/message"
- tal:condition="message|nothing"><hr></span>
<p>A <b>published</b> item is available to the general
member base and anonymous visitors.</p>
@@ -22,36 +19,35 @@
<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="publish">
- </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=" Publish this Item "></td>
- </tr>
- </table>
+ <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>
- <span tal:replace="items/action"></span>
+ <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>
=== Products/CMFDecor/skins/zpt_content/content_reject_form.pt 1.1 => 1.2 ===
<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');
+ 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>
-<span tal:replace="request/message"
- tal:condition="message|nothing"><hr></span>
-
<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>
@@ -26,29 +21,27 @@
</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="reject">
</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>
+ style="width: 100%"></textarea>
</td>
</tr>
<tr>
- <td></td>
- <td><input type="submit" value=" Reject this Item "></td>
+ <td colspan="2"><input type="submit" value=" Reject this Item "></td>
</tr>
</table>
</form>
-<div tal:condition="review_history">
+<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>
- <span tal:replace="items/action"></span>
+ <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>
=== Products/CMFDecor/skins/zpt_content/content_retract_form.pt 1.1 => 1.2 ===
<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');
+ 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>
-<span tal:replace="request/message"
- tal:condition="message|nothing"><hr></span>
-
<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">
- <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="retract">
- </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=" Retract this Item "></td>
- </tr>
- </table>
+ <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">
+<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>
- <span tal:replace="items/action"></span>
+ <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>
=== Products/CMFDecor/skins/zpt_content/content_status_history.pt 1.1 => 1.2 ===
tal:define="review_state python: here.portal_workflow.getInfoFor(here, 'review_state');
review_history python: here.portal_workflow.getInfoFor(here, 'review_history')">
-
<div class="Desktop">
+<h1>Content Item status history</h1>
-<h1> Content Item status history </h1>
-
-<H2><span tal:replace="request/message"
- tal:condition="message|nothing"><hr></span></H2>
-
-<p>An item's status (also called its review state) determines who can see it.
+<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>.</p>
+ that an item be reviewed by setting its status to <b>pending</b>.</div>
-<p>Another way to control the visibility of an item is with its <b>effective
+<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>.</p>
+ <em>even if its status is <b>published</b></em>.</div>
-<p><b>Current state</b></p>
+<h2>Current state</h2>
+This item is in <b><span tal:replace="review_state">Private</span></b> state.
-<p>This item is in <b><span tal:replace="review_state">Private</span></b> state.</p>
-
-<div tal:condition="review_history">
- <p><strong>Reviewing history</strong>
- <br>
+<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>
- <span tal:replace="items/action"></span>
+ <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>
+ 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>
-
</div>
-
</body>
</html>
=== Products/CMFDecor/skins/zpt_content/discussionitem_view.pt 1.3 => 1.4 ===
<div class="Document">
- <div tal:replace="structure here/content_byline">By Me</div>
+ <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
<div class="Discussion">
<span tal:replace="structure here/aboveInThread"></span>
=== Products/CMFDecor/skins/zpt_content/document_edit_form.pt 1.4 => 1.5 ===
<div metal:fill-slot="main">
<div class="Desktop">
-<div class="Document">
-
-<h2>Edit <span tal:replace="here/getId">My ID</span></h2>
+<h2>Edit <span tal:replace="here/getId">ID</span></h2>
<form action="document_edit" method="post" enctype="multipart/form-data">
@@ -70,9 +68,6 @@
</tr>
</table>
</form>
-
-</div>
-
</div>
</div>
</body>
=== Products/CMFDecor/skins/zpt_content/document_view.pt 1.2 => 1.3 ===
<tr><td> </td></tr>
<tr>
- <td><div tal:replace="structure here/content_byline">By Me</div></td>
+ <td><div metal:use-macro="here/content_byline/macros/byline">By Me</div></td>
</tr>
<tr>
<td><div class="Description" tal:content="here/Description"></div></td>
=== Products/CMFDecor/skins/zpt_content/favorite_view.pt 1.1 => 1.2 ===
<div metal:fill-slot="main">
<div class="Desktop">
-
-<div class="Link">
-
-<div tal:replace="structure here/content_byline">By Me</div>
-
-<p>
+<div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+<br>
+<div>
<a href="favorite.html" title="ZopeOrg"
tal:define="favorite python:here.portal_url.getPortalPath() + '/' + here.remote_url"
- tal:attributes="href favorite; title favorite">
-<span tal:replace="favorite">www.zope.org</span></a>
-</p>
-<p></p>
-
-<dtml-var Description>
+ tal:attributes="href favorite; title favorite"><span tal:replace="favorite">www.zope.org</span></a>
+</div>
<div class="Discussion">
<span tal:replace="here/viewThreadsAtBottom"
- tal:condition="viewThreadsAtBottom|nothing">Dicussions</span>
-</div>
+ tal:condition="here/viewThreadsAtBottom|nothing">Dicussions</span>
</div>
</div>
</div>
=== Products/CMFDecor/skins/zpt_content/file_edit_form.pt 1.1 => 1.2 ===
tal:condition="request/message|nothing"><hr></span>
-<div class="File">
-
<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>
+ <th>Title</th>
<td> <span tal:replace="here/Title">My Title</span></td>
</tr>
<tr>
- <th> Description </th>
+ <th>Description</th>
<td> <span tal:replace="here/Description">My Description</span></td>
</tr>
<tr>
- <th> Content type </th>
+ <th>Content type</th>
<td> <span tal:replace="here/Format">html/text</span></td>
</tr>
<tr>
- <th> Upload file </th>
+ <th>Upload file</th>
<td> <input type="file" name="file" size="35"> </td>
</tr>
=== Products/CMFDecor/skins/zpt_content/file_view.pt 1.1 => 1.2 ===
<div metal:fill-slot="main">
<div class="Desktop">
-
-<div class="File">
-<span tal:replace="structure here/content_byline">ByLine</span>
+<div metal:use-macro="here/content_byline/macros/byline">By Me</div>
<p>
<b>Filename</b>: <span tal:replace="here/getId">My ID</span>
<br>
@@ -25,8 +23,7 @@
<div class="Discussion">
<span tal:replace="here/viewThreadsAtBottom"
- tal:condition="viewThreadsAtBottom|nothing">Dicussions</span>
-</div>
+ tal:condition="here/viewThreadsAtBottom|nothing">Dicussions</span>
</div>
</div>
</div>
=== Products/CMFDecor/skins/zpt_content/folder_edit_form.pt 1.1 => 1.2 ===
<div metal:fill-slot="main">
<div class="Desktop">
-<span tal:replace="request/message"
- tal:condition="request/message|nothing"><hr></span>
-
-<div class="File">
-
<h2>Edit: <span tal:replace="here/getId">My ID</span></h2>
<form action="folder_edit" method="post">
@@ -45,7 +40,6 @@
</table>
</form>
-</div>
</div>
</div>
</body>