web/hosts/issues/html file.item,NONE,1.1 user.forgotten,NONE,1.1 user.rego_progress,NONE,1.1 Makefile.in,1.14,1.15 file.index,1.2,1.3 user.register,1.2,1.3
Tobias Hunger <[email protected]> Wed, 20 Aug 2003 06:33:10 -0500
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/web/hosts/issues/html
In directory purcel:/tmp/cvs-serv14118/hosts/issues/html
Modified Files:
Makefile.in file.index user.register
Added Files:
file.item user.forgotten user.rego_progress
Log Message:
* Add files to reenable user registration (new files needed for the email
challenge introduced in roundup 0.6)
* Install html/home (the file is in CVS, the page on the active tracker
says somebody deleted that file?)
* Make sure directories are there before installing into them.
* Report-generation gracefully fails now (generates empty reports) if
the tracker is not available.
--- NEW FILE: file.item ---
<tal:block metal:use-macro="templates/page/macros/frame">
<tal:block metal:fill-slot="body_title">
<p class="header">File display</p>
</tal:block>
<tal:block metal:fill-slot="content">
<span tal:condition="python:not (context.is_view_ok() or context.is_edit_ok())">
You are not allowed to view this page.
</span>
<form method="POST" onSubmit="return submit_once()"
enctype="multipart/form-data" tal:condition="context/is_edit_ok">
<input type="hidden" name=":template" value="item">
<input type="hidden" name=":required" value="name,type">
<input type="hidden" name=":multilink"
tal:condition="python:request.form.has_key(':multilink')"
tal:attributes="value request/form/:multilink/value">
<table class="form">
<tr>
<th>Name</th>
<td tal:content="structure context/name/field"></td>
</tr>
<tr>
<th>Content Type</th>
<td tal:content="structure context/type/field"></td>
</tr>
<tr>
<td> </td>
<td tal:content="structure context/submit">submit button here</td>
</tr>
</table>
</form>
<a tal:condition="python:context.id and context.is_view_ok()"
tal:attributes="href string:file${context/id}/${context/name}">download</a>
<table class="form" tal:condition="context/is_only_view_ok">
<tr>
<th>Name</th>
<td tal:content="context/name"></td>
</tr>
<tr>
<th>Content Type</th>
<td tal:content="context/type"></td>
</tr>
</table>
<tal:block tal:condition="python:context.id and context.is_view_ok()"
tal:replace="structure context/history" />
</tal:block>
</tal:block>
--- NEW FILE: user.forgotten ---
<tal:block metal:use-macro="templates/page/macros/frame">
<tal:block metal:fill-slot="body_title">
<p class="header">Password reset request</p>
</tal:block>
<tal:block metal:fill-slot="content">
<p>You have two options if you have forgotten your password. If you
know the email address you registered with, enter it below.</p>
<form method="POST" onSubmit="return submit_once()">
<input type="hidden" name="@action" value="passrst">
<input type="hidden" name="@template" value="forgotten">
<table class="form">
<tr><th>Email Address:</th> <td><input name="address"></td></tr>
<tr><td></td><td><input type="submit" value="Request password reset"></td></tr>
</table>
<p>Or, if you know your username, then enter it below.</p>
<table class="form">
<tr><th>Username:</th> <td><input name="username"></td> </tr>
<tr><td></td><td><input type="submit" value="Request password reset"></td></tr>
</table>
</form>
<p>A confirmation email will be sent to you - please follow the
instructions within it to complete the reset process.</p>
</tal:block>
</tal:block>
--- NEW FILE: user.rego_progress ---
<tal:block metal:use-macro="templates/page/macros/frame">
<tal:block metal:fill-slot="body_title">
<p class="header">Registration in process...</p>
</tal:block>
<tal:block metal:fill-slot="content">
<p>You will shortly receive an email to confirm your registration. To
complete the registration process, visit the link indicated in the email.
</p>
</tal:block>
</tal:block>
Index: Makefile.in
===================================================================
RCS file: /cvs/fresco/web/hosts/issues/html/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.in 8 Jan 2003 16:50:29 -0000 1.14
+++ Makefile.in 20 Aug 2003 11:33:07 -0000 1.15
@@ -8,20 +8,30 @@
priority.help status.help _generic.help
raw := bug.index bug.item bug.search bug.doc \
+ \
task.index task.item task.search task.doc \
+ \
milestone.index milestone.item milestone.search milestone.doc \
- user.register user.index user.item \
+ \
+ user.register user.rego_progress user.index user.item \
+ user.forgotten \
+ \
query.index query.item \
+ \
msg.index msg.item \
+ \
_generic.index _generic.item \
- topic.item file.index \
-
+ \
+ topic.item \
+ file.index file.item \
+ home
vpath %.xml $(srcdir)
all: $(pages)
install: $(pages)
+ mkdir -p $(sitedir)/html
cp $(pages) $(sitedir)/html
cp $(patsubst %, $(srcdir)/%, $(raw)) $(sitedir)/html
cp $(srcdir)/issues.js $(srcdir)/issues.css $(sitedir)/html
@@ -45,4 +55,4 @@
-e 's,xmlns:metal="http://www.zope.org/METAL",,g' $< > $@
clean:
- rm -f $(pages)
\ No newline at end of file
+ rm -f $(pages)
Index: file.index
===================================================================
RCS file: /cvs/fresco/web/hosts/issues/html/file.index,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- file.index 11 Dec 2002 22:01:35 -0000 1.2
+++ file.index 20 Aug 2003 11:33:08 -0000 1.3
@@ -1,20 +1,25 @@
<tal:block metal:use-macro="templates/page/macros/frame">
<tal:block metal:fill-slot="body_title">
- <p class="header">List of bugs</p>
+ <p class="header">List of files</p>
</tal:block>
<tal:block metal:fill-slot="content">
- <table class="list">
- <tr tal:repeat="file class/list">
- <td tal:condition="display/properties/name">
- <a href="" tal:attributes="href string:file${file/id}/${file/name}">dld link</a>
- </td>
- <td tal:condition="request/properties/type" tal:content="file/type">content type</td>
- <td tal:condition="request/properties/creator" tal:content="file/creator/name">creator's name</td>
- <td tal:condition="request/properties/creation" tal:content="file/creation">creation date</td>
+ <table class="otherinfo">
+ <tr><th style="padding-right: 10">Download</th>
+ <th style="padding-right: 10">Content Type</th>
+ <th style="padding-right: 10">Uploaded By</th>
+ <th style="padding-right: 10">Date</th>
+ </tr>
+ <tr tal:repeat="file context/list">
+ <td><a tal:attributes="href string:file${file/id}/${file/name}"
+ tal:content="file/name">dld link</a></td>
+ <td tal:content="file/type">content type</td>
+ <td tal:content="file/creator">creator's name</td>
+ <td tal:content="file/creation">creation date</td>
</tr>
</table>
+
</tal:block>
-</tal:block>
+</tal:block>
Index: user.register
===================================================================
RCS file: /cvs/fresco/web/hosts/issues/html/user.register,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- user.register 14 Dec 2002 20:35:37 -0000 1.2
+++ user.register 20 Aug 2003 11:33:08 -0000 1.3
@@ -5,51 +5,63 @@
<tal:block metal:fill-slot="content">
-<tal:block tal:define=" editok python:request.user.username=='anonymous' and
- request.user.hasPermission('Web Registration')">
+ <tal:block tal:define=" editok python:request.user.username=='anonymous' and
+ request.user.hasPermission('Web Registration')">
-<span tal:condition="python:not editok">
+ <span tal:condition="python:not editok">
You are not allowed to view this page.
-</span>
-
-<tal:block tal:condition="editok">
-<form method="POST" onSubmit="return submit_once()" enctype="multipart/form-data">
+ </span>
-<table class="form">
- <tr>
- <th>Name</th>
- <td tal:content="structure context/realname/field">realname</td>
- </tr>
- <tr>
- <th>Login Name</th>
- <td tal:content="structure context/username/field">username</td>
- </tr>
- <tr>
- <th>Login Password</th>
- <td tal:content="structure context/password/field">password</td>
- </tr>
- <tr>
- <th>Confirm Password</th>
- <td tal:content="structure context/password/confirm">password</td>
- </tr>
- <tr>
- <th>E-mail address</th>
- <td tal:content="structure context/address/field">address</td>
- </tr>
+ <tal:block tal:condition="editok">
+ <form method="POST" onSubmit="return submit_once()" enctype="multipart/form-data">
- <tr>
- <td> </td>
- <td>
- <input type="hidden" name=":action" value="register">
- <input type="submit" name="submit" value="Register">
- </td>
- </tr>
-</table>
-</form>
+ <input type="hidden" name=":template" value="register">
+ <input type="hidden" name=":required" value="username">
+ <input type="hidden" name=":required" value="password">
+ <input type="hidden" name=":required" value="address">
-</tal:block>
+ <table class="form">
+ <tr>
+ <th>Name</th>
+ <td tal:content="structure context/realname/field">realname</td>
+ </tr>
+ <tr>
+ <th>Login Name</th>
+ <td tal:content="structure context/username/field">username</td>
+ </tr>
+ <tr>
+ <th>Login Password</th>
+ <td tal:content="structure context/password/field">password</td>
+ </tr>
+ <tr>
+ <th>Confirm Password</th>
+ <td tal:content="structure context/password/confirm">password</td>
+ </tr>
+ <tr tal:condition="python:request.user.hasPermission('Web Roles')">
+ <th>Roles</th>
+ <td tal:condition="exists:item"
+ tal:content="structure context/roles/field">roles</td>
+ <td tal:condition="not:exists:item">
+ <input name="roles" tal:attributes="value db/config/NEW_WEB_USER_ROLES">
+ </td>
+ </tr>
+ <tr>
+ <th>E-mail address</th>
+ <td tal:content="structure context/address/field">address</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>
+ <input type="hidden" name=":action" value="register">
+ <input type="submit" name="submit" value="Register">
+ </td>
+ </tr>
+ </table>
+ </form>
+
+ </tal:block>
-</tal:block>
+ </tal:block>
</tal:block>
</tal:block>