[CMF-checkins] CVS: CMF - PSCOREDUMPS_wiki_copy_page_to_present_handler.py:1.1 wiki_compare_versions.dtml:1.1 wiki_copy_page_to_present_handler.dtml:1.1 advanced_wiki_actions.dtml:1.2 get_wiki_toc.dtml:1.2 view_wiki_history.dtml:1.2 wiki_advanced_handler.py:1.2
chrism@serenade.digicool.com
chrism@serenade.digicool.com
Thu, 24 May 2001 15:12:57 -0400
Update of /cvs-repository/Packages/Products/CMFWiki/skins/wiki
In directory serenade:/home/chrism/CMF/CMFWiki/skins/wiki
Modified Files:
advanced_wiki_actions.dtml get_wiki_toc.dtml
view_wiki_history.dtml wiki_advanced_handler.py
Added Files:
PSCOREDUMPS_wiki_copy_page_to_present_handler.py
wiki_compare_versions.dtml
wiki_copy_page_to_present_handler.dtml
Log Message:
Changes necessary for FTP support, backlinks & history not HTML, and image and file upload.
--- Added File PSCOREDUMPS_wiki_copy_page_to_present_handler.py in package CMF ---
## Script (Python) "wiki_copy_page_to_present_handler"
##bind container=container
##bind context=context
##bind namespace=
##bind script=script
##bind subpath=traverse_subpath
##parameters=REQUEST
##title=
##
keys = REQUEST['keys']
url = context.absolute_url()
context.history_copy_page_to_present(keys)
REQUEST.RESPONSE.redirect('%s' % url)
--- Added File wiki_compare_versions.dtml in package CMF ---
<dtml-var standard_wiki_header>
<dtml-let callresults="history_compare_versions(REQUEST['keys'])"
dt1="callresults[0]"
dt2="callresults[1]"
historyComparisonResults="callresults[2]">
<dtml-if historyComparisonResults>
<table>
<tr>
<td align="left" valign="top">
<div class="form-label">
Changes to <dtml-var id> as of
</div>
</td>
<td align="left" valign="top">
<div class="form-text">
<dtml-var dt1 fmt="%Y-%m-%d %H:%M">
</div>
</td>
</tr>
<tr>
<td align="left" valign="top">
<div class="form-label">
to get to <dtml-var id> as of
</div>
</td>
<td align="left" valign="top">
<div class="form-text">
<dtml-var dt2 fmt="%Y-%m-%d %H:%M">
</div>
</td>
</tr>
</table>
<br />
<dtml-var historyComparisonResults>
<dtml-else>
<p class="form-text">
This object does not provide comparison support.
</p>
</dtml-if>
</dtml-let>
<dtml-var standard_wiki_footer>
--- Added File wiki_copy_page_to_present_handler.dtml in package CMF ---
<dtml-let keys="REQUEST['keys']" url="absolute_url()">
<dtml-call "history_copy_page_to_present(keys)">
<dtml-call "RESPONSE.redirect('%s' % url)">
</dtml-let>
--- Updated File advanced_wiki_actions.dtml in package CMF --
--- advanced_wiki_actions.dtml 2001/05/23 22:09:55 1.1.1.1
+++ advanced_wiki_actions.dtml 2001/05/24 19:12:57 1.2
@@ -1,10 +1,7 @@
-<dtml-let creating="_.has_key('action') and action == 'Create'"
- regulator="isRegSetter(new=creating)">
-
<dtml-var standard_wiki_header>
<FORM METHOD="POST"
- ACTION="&dtml-wiki_base_url;/<dtml-var id url_quote>/wiki_deleterename_handler"
+ ACTION="&dtml-wiki_base_url;/&dtml-id;/wiki_deleterename_handler"
ENCTYPE="multipart/form-data">
<table border=1>
@@ -45,7 +42,7 @@
<font color="gray"> No Delete or Rename forms for FrontPage - it
can not be removed.
</font>
- <dtml-elif "not isAllowed('move', REQUEST=REQUEST)">
+ <dtml-elif "not isAllowed('move')">
You can not rename or delete this page.
<dtml-var "whichWho[opCategory('move')]"> do so.
<dtml-else>
@@ -54,7 +51,7 @@
<td width="50%" nowrap bgcolor="eeeeee">
Rename <strong><dtml-var id></strong> to:
<br>
- <INPUT TYPE="TEXT" NAME="new_id" SIZE="25" value="<dtml-var id>">
+ <INPUT TYPE="TEXT" NAME="new_id" SIZE="25" value="&dtml-id;">
<input type="SUBMIT" NAME="Rename" VALUE="Rename">
</td>
<td align="center" width="50%" nowrap bgcolor="eeeeee">
@@ -81,7 +78,7 @@
the common wiki operations on the page. The operations include
editing the page, creating new pages from it, commenting on it, and
resituating it (renaming it, deleting, or changing its designated
- parents). You can <dtml-if regulator> set <dtml-else> see </dtml-if>
+ parents). You can <dtml-if isRegSetter> set <dtml-else> see </dtml-if>
the page regulations below.
<p>
@@ -91,7 +88,7 @@
-->
</p>
<FORM METHOD="POST"
- ACTION="&dtml-wiki_base_url;/<dtml-var id url_quote>/wiki_advanced_handler"
+ ACTION="&dtml-wiki_base_url;/&dtml-id;/wiki_advanced_handler"
ENCTYPE="multipart/form-data">
<table width="100%" border="0" cellspacing="0" cellpadding="5"
bgcolor="eeeeee">
@@ -126,7 +123,7 @@
opcat="opCategory(op)">
<td align="center" valign="middle">
<select name="&dtml-op;-category:string" size="1"
- <dtml-if "not creating and not regulator"> DISABLED </dtml-if> >
+ <dtml-unless isRegSetter> DISABLED </dtml-unless> >
<dtml-in regCategories>
<dtml-let cat="_['sequence-item']"
cur="opcat == cat">
@@ -152,10 +149,10 @@
<td align="center">
<textarea rows=2 cols=8
name="&dtml-op;-usernames:lines"
- <dtml-if "not regulator">
+ <dtml-unless isRegSetter>
readonly
onkeydown="this.blur(); return false;"
- </dtml-if>
+ </dtml-unless>
>&dtml-usernames;</textarea>
</td>
</dtml-let>
@@ -170,10 +167,10 @@
<td align="center">
<input type="hidden" name="&dtml-propop;:default" value="off">
<input type="checkbox" name="&dtml-propop;" value="ON"
- <dtml-if "not regulator">
+ <dtml-unless isRegSetter>
readonly
onkeydown="this.blur(); return false;"
- </dtml-if> >
+ </dtml-unless> >
</td>
</dtml-let>
</dtml-in>
@@ -189,22 +186,22 @@
</th>
<td colspan=4>
<input type="radio" name="who_owns_subs" value="creator"
- <dtml-if "not regulator"> DISABLED </dtml-if>
+ <dtml-unless isRegSetter> DISABLED </dtml-unless>
<dtml-if "subOwner()=='creator'"> CHECKED </dtml-if>>
Only creator of new page
<br>
<input type="radio" name="who_owns_subs" value="original_owner"
- <dtml-if "not regulator"> DISABLED </dtml-if>
+ <dtml-unless isRegSetter> DISABLED </dtml-unless>
<dtml-if "subOwner()=='original_owner'">CHECKED</dtml-if>>
Only original page owner(s)
<br>
<input type="radio" name="who_owns_subs" value="both"
- <dtml-if "not regulator"> DISABLED </dtml-if>
+ <dtml-unless isRegSetter> DISABLED </dtml-unless>
<dtml-if "subOwner()=='both'">CHECKED</dtml-if>>
Both original page owner(s) and sub-page creators
</td>
</tr>
- <dtml-if "regulator">
+ <dtml-if isRegSetter>
<tr>
<td colspan=5> <hr>
</td>
@@ -223,5 +220,3 @@
</form>
<dtml-var standard_wiki_footer>
-</dtml-let>
-
--- Updated File get_wiki_toc.dtml in package CMF --
--- get_wiki_toc.dtml 2001/05/23 22:09:55 1.1.1.1
+++ get_wiki_toc.dtml 2001/05/24 19:12:57 1.2
@@ -1 +1,22 @@
-<dtml-var "FrontPage.map(REQUEST=REQUEST)">
+<dtml-var standard_html_header>
+<dtml-let callresults="FrontPage.map()"
+ nesting="callresults[0]"
+ singletons="callresults[1]">
+<h3><i>&dtml-getId;</i> Contents</h3>
+<p>
+<!-- this should really not depend on nesting coming back as HTML,
+but I don't have time to fix it right now - chrism -->
+<dtml-var nesting>
+</p>
+<p>
+<font size="+1"><b><i>&dtml-getId;</i> Singletons</b></font>
+(no parents and no offspring):
+<ul>
+<dtml-in singletons>
+<a href="&dtml-sequence-item;"
+ name="&dtml-sequence-item;">&dtml-sequence-item;</a>
+</dtml-in>
+
+</ul>
+</dtml-let>
+<dtml-var standard_html_footer>
--- Updated File view_wiki_history.dtml in package CMF --
--- view_wiki_history.dtml 2001/05/23 22:09:55 1.1.1.1
+++ view_wiki_history.dtml 2001/05/24 19:12:57 1.2
@@ -92,11 +92,11 @@
<td> </td>
<td> </td>
<td>
- <input type="submit" name="history_compare_versions:method"
+ <input type="submit" name="wiki_compare_versions:method"
value="Compare">
<dtml-if "not noedit">
- <input type="submit" name="history_copy_page_to_present:method"
+ <input type="submit" name="wiki_copy_page_to_present_handler:method"
value="Copy to present">
</dtml-if>
</td>
--- Updated File wiki_advanced_handler.py in package CMF --
--- wiki_advanced_handler.py 2001/05/23 22:09:55 1.1.1.1
+++ wiki_advanced_handler.py 2001/05/24 19:12:57 1.2
@@ -8,6 +8,8 @@
##title=
##
-context.setRegulations(REQUEST)
+context.setRegulations(d=REQUEST)
REQUEST.RESPONSE.redirect('%s' % context.wiki_page_url())
+
+