[Zope-CVS] CVS: Products/ZopeVersionControl/dtml - RepositoryManageMain.dtml:1.2 VersionHistoryManageMain.dtml:1.2 VersionHistoryProperties.dtml:1.2 VersionActivityLog.dtml:NONE VersionHistoryActivityLog.dtml:NONE
Shane Hathaway
shane@cvs.zope.org
Thu, 9 May 2002 13:44:11 -0400
Update of /cvs-repository/Products/ZopeVersionControl/dtml
In directory cvs.zope.org:/tmp/cvs-serv16533/dtml
Modified Files:
RepositoryManageMain.dtml VersionHistoryManageMain.dtml
VersionHistoryProperties.dtml
Removed Files:
VersionActivityLog.dtml VersionHistoryActivityLog.dtml
Log Message:
Brought in line with Brian's current work
=== Products/ZopeVersionControl/dtml/RepositoryManageMain.dtml 1.1 => 1.2 ===
<dtml-unless skey><dtml-call expr="REQUEST.set('skey', 'id')"></dtml-unless>
<dtml-unless rkey><dtml-call expr="REQUEST.set('rkey', '')"></dtml-unless>
+<dtml-let object="this()">
<p class="form-text">
-This is a repository object. Repositories contain revision histories
-for version-controlled objects.
+A repository contains version histories for objects under version control.
</p>
<form action="&dtml-URL1;/" name="objectItems" method="POST">
-<dtml-if objectItems>
+<dtml-in objectValues size=20 start=query_start>
+
+<dtml-if sequence-start>
+<dtml-if "_.getitem('sequence-length') > _.getitem('sequence-step-size')">
+<table width="100%" cellspacing="0" cellpadding="2" border="0">
+ <tr>
+ <td align="left" valign="top">
+ <div class="form-text">
+ Items <dtml-var sequence-step-start-number> - <dtml-var
+ sequence-step-end-number> of <dtml-var sequence-length> in
+ <em><dtml-var "object.getId()"></em>
+ </div>
+ </td>
+ <td align="right" valign="top" nowrap>
+ <div class="form-text">
+<dtml-if previous-sequence-size>
+ << <strong><a href="<dtml-var URL><dtml-var sequence-query
+ >query_start=<dtml-var previous-sequence-start-number>">Prev <dtml-var
+ previous-sequence-size></a></strong>
+</dtml-if>
+<dtml-if next-sequence-size>
+ <strong><a href="<dtml-var URL><dtml-var
+ sequence-query>query_start=<dtml-var
+ next-sequence-start-number>">Next <dtml-var
+ next-sequence-size></a></strong> >></a>
+</dtml-if>
+ </div>
+ </td>
+ </tr>
+</table>
+</dtml-if>
<table width="100%" cellspacing="0" cellpadding="2" border="0">
<tr class="list-header">
<td width="5%" align="left" colspan="2">
@@ -51,8 +81,9 @@
</div>
</td>
</tr>
-<dtml-in getVersionHistories sort_expr="skey" reverse_expr="rkey">
-<dtml-with meta>
+</dtml-if>
+
+<dtml-with sequence-item>
<dtml-if sequence-odd>
<tr class="row-normal">
<dtml-else>
@@ -62,27 +93,44 @@
<input type="checkbox" name="ids:list" value="&dtml-getId;"/>
</td>
<td align="left" valign="top">
-<dtml-if getItemIcon>
- <a href="&dtml.url_quote-getId;/manage_workspace">
- <img src="&dtml-BASEPATH1;/&dtml-getItemIcon;"
- alt="&dtml-meta_type;" title="&dtml-meta_type;" border="0" /></a>
-<dtml-else>
<a href="&dtml.url_quote-getId;/manage_workspace">
<img src="&dtml-BASEPATH1;/&dtml-icon;" alt="&dtml-meta_type;"
title="&dtml-meta_type;" border="0" /></a>
-</dtml-if>
</td>
<td align="left" valign="top">
<div class="list-item">
<a href="&dtml.url_quote-getId;/manage_workspace">
- &dtml-getItemPath;
+ &dtml-getId;
</a>
</div>
</td>
</tr>
</dtml-with>
-</dtml-in>
+
+<dtml-if sequence-end>
+</table>
+<dtml-if "_.getitem('sequence-length') > _.getitem('sequence-step-size')">
+<table width="100%" cellspacing="0" cellpadding="2" border="0">
+ <tr>
+ <td align="right" valign="top">
+ <div class="form-text">
+<dtml-if previous-sequence-size>
+ << <strong><a href="<dtml-var URL><dtml-var sequence-query
+ >query_start=<dtml-var previous-sequence-start-number>">Prev <dtml-var
+ previous-sequence-size></a></strong>
+</dtml-if>
+<dtml-if next-sequence-size>
+ <strong><a href="<dtml-var URL><dtml-var
+ sequence-query>query_start=<dtml-var
+ next-sequence-start-number>">Next <dtml-var
+ next-sequence-size></a></strong> >></a>
+</dtml-if>
+ </div>
+ </td>
+ </tr>
</table>
+</dtml-if>
+</dtml-if>
<dtml-else>
<table cellspacing="0" cellpadding="2" border="0">
@@ -95,16 +143,10 @@
</td>
</tr>
</table>
-</dtml-if>
-</form>
-<dtml-if update_menu>
-<script type="text/javascript">
-<!--
-window.parent.update_menu();
-//-->
-</script>
-</dtml-if>
+</dtml-in>
+</form>
+</dtml-let>
<dtml-var manage_page_footer>
=== Products/ZopeVersionControl/dtml/VersionHistoryManageMain.dtml 1.1 => 1.2 ===
<dtml-unless skey><dtml-call expr="REQUEST.set('skey', 'id')"></dtml-unless>
<dtml-unless rkey><dtml-call expr="REQUEST.set('rkey', '')"></dtml-unless>
+<dtml-let object="this()">
<p class="form-text">
- A version history contains all the versions of a particular version
- controlled resource. Click on a version below for more information on
- that version.
+A version history contains all the versions of a particular version
+controlled resource.
</p>
-<dtml-if getDescription>
+<form action="&dtml-URL1;/" name="objectItems" method="POST">
+<dtml-in objectValues size=20 start=query_start>
+<dtml-if sequence-start>
+<dtml-if "_.getitem('sequence-length') > _.getitem('sequence-step-size')">
<table width="100%" cellspacing="0" cellpadding="2" border="0">
-<tr class="list-header">
- <td align="left" valign="top" width="16">
- <div class="list-item">
-
- </div>
- </td>
- <td align="left">
- <div class="list-item">
- <strong>Resource Description</strong>
- </div>
- </td>
-</tr>
-<tr class="row-hilite">
- <td align="left" valign="top" width="16">
-
- </td>
- <td align="left" valign="top">
- <div class="list-item">
- &dtml-getDescription;
- </div>
- </td>
-</tr>
+ <tr>
+ <td align="left" valign="top">
+ <div class="form-text">
+ Items <dtml-var sequence-step-start-number> - <dtml-var
+ sequence-step-end-number> of <dtml-var sequence-length> in
+ <em><dtml-var "object.getId()"></em>
+ </div>
+ </td>
+ <td align="right" valign="top" nowrap>
+ <div class="form-text">
+<dtml-if previous-sequence-size>
+ << <strong><a href="<dtml-var URL><dtml-var sequence-query
+ >query_start=<dtml-var previous-sequence-start-number>">Prev <dtml-var
+ previous-sequence-size></a></strong>
+</dtml-if>
+<dtml-if next-sequence-size>
+ <strong><a href="<dtml-var URL><dtml-var
+ sequence-query>query_start=<dtml-var
+ next-sequence-start-number>">Next <dtml-var
+ next-sequence-size></a></strong> >></a>
+</dtml-if>
+ </div>
+ </td>
+ </tr>
</table>
-<br>
</dtml-if>
-
<table width="100%" cellspacing="0" cellpadding="2" border="0">
<tr class="list-header">
- <td align="left" valign="top" width="16">
+ <td width="5%" align="left" colspan="2">
<div class="list-item">
</div>
</td>
<td align="left">
<div class="list-item">
- <strong>Resource Status</strong>
+ <strong>Versions</strong>
</div>
</td>
</tr>
-<dtml-in getCheckoutRecords>
+</dtml-if>
+
<dtml-with sequence-item>
<dtml-if sequence-odd>
<tr class="row-normal">
@@ -86,81 +90,47 @@
<tr class="row-hilite">
</dtml-if>
<td align="left" valign="top" width="16">
- <!--
- <input type="checkbox" name="ids:list" value="&dtml-getVersionId;"/>
- -->
+ <input type="checkbox" name="ids:list" value="&dtml-getId;"/>
</td>
<td align="left" valign="top">
- <div class="list-item">
- [<dtml-var getActivityId>] Version <dtml-var
- getVersionId> is checked out by <dtml-var
- getUserName> at <a href="&dtml-getTargetPath;/manage_workspace"
- target="_new"><dtml-var getTargetPath></a>
- </div>
- </td>
-</tr>
-</dtml-with>
-<dtml-else>
-<tr class="row-hilite">
- <td align="left" valign="top" width="16">
-
+ <a href="&dtml.url_quote-getId;/manage_workspace">
+ <img src="&dtml-BASEPATH1;/&dtml-icon;" alt="&dtml-meta_type;"
+ title="&dtml-meta_type;" border="0" /></a>
</td>
<td align="left" valign="top">
<div class="list-item">
- No working copies of this resource are checked out.
+ <a href="&dtml.url_quote-getId;/manage_workspace">
+ &dtml-getId;
+ </a>
</div>
</td>
</tr>
-</dtml-in>
-</table>
-
+</dtml-with>
-<form action="&dtml-URL1;/" name="VersionListing" method="POST">
-<table width="100%" cellspacing="0" cellpadding="2" border="0">
-<tr class="list-header">
- <td align="left" valign="top" width="20">
- <div class="list-item">
-
- </div>
- </td>
- <td align="left" valign="top" colspan="2">
- <div class="list-item">
- <strong>Resource Versions</strong>
- </div>
- </td>
-</tr>
+<dtml-if sequence-end>
</table>
-
+<dtml-if "_.getitem('sequence-length') > _.getitem('sequence-step-size')">
<table width="100%" cellspacing="0" cellpadding="2" border="0">
-<dtml-if objectItems>
-<dtml-in objectItems sort_expr="skey" reverse_expr="rkey">
-<dtml-with sequence-item>
-<dtml-with meta>
-<dtml-if sequence-odd>
-<tr class="row-normal">
-<dtml-else>
-<tr class="row-hilite">
+ <tr>
+ <td align="right" valign="top">
+ <div class="form-text">
+<dtml-if previous-sequence-size>
+ << <strong><a href="<dtml-var URL><dtml-var sequence-query
+ >query_start=<dtml-var previous-sequence-start-number>">Prev <dtml-var
+ previous-sequence-size></a></strong>
</dtml-if>
- <td align="left" valign="top" width="16">
- <input type="checkbox" name="ids:list" value="&dtml-sequence-key;"/>
- </td>
- <td align="left" valign="top" width="16">
- <a href="&dtml.url_quote-sequence-key;/manage_workspace">
- <img src="&dtml-BASEPATH1;/&dtml-getItemIcon;" alt="&dtml-getItemType;"
- title="&dtml-getItemType;" border="0" /></a>
- </td>
- <td align="left" valign="top">
- <div class="list-item">
- <a href="&dtml.url_quote-sequence-key;/manage_workspace">
- &dtml-getItemId; &dtml-sequence-key;
- </a>
- </div>
- </td>
-</tr>
-</dtml-with>
-</dtml-with>
-</dtml-in>
+<dtml-if next-sequence-size>
+ <strong><a href="<dtml-var URL><dtml-var
+ sequence-query>query_start=<dtml-var
+ next-sequence-start-number>">Next <dtml-var
+ next-sequence-size></a></strong> >></a>
+</dtml-if>
+ </div>
+ </td>
+ </tr>
</table>
+</dtml-if>
+</dtml-if>
<dtml-else>
<table cellspacing="0" cellpadding="2" border="0">
@@ -173,16 +143,10 @@
</td>
</tr>
</table>
-</dtml-if>
-</form>
-<dtml-if update_menu>
-<script type="text/javascript">
-<!--
-window.parent.update_menu();
-//-->
-</script>
-</dtml-if>
+</dtml-in>
+</form>
+</dtml-let>
<dtml-var manage_page_footer>
=== Products/ZopeVersionControl/dtml/VersionHistoryProperties.dtml 1.1 => 1.2 ===
</dtml-with>
+<p>
+Properties of this version history.
+</p>
+
+<!--
<form action="manage_edit" method="post">
<table cellspacing="0" cellpadding="2" border="0">
<tr>
@@ -29,5 +34,6 @@
</tr>
</table>
</form>
+-->
<dtml-var manage_page_footer>
=== Removed File Products/ZopeVersionControl/dtml/VersionActivityLog.dtml ===
=== Removed File Products/ZopeVersionControl/dtml/VersionHistoryActivityLog.dtml ===