Skip to content

Z
Zope
Commit 678a457e authored by adam's avatar adam
Browse files
Options

repairing accidental commit by promoting proper revision to the head of the trunk

parent cfec0d63
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 194 deletions
lib/python/AccessControl/listLocalRoles.dtml
View file @ 678a457e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<strong>Local roles</strong> allow you to give particular users extra roles <strong>Local roles</strong> allow you to give particular users extra roles
in the context of this object, in addition to the roles they already have. in the context of this object, in addition to the roles they already have.
<dtml-if has_local_roles>
<br> <br>
The following users have been given local roles. To modify the local roles The following users have been given local roles. To modify the local roles
given to a particular user, click on the name of the user. To remove all given to a particular user, click on the name of the user. To remove all
......
lib/python/DocumentTemplate/DT_In.py
View file @ 678a457e
...@@ -382,11 +382,11 @@ ...@@ -382,11 +382,11 @@
''' #' ''' #'
__rcs_id__='$Id: DT_In.py,v 1.41 2000/12/18 20:45:01 adam Exp $' __rcs_id__='$Id: DT_In.py,v 1.42 2000/12/18 22:59:06 adam Exp $'
__version__='$Revision: 1.41 $'[11:-2] __version__='$Revision: 1.42 $'[11:-2]
from DT_Util import ParseError, parse_params, name_param, str from DT_Util import ParseError, parse_params, name_param, str
from DT_Util import render_blocks, InstanceDict, ValidationError, VSEval, expr_globals from DT_Util import render_blocks, InstanceDict, ValidationError
from string import find, atoi, join, split from string import find, atoi, join, split
import ts_regex import ts_regex
from DT_InSV import sequence_variables, opt from DT_InSV import sequence_variables, opt
...@@ -408,7 +408,6 @@ class InClass: ...@@ -408,7 +408,6 @@ class InClass:
expr=sort=batch=mapping=None expr=sort=batch=mapping=None
start_name_re=None start_name_re=None
reverse=None reverse=None
sort_expr=reverse_expr=None
def __init__(self, blocks): def __init__(self, blocks):
tname, args, section = blocks[0] tname, args, section = blocks[0]
...@@ -416,7 +415,7 @@ class InClass: ...@@ -416,7 +415,7 @@ class InClass:
orphan='3',overlap='1',mapping=1, orphan='3',overlap='1',mapping=1,
skip_unauthorized=1, skip_unauthorized=1,
previous=1, next=1, expr='', sort='', previous=1, next=1, expr='', sort='',
reverse=1, sort_expr='', reverse_expr='') reverse=1)
self.args=args self.args=args
has_key=args.has_key has_key=args.has_key
...@@ -424,12 +423,6 @@ class InClass: ...@@ -424,12 +423,6 @@ class InClass:
self.sort=sort=args['sort'] self.sort=sort=args['sort']
if sort=='sequence-item': self.sort='' if sort=='sequence-item': self.sort=''
if has_key('sort_expr'):
self.sort_expr=VSEval.Eval(args['sort_expr'], expr_globals)
if has_key('reverse_expr'):
self.reverse_expr=VSEval.Eval(args['reverse_expr'], expr_globals)
if has_key('reverse'): if has_key('reverse'):
self.reverse=args['reverse'] self.reverse=args['reverse']
...@@ -491,21 +484,15 @@ class InClass: ...@@ -491,21 +484,15 @@ class InClass:
raise 'InError', ( raise 'InError', (
'Strings are not allowed as input to the in tag.') 'Strings are not allowed as input to the in tag.')
section=self.section section=self.section
params=self.args params=self.args
mapping=self.mapping mapping=self.mapping
if self.sort_expr is not None: if self.sort is not None:
self.sort=self.sort_expr.eval(md)
sequence=self.sort_sequence(sequence)
elif self.sort is not None:
sequence=self.sort_sequence(sequence) sequence=self.sort_sequence(sequence)
if self.reverse_expr is not None and self.reverse_expr.eval(md): if self.reverse is not None:
sequence=self.reverse_sequence(sequence)
elif self.reverse is not None:
sequence=self.reverse_sequence(sequence) sequence=self.reverse_sequence(sequence)
next=previous=0 next=previous=0
...@@ -657,18 +644,12 @@ class InClass: ...@@ -657,18 +644,12 @@ class InClass:
section=self.section section=self.section
mapping=self.mapping mapping=self.mapping
if self.sort is not None:
if self.sort_expr is not None:
self.sort=self.sort_expr.eval(md)
sequence=self.sort_sequence(sequence)
elif self.sort is not None:
sequence=self.sort_sequence(sequence) sequence=self.sort_sequence(sequence)
if self.reverse_expr is not None and self.reverse_expr.eval(md): if self.reverse is not None:
sequence=self.reverse_sequence(sequence)
elif self.reverse is not None:
sequence=self.reverse_sequence(sequence) sequence=self.reverse_sequence(sequence)
vars=sequence_variables(sequence) vars=sequence_variables(sequence)
kw=vars.data kw=vars.data
kw['mapping']=mapping kw['mapping']=mapping
......
lib/python/OFS/importExport.dtml
View file @ 678a457e
...@@ -6,22 +6,24 @@ ...@@ -6,22 +6,24 @@
<BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555"> <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
<dtml-var manage_tabs> <dtml-var manage_tabs>
<P>
You can export Zope objects to a file in order to transfer
them to a different Zope installation. You can either choose
to download the export file to your local machine, or save it
in the &quot;var&quot; directory of your Zope installation
on the server.
</P>
<FORM ACTION="manage_exportObject" METHOD="POST"> <FORM ACTION="manage_exportObject" METHOD="POST">
<TABLE CELLPADDING="4"> <TABLE CELLSPACING="2">
<TR> <TR>
<TD COLSPAN="2" BGCOLOR="#000099"></TD> <TH ALIGN="LEFT" VALIGN="TOP">Export object id</TH>
</TR> <TD ALIGH="LEFT" VALIGN="TOP">
<TR> <INPUT TYPE="TEXT" NAME="id" SIZE="25" VALUE="<dtml-if ids><dtml-var
<TD WIDTH="70%" VALIGN="TOP">
<TABLE CELLSPACING="2">
<TR>
<TH ALIGN="LEFT" VALIGN="TOP">Export object id</TH>
<TD ALIGN="LEFT" VALIGN="TOP">
<INPUT TYPE="TEXT" NAME="id" SIZE="25" VALUE="<dtml-if ids><dtml-var
"ids[0]" html_quote></dtml-if>"> "ids[0]" html_quote></dtml-if>">
</TD> </TD>
</TR> </TR>
<TR> <TR>
<TH ALIGN="LEFT" VALIGN="TOP">Export to</TH> <TH ALIGN="LEFT" VALIGN="TOP">Export to</TH>
<TD ALIGN="LEFT" VALIGN="TOP"> <TD ALIGN="LEFT" VALIGN="TOP">
<INPUT TYPE="RADIO" NAME="download:int" VALUE="1"> <INPUT TYPE="RADIO" NAME="download:int" VALUE="1">
...@@ -41,27 +43,24 @@ ...@@ -41,27 +43,24 @@
<TD><INPUT TYPE="SUBMIT" VALUE="Export"></TD> <TD><INPUT TYPE="SUBMIT" VALUE="Export"></TD>
</TR> </TR>
</TABLE> </TABLE>
</TD>
<TD VALIGN=TOP WIDTH="30%">
<SM>You can export Zope objects to a file in order to transfer
them to a different Zope installation. You can either choose
to download the export file to your local machine, or save it
in the &quot;var&quot; directory of your Zope installation
on the server.</SM>
</TD>
</TR>
</TABLE>
</FORM> </FORM>
<p>
You may import Zope objects which have been previously
exported to a file, by placing the file in the &quot;import&quot;
directory of your Zope installation on the server. You should create
the &quot;import&quot; directory in the root of your Zope installation
if it does not yet exist.
</p>
<p>
Note that by default, you will become the owner of the objects
that you are importing. If you wish the imported objects to retain
their existing ownership information, select "retain existing
ownership information".
</p>
<FORM ACTION="manage_importObject" METHOD="POST"> <FORM ACTION="manage_importObject" METHOD="POST">
<TABLE CELLPADDING=2>
<TR>
<TD COLSPAN="2" BGCOLOR="#000099"></TD>
</TR>
<TR>
<TD WIDTH="70%" VALIGN="TOP">
<TABLE CELLSPACING="2"> <TABLE CELLSPACING="2">
<TR> <TR>
...@@ -88,25 +87,6 @@ on the server.</SM> ...@@ -88,25 +87,6 @@ on the server.</SM>
</TD> </TD>
</TR> </TR>
</TABLE> </TABLE>
</TD>
<TD WIDTH="30%" VALIGN="TOP">
<SM>
<p>
You may import Zope objects which have been previously
exported to a file, by placing the file in the &quot;import&quot;
directory of your Zope installation on the server. You should create
the &quot;import&quot; directory in the root of your Zope installation
if it does not yet exist.
</p>
<p>
Note that by default, you will become the owner of the objects
that you are importing. If you wish the imported objects to retain
their existing ownership information, select "retain existing
ownership information".
</p>
</SM>
</TABLE>
</FORM> </FORM>
</BODY> </BODY>
</HTML> </HTML>
......
lib/python/OFS/main.dtml
View file @ 678a457e
...@@ -2,66 +2,16 @@ ...@@ -2,66 +2,16 @@
<HTML lang="en"> <HTML lang="en">
<HEAD> <HEAD>
<TITLE>Contents</TITLE> <TITLE>Contents</TITLE>
<SCRIPT LANGUAGE="JavaScript">
<!--
isSelected = false;
function toggleSelect()
{
if (isSelected == false)
{
for (i = 0; i < document.objectItems.length; i++)
document.objectItems.elements[i].checked = true ;
isSelected = true;
return isSelected;
}
else
for (i = 0; i < document.objectItems.length; i++)
document.objectItems.elements[i].checked = false ;
isSelected = false;
return isSelected;
}
//-->
</SCRIPT>
</HEAD> </HEAD>
<BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555"> <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
<dtml-var manage_tabs> <dtml-var manage_tabs>
<FORM ACTION="&dtml-URL1;" METHOD="POST" name="objectItems"> <P>
<FORM ACTION="&dtml-URL1;" METHOD="POST">
<dtml-if objectItems> <dtml-if objectItems>
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2"> <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2">
<dtml-in objectItems sort>
<dtml-unless skey>
<dtml-call expr="REQUEST.set('skey', 'id')">
</dtml-unless>
<dtml-unless rkey>
<dtml-call expr="REQUEST.set('rkey', '')">
</dtml-unless>
<TR>
<TD WIDTH = "2%" ALIGN="left">&nbsp;</TD>
<TD WIDTH = "4%" ALIGN="left"><a href="<dtml-var absolute_url>/manage_main?skey=meta_type<dtml-if "rkey == ''">&rkey=meta_type</dtml-if>">Type</TD>
<TD WIDTH = "50%" ALIGN="left"><a href="./manage_main?skey=id<dtml-if "rkey == ''">&rkey=id</dtml-if>">Id</a></TD>
<TD WIDTH = "15%" ALIGN="left"><a href="./manage_main?skey=get_size<dtml-if "rkey == ''">&rkey=get_size</dtml-if>">Size</a></TD>
<TD WIDTH = "29%" ALIGN="left"><a href="./manage_main?skey=bobobase_modification_time<dtml-if "rkey == ''">&rkey=bobobase_modification_time</dtml-if>">Last Modified</a></TD>
</TR>
<dtml-in objectItems sort_expr="skey" reverse_expr="rkey">
<dtml-if sequence-odd>
<TR> <TR>
</dtml-if>
<dtml-if sequence-even>
<TR BGCOLOR="#DDDDDD">
</dtml-if>
<TD ALIGN="LEFT" VALIGN="TOP" WIDTH="16"> <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="16">
<INPUT TYPE="CHECKBOX" NAME="ids:list" VALUE="&dtml-sequence-key;"> <INPUT TYPE="CHECKBOX" NAME="ids:list" VALUE="&dtml-sequence-key;">
</TD> </TD>
...@@ -87,19 +37,6 @@ function toggleSelect() ...@@ -87,19 +37,6 @@ function toggleSelect()
</dtml-if> </dtml-if>
</dtml-if> </dtml-if>
</TD> </TD>
<dtml-with sequence-key>
<TD>
<dtml-if get_size>
<dtml-var get_size thousands_commas> bytes
<dtml-else>
&nbsp;
</dtml-if>
</TD>
<TD>
<dtml-var bobobase_modification_time fmt=mm>/<dtml-var bobobase_modification_time fmt=dd>/<dtml-var bobobase_modification_time fmt=yy>&nbsp;
<dtml-var bobobase_modification_time fmt=AMPMMinutes>
</TD>
</dtml-with>
</TR> </TR>
</dtml-in> </dtml-in>
</TABLE> </TABLE>
...@@ -120,21 +57,11 @@ function toggleSelect() ...@@ -120,21 +57,11 @@ function toggleSelect()
<INPUT TYPE="SUBMIT" NAME="manage_delObjects:method" VALUE="Delete"> <INPUT TYPE="SUBMIT" NAME="manage_delObjects:method" VALUE="Delete">
</dtml-if> </dtml-if>
<dtml-if "_.SecurityCheckPermission('Import/Export objects', this())"> <dtml-if "_.SecurityCheckPermission('Import/Export objects', this())">
<INPUT TYPE="SUBMIT" NAME="manage_importExportForm:method" VALUE="Import/Export..."> <INPUT TYPE="SUBMIT" NAME="manage_importExportForm:method" VALUE="Export...">
</dtml-if> </dtml-if>
</TD> </TD>
</TR> </TR>
</TABLE> </TABLE>
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING=2>
<TR>
<TD ALIGN="LEFT" VALIGN="TOP" WIDTH="16"></TD>
<TD ALIGN="LEFT" VALIGN="TOP">
<FORM OnSubmit="return false;">
<Input type="submit" value="Unselect All" OnClick="toggleSelect(); return false">
</FORM>
</TD>
</TR>
</TABLE>
<dtml-else> <dtml-else>
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2"> <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2">
<TR> <TR>
...@@ -197,6 +124,3 @@ window.parent.update_menu(); ...@@ -197,6 +124,3 @@ window.parent.update_menu();
</BODY> </BODY>
</HTML> </HTML>
lib/python/OFS/properties.dtml
View file @ 678a457e
...@@ -5,22 +5,27 @@ ...@@ -5,22 +5,27 @@
</head> </head>
<body bgcolor="#FFFFFF" link="#000099" vlink="#555555"> <body bgcolor="#FFFFFF" link="#000099" vlink="#555555">
<dtml-var manage_tabs> <dtml-var manage_tabs>
<dtml-if Principia-Version> <dtml-if Principia-Version>
<p> <p>
<em>You are currently working in version <dtml-var Principia-Version></em> <em>You are currently working in version <dtml-var Principia-Version></em>
</p> </p>
</dtml-if Principia-Version> </dtml-if Principia-Version>
<TABLE CELLPADDING="4" BORDER=1>
<TR>
<TD COLSPAN="2" BGCOLOR="#000099"><font color="#FFFFFF">Defined Properties</font></TD>
</TR>
<TR>
<TD WIDTH="70%" VALIGN="TOP">
<form action="<dtml-var URL1>" method="POST"> <form action="<dtml-var URL1>" method="POST">
<dtml-if propertyMap> <dtml-if propertyMap>
<p>
<table border="1" cellspacing="0" cellpadding="2"> Properties allow you to assign simple values to Zope objects.
The following properties are defined for this item.
<dtml-if property_extensible_schema__>
To <a href="#addpropform">
add a new property</a>, enter a name, type and value for the new property
and click the &quot;Add&quot; button.
</dtml-if>
To change property values, edit the
values and click "Save Changes".
</p>
<table border="0" cellspacing="0" cellpadding="2">
<tr> <tr>
<th colspan="3">Property</th> <th colspan="3">Property</th>
<th>Type</th> <th>Type</th>
...@@ -148,15 +153,7 @@ ...@@ -148,15 +153,7 @@
</dtml-if> </dtml-if>
</td> </td>
</tr> </tr>
</table></TD> </table>
<TD VALIGN=TOP WIDTH="30%">
Properties allow you to assign simple values to Zope objects.
The properties at left are defined for this item.
To change property values, edit the
values and click "Save Changes".
</TD>
</TR>
</TABLE>
<dtml-else> <dtml-else>
<p> <p>
...@@ -171,14 +168,17 @@ To add a property, click the &quot;Add...&quot; button. ...@@ -171,14 +168,17 @@ To add a property, click the &quot;Add...&quot; button.
</form> </form>
<dtml-if property_extensible_schema__> <dtml-if property_extensible_schema__>
<TABLE CELLPADDING="4" BORDER=1> <a name="addpropform">
<TR>
<TD COLSPAN="2" BGCOLOR="#000099"><font color="#FFFFFF">Add Properties</font></TD>
</TR>
<TR>
<TD WIDTH="70%" VALIGN="TOP">
<form action="<dtml-var URL1>/manage_addProperty" method="POST"> <form action="<dtml-var URL1>/manage_addProperty" method="POST">
<table BORDER=1 CELLPADDING=2> <p>
To add a new property, enter a name, type and value for the new
property and click the &quot;Add&quot;
button. For &quot;selection&quot; and &quot;multiple selection&quot;
properties enter the name of a selection variable in the &quot;Value&quot;
field. The selection variable is a property or method that returns a list
of strings from which the selection(s) can be chosen.
</p>
<table>
<tr> <tr>
<th align="left" valign="top">Name</th> <th align="left" valign="top">Name</th>
<td align="left" valign="top"><input type="text" name="id" size="20"></td> <td align="left" valign="top"><input type="text" name="id" size="20"></td>
...@@ -210,17 +210,6 @@ To add a property, click the &quot;Add...&quot; button. ...@@ -210,17 +210,6 @@ To add a property, click the &quot;Add...&quot; button.
</tr> </tr>
</table> </table>
</form> </form>
</TD>
<TD VALIGN = "top" WIDTH="30%">
To add a new property, enter a name, type and value for the new
property and click the &quot;Add&quot;
button. For &quot;selection&quot; and &quot;multiple selection&quot;
properties enter the name of a selection variable in the &quot;Value&quot;
field. The selection variable is a property or method that returns a list
of strings from which the selection(s) can be chosen.
</TD>
</TR>
</TABLE>
</dtml-if> </dtml-if>
</body> </body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7