Log in
Forgot your password?
Diff of DemoProduct, v. 0.9.0 and 0.9.2
This is a diff of the FSDump output for the versions of DemoPortal shipped with PTK 0.9.0 and 0.9.2:
diff -r -u 0.9.0/DemoPortal/.objects 0.9.2/DemoPortal/.objects
--- 0.9.0/DemoPortal/.objects Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/.objects Tue Nov 21 08:51:55 2000
@@ -1,6 +1,14 @@
+FishbowlProject:Z Class
+FishbowlProject_add:DTML Method
+FishbowlProject_add_permission:Zope Permission
+FishbowlProject_edit_permission:Zope Permission
Interfaces:Folder
Portal:Z Class
Portal_add:DTML Method
Portal_add_permission:Zope Permission
Portal_factory:Zope Factory
+UseCase:Z Class
+UseCase_add:DTML Method
+UseCase_add_permission:Zope Permission
+UseCase_edit_permission:Zope Permission
instaPortal:DTML Method
Only in 0.9.2/DemoPortal: FishbowlProject
Only in 0.9.2/DemoPortal: FishbowlProject_add.dtml
Only in 0.9.2/DemoPortal: FishbowlProject_add.properties
Only in 0.9.2/DemoPortal: FishbowlProject_add_permission.properties
Only in 0.9.2/DemoPortal: FishbowlProject_edit_permission.properties
diff -r -u 0.9.0/DemoPortal/Interfaces/.objects 0.9.2/DemoPortal/Interfaces/.objects
--- 0.9.0/DemoPortal/Interfaces/.objects Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/.objects Tue Nov 21 08:51:55 2000
@@ -1,2 +1,3 @@
css_aware:Folder
generic:Folder
+sweng:Folder
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/Images/.objects 0.9.2/DemoPortal/Interfaces/css_aware/Images/.objects
--- 0.9.0/DemoPortal/Interfaces/css_aware/Images/.objects Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/Images/.objects Tue Nov 21 08:51:55 2000
@@ -1,4 +1,5 @@
UpFolder_icon.gif:Image
go.gif:Image
logo.png:Image
+spacer.gif:Image
tinyzope.jpg:Image
Only in 0.9.2/DemoPortal/Interfaces/css_aware/Images: spacer.gif
Only in 0.9.2/DemoPortal/Interfaces/css_aware/Images: spacer.gif.properties
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/Styles/.objects 0.9.2/DemoPortal/Interfaces/css_aware/Styles/.objects
--- 0.9.0/DemoPortal/Interfaces/css_aware/Styles/.objects Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/Styles/.objects Tue Nov 21 08:51:55 2000
@@ -1,2 +1,6 @@
-default:DTML Method
-nouvelle:DTML Method
+css_inline_or_link:DTML Method
+default:DTML Document
+isNetscrape4:Python Method
+nouvelle:DTML Document
+preferredStyle:Python Method
+testIsNS4:DTML Method
Only in 0.9.2/DemoPortal/Interfaces/css_aware/Styles: css_inline_or_link.dtml
Only in 0.9.2/DemoPortal/Interfaces/css_aware/Styles: css_inline_or_link.properties
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/Styles/default.dtml 0.9.2/DemoPortal/Interfaces/css_aware/Styles/default.dtml
--- 0.9.0/DemoPortal/Interfaces/css_aware/Styles/default.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/Styles/default.dtml Tue Nov 21 08:51:55 2000
@@ -1,4 +1,6 @@
+<dtml-unless css_inline>
<dtml-call "RESPONSE.setHeader('Content-Type','text/css')">
+</dtml-unless>
body {
background-color: #f4f4ff;
@@ -256,4 +258,27 @@
table.Wizard tr th {
text-align: right;
+}
+
+table.NewsItems {
+ border: 0;
+ padding: 2;
+}
+
+td.NewsBorder {
+ background-color: darkblue;
+}
+
+td.NewsTitle {
+ background-color: darkblue;
+ color: white;
+ text-align: center;
+ font-size: large;
+ font-weight: bold;
+}
+
+tr.NewsItemRow td {
+ background-color: white;
+ color: darkblue;
+ font-size: x-small;
}
Only in 0.9.2/DemoPortal/Interfaces/css_aware/Styles: isNetscrape4.properties
Only in 0.9.2/DemoPortal/Interfaces/css_aware/Styles: isNetscrape4.py
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/Styles/nouvelle.dtml 0.9.2/DemoPortal/Interfaces/css_aware/Styles/nouvelle.dtml
--- 0.9.0/DemoPortal/Interfaces/css_aware/Styles/nouvelle.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/Styles/nouvelle.dtml Tue Nov 21 08:51:55 2000
@@ -1,5 +1,7 @@
+<dtml-unless css_inline>
<dtml-call "RESPONSE.setHeader('Content-Type','text/css')">
+</dtml-unless>
body {
background-color: #f4fff4;
font-family: Helvetica, sans-serif;
@@ -252,4 +254,27 @@
table.Wizard tr th {
text-align: right;
+}
+
+table.NewsItems {
+ border: 0;
+ padding: 2;
+}
+
+td.NewsBorder {
+ background-color: darkgreen;
+}
+
+td.NewsTitle {
+ background-color: darkgreen;
+ color: white;
+ text-align: center;
+ font-size: large;
+ font-weight: bold;
+}
+
+tr.NewsItemRow td {
+ background-color: white;
+ color: darkgreen;
+ font-size: x-small;
}
Only in 0.9.2/DemoPortal/Interfaces/css_aware/Styles: preferredStyle.properties
Only in 0.9.2/DemoPortal/Interfaces/css_aware/Styles: preferredStyle.py
Only in 0.9.2/DemoPortal/Interfaces/css_aware/Styles: testIsNS4.dtml
Only in 0.9.2/DemoPortal/Interfaces/css_aware/Styles: testIsNS4.properties
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/Wizards/index_html.dtml 0.9.2/DemoPortal/Interfaces/css_aware/Wizards/index_html.dtml
--- 0.9.0/DemoPortal/Interfaces/css_aware/Wizards/index_html.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/Wizards/index_html.dtml Tue Nov 21 08:51:55 2000
@@ -2,6 +2,9 @@
<h2>Wizards</h2>
+ <p><a href="../folder_add"> <b>Folder</b> </a><br>
+ Folders allow you to organize the contents of your portal. </p>
+
<dtml-in "objectIds('Wizard')">
<dtml-let id="_['sequence-item']"
title="this()[id].title"
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/discussion_thread_view.dtml 0.9.2/DemoPortal/Interfaces/css_aware/discussion_thread_view.dtml
--- 0.9.0/DemoPortal/Interfaces/css_aware/discussion_thread_view.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/discussion_thread_view.dtml Tue Nov 21 08:51:55 2000
@@ -15,7 +15,7 @@
<a href="&dtml-absolute_url;"><img border=0 src="<dtml-var SCRIPT_NAME><dtml-var icon>"></a>
<a href="&dtml-absolute_url;">&dtml-title;</a>,
by <dtml-var Creator>
- on <dtml-var Date fmt="Date">
+ on <dtml-var Date>
</dtml-tree>
<dtml-var standard_html_footer>
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/folder_contents.dtml 0.9.2/DemoPortal/Interfaces/css_aware/folder_contents.dtml
--- 0.9.0/DemoPortal/Interfaces/css_aware/folder_contents.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/folder_contents.dtml Tue Nov 21 08:51:55 2000
@@ -42,7 +42,7 @@
</dtml-if>
-<dtml-in objectValues sort="id" size="19" start=qs>
+<dtml-in contentValues sort="id" size="19" start=qs skip_unauthorized>
<dtml-if next-sequence>
<dtml-call "REQUEST.set('next-sequence'
, _['next-sequence-start-number'])">
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/index_html.dtml 0.9.2/DemoPortal/Interfaces/css_aware/index_html.dtml
--- 0.9.0/DemoPortal/Interfaces/css_aware/index_html.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/index_html.dtml Tue Nov 21 08:51:55 2000
@@ -11,12 +11,49 @@
<dd> <dtml-var description> </dd>
</dl>
-<h4> CHANGEME! </h4>
-<p>You have just finished setting up a new Portal site. For
- further information on building portals with the Zope
- Portal Toolkit, please see the <a href="http://www.zope.org/Products/PTK"
- >PTK Homepage</a>.
-</p>
+ <!-- Main column ends here -->
+
+</td>
+<td valign="top">
+ <table class="NewsItems" cellspacing="0">
+ <tr>
+ <td width="1" rowspan="13" class="NewsBorder">
+ <img src="Images/spacer.gif" alt="Spacing image"
+ width="1" height="2" border="0">
+ </td>
+ <td class="NewsTitle">
+ Portal News
+ </td>
+ </tr>
+
+ <dtml-in "portal_catalog.searchResults( meta_type='News Item'
+ , sort_on='Date'
+ , sort_order='reverse'
+ , review_state='published'
+ )" size="10">
+ <tr class="NewsItemRow">
+ <td>
+ <a href="<dtml-var "portal_catalog.getpath( data_record_id_ )"
+ >"> &dtml-Title; </a><br>
+ <dtml-var Date>
+ </td>
+ </tr>
+ <dtml-else>
+ <tr class="NewsItemRow">
+ <td>
+ No news is no news.
+ </td>
+ </tr>
+ </dtml-in>
+
+ <tr class="NewsItemRow">
+ <td>
+ <a href="&dtml.url-recent_news;">More...</a>
+ </td>
+ </tr>
+
+ </table>
+</td>
</div>
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/mail_password_template.dtml 0.9.2/DemoPortal/Interfaces/css_aware/mail_password_template.dtml
--- 0.9.0/DemoPortal/Interfaces/css_aware/mail_password_template.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/mail_password_template.dtml Tue Nov 21 08:51:55 2000
@@ -1,8 +1,9 @@
<dtml-var standard_html_header>
<dtml-with portal_properties>
<dtml-sendmail mailhost="MailHost">
-From: "&dtml-email_from_name;" <&dtml-email_from_address>
-To: <dtml-var email>
+From: "&dtml-email_from_name;" <&dtml-email_from_address;>
+To: <dtml-var "member.email">
+Errors-to: <&dtml-email_from_address;>
Subject: Membership reminder
Your password: <dtml-var password>
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/personalize_form.dtml 0.9.2/DemoPortal/Interfaces/css_aware/personalize_form.dtml
--- 0.9.0/DemoPortal/Interfaces/css_aware/personalize_form.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/personalize_form.dtml Tue Nov 21 08:51:55 2000
@@ -49,7 +49,7 @@
<th>Chrome</th>
<td>
<select name="chrome">
- <dtml-in "Styles.objectValues()">
+ <dtml-in "Styles.objectValues( [ 'DTML Document' ] )">
<dtml-let sel="member.chrome == _['id'] and 'selected' or ''">
<option value="&dtml-id;" &dtml-sel;> &dtml-title;</option>
</dtml-let>
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/recent_news.dtml 0.9.2/DemoPortal/Interfaces/css_aware/recent_news.dtml
--- 0.9.0/DemoPortal/Interfaces/css_aware/recent_news.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/recent_news.dtml Tue Nov 21 08:51:55 2000
@@ -26,7 +26,7 @@
</td>
<td align="right" valign="top" bgcolor="#6699CC">
<p class="NewsDateline">
- <dtml-var Date fmt="aCommon">
+ <dtml-var Date>
</p>
</td>
</tr>
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/search.dtml 0.9.2/DemoPortal/Interfaces/css_aware/search.dtml
--- 0.9.0/DemoPortal/Interfaces/css_aware/search.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/search.dtml Tue Nov 21 08:51:55 2000
@@ -46,7 +46,7 @@
&dtml-meta_type;
</td>
<td>
- <dtml-var Date fmt="aCommon">
+ <dtml-var Date>
</td>
</tr>
<dtml-if sequence-end>
diff -r -u 0.9.0/DemoPortal/Interfaces/css_aware/standard_html_header.dtml 0.9.2/DemoPortal/Interfaces/css_aware/standard_html_header.dtml
--- 0.9.0/DemoPortal/Interfaces/css_aware/standard_html_header.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/css_aware/standard_html_header.dtml Tue Nov 21 08:51:55 2000
@@ -8,19 +8,9 @@
<html>
<head>
<title><dtml-with portal_properties>&dtml-title;</dtml-with></title>
- <dtml-if expr="_.hasattr(member, 'chrome') and member.chrome">
- <dtml-let member_chrome="member.chrome">
- <dtml-unless expr="member_chrome == 'None'">
- <link rel="stylesheet"
- href="&dtml-portal_url;/Styles/&dtml-member_chrome;"
- type="text/css">
- </dtml-unless>
- </dtml-let>
- <dtml-else>
- <link rel="stylesheet"
- href="&dtml-portal_url;/Styles/default"
- type="text/css">
- </dtml-if>
+ <dtml-with Styles>
+ <dtml-var css_inline_or_link>
+ </dtml-with>
</head>
<bodY>
@@ -58,7 +48,7 @@
<dtml-var actions_box>
</td>
- <td colspan="2" class="Desktop">
+ <td class="Desktop">
<dtml-if "not portal_membership.isAnonymousUser() and
not _.hasattr(member, 'getMemberId')">
diff -r -u 0.9.0/DemoPortal/Interfaces/generic/Images/.objects 0.9.2/DemoPortal/Interfaces/generic/Images/.objects
--- 0.9.0/DemoPortal/Interfaces/generic/Images/.objects Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/generic/Images/.objects Tue Nov 21 08:51:55 2000
@@ -1,4 +1,5 @@
UpFolder_icon.gif:Image
go.gif:Image
logo.jpg:Image
+spacer.gif:Image
tinyzope.jpg:Image
Only in 0.9.2/DemoPortal/Interfaces/generic/Images: spacer.gif
Only in 0.9.2/DemoPortal/Interfaces/generic/Images: spacer.gif.properties
diff -r -u 0.9.0/DemoPortal/Interfaces/generic/Wizards/index_html.dtml 0.9.2/DemoPortal/Interfaces/generic/Wizards/index_html.dtml
--- 0.9.0/DemoPortal/Interfaces/generic/Wizards/index_html.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/generic/Wizards/index_html.dtml Tue Nov 21 08:51:55 2000
@@ -2,6 +2,9 @@
<h2>Wizards</h2>
+ <p><a href="../folder_add"> <b>Folder</b> </a><br>
+ Folders allow you to organize the contents of your portal. </p>
+
<dtml-in "objectIds('Wizard')">
<dtml-let id="_['sequence-item']"
title="this()[id].title"
diff -r -u 0.9.0/DemoPortal/Interfaces/generic/discussion_thread_view.dtml 0.9.2/DemoPortal/Interfaces/generic/discussion_thread_view.dtml
--- 0.9.0/DemoPortal/Interfaces/generic/discussion_thread_view.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/generic/discussion_thread_view.dtml Tue Nov 21 08:51:55 2000
@@ -15,7 +15,7 @@
<a href="&dtml-absolute_url;"><img border=0 src="<dtml-var SCRIPT_NAME><dtml-var icon>"></a>
<a href="&dtml-absolute_url;">&dtml-title;</a>,
by <dtml-var Creator>
- on <dtml-var Date fmt="Date">
+ on <dtml-var Date>
</dtml-tree>
<dtml-var standard_html_footer>
diff -r -u 0.9.0/DemoPortal/Interfaces/generic/folder_contents.dtml 0.9.2/DemoPortal/Interfaces/generic/folder_contents.dtml
--- 0.9.0/DemoPortal/Interfaces/generic/folder_contents.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/generic/folder_contents.dtml Tue Nov 21 08:51:55 2000
@@ -1,94 +1,117 @@
<dtml-call "REQUEST.set('isDesktop', 1)">
<dtml-var standard_html_header>
-<dtml-if "not portal_membership.checkPermission('Access contents information', this())">
+<dtml-if "not portal_membership.checkPermission('Access contents information'
+ , this())">
<dtml-call "RESPONSE.redirect(absolute_url())">
</dtml-if>
<!-- This is the desktop area -->
+<div class="Desktop">
-<H1 class="DesktopTitle">Desktop</h1>
+<h1> Desktop </h1>
-<FORM ACTION="&dtml-absolute_url;" METHOD="POST">
- <table>
+<form ACTION="&dtml-absolute_url;" METHOD="POST">
+ <table class="FormLayout">
<tr>
<td valign="top">
- <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2">
- <dtml-if "portal_membership.checkPermission('Access contents information', this(), 'aq_parent')">
- <TR>
- <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="16"> </TD>
- <TD ALIGN="LEFT" VALIGN="TOP">
- <dtml-if "_.hasattr(this().aq_parent, 'portal_url')">
- <A HREF="../folder_contents"><IMG SRC="Images/UpFolder_icon.gif" ALT="[Link]" BORDER="0" width="16" height="16"></A>
+ <table class="ContentsList">
+ <dtml-if "portal_membership.checkPermission( 'Access contents information'
+ , this(), 'aq_parent')">
+ <dtml-let upNav="_.hasattr(this().aq_parent, 'portal_url')"
+ upID="this().aq_parent.id"
+ >
+ <tr>
+ <td width="16"><br></td>
+ <td>
+ <dtml-if upNav>
+ <a href="../folder_contents"
+ ><img src="&dtml-portal_url;/Images/UpFolder_icon.gif"
+ alt="[Link]"></a>
</dtml-if>
- </TD>
- <TD ALIGN="LEFT" VALIGN="TOP">
- <dtml-if "_.hasattr(this().aq_parent, 'portal_url')">
- Up to <A HREF="../folder_contents"><dtml-var "this().aq_parent.id"></A>
+ </td>
+ <td>
+ <dtml-if upNav>
+ Up to <a href="../folder_contents"><dtml-var upID></a>
<dtml-else>
<span class="mild">Root</span>
</dtml-if>
- </TD>
- </TR>
+ </td>
+ </tr>
+ </dtml-let>
</dtml-if>
- <dtml-in objectValues sort="id" size="19" start=qs>
-<dtml-if next-sequence>
-<dtml-call "REQUEST.set('next-sequence',_['next-sequence-start-number'])">
-</dtml-if>
-<dtml-if previous-sequence>
-<dtml-call "REQUEST.set('previous-sequence',_['previous-sequence-start-number'])">
-</dtml-if>
- <tr>
- <td align="left" valign="top" width="16">
- <input type="checkbox" name="ids:list" value="&dtml-id;">
- </td>
- <td align="left" valign="top">
- <a href="&dtml.url_quote-id;<dtml-if isPrincipiaFolderish>/folder_contents<dtml-elif isPortalContent>/view</dtml-if>"><img src="<dtml-var SCRIPT_NAME>/<dtml-var icon>" alt="&dtml-meta_type;" border="0" width="16" height="16"></a>
+<dtml-in contentValues sort="id" size="19" start=qs skip_unauthorized>
+ <dtml-if next-sequence>
+ <dtml-call "REQUEST.set('next-sequence'
+ , _['next-sequence-start-number'])">
+ </dtml-if>
+ <dtml-if previous-sequence>
+ <dtml-call "REQUEST.set('previous-sequence'
+ ,_['previous-sequence-start-number'])">
+ </dtml-if>
+ <dtml-let obj="_.getitem('sequence-item', 0 )"
+ folderish=isPrincipiaFolderish
+ portalish="_.hasattr( obj, 'isPortalContent' )
+ and obj.isPortalContent"
+ methodID="folderish and '/folder_contents' or ( portalish
+ and '/view' or '' )"
+ >
+ <tr>
+ <td>
+ <input type="checkbox" name="ids:list" value="&dtml-id;">
+ </td>
+ <td>
+ <a href="&dtml.url_quote-id;&dtml-methodID;"
+ ><img src="&dtml-portal_url;/&dtml-icon;"
+ alt="&dtml-meta_type;"></a>
</td>
- <td align="left" valign="top">
- <a href="&dtml.url_quote-id;<dtml-if isPrincipiaFolderish>/folder_contents<dtml-elif isPortalContent>/view</dtml-if>">&dtml-id;<dtml-if title> (&dtml-title;)</dtml-if></a>
+ <td>
+ <a href="&dtml.url_quote-id;&dtml-methodID;"
+ >&dtml-id;<dtml-if title> (&dtml-title;)</dtml-if></a>
</td>
</tr>
- <dtml-if qs>
- <dtml-if "_['sequence-index'] - _.int(qs) == 7">
- </table>
- </td>
- <td valign="top">
- <table border="0" cellspacing="0" cellpadding="2">
- </dtml-if>
- <dtml-else>
- <dtml-if "_['sequence-index'] == 8">
- </table>
- </td>
- <td valign="top">
- <table border="0" cellspacing="0" cellpadding="2">
- </dtml-if>
- </dtml-if>
- </dtml-in>
- </table>
- </td>
- </tr>
+
+ <dtml-if qs>
+ <dtml-if "_['sequence-index'] - _.int(qs) == 7">
+ </table><dtml-comment> End of first column </dtml-comment>
+ </td>
+ <td>
+ <table class="ContentsList">
+ </dtml-if>
+ <dtml-else> <dtml-comment> No batch </dtml-comment>
+ <dtml-if "_['sequence-index'] == 8">
+ </table><dtml-comment> End of first column </dtml-comment>
+ </td>
+ <td>
+ <table class="ContentsList">
+ </dtml-if>
+ </dtml-if>
+ </dtml-let>
+</dtml-in>
+ </table>
+ </td>
+ </tr>
-<tr>
+ <tr>
<td align="right">
<dtml-if previous-sequence>
<a href="folder_contents?qs=&dtml-previous-sequence;">Previous items</a>
<dtml-else>
-
+ <br>
</dtml-if>
</td>
<td align="left">
<dtml-if next-sequence>
<a href="folder_contents?qs=&dtml-next-sequence;">Next items</a>
<dtml-else>
-
+ <br>
</dtml-if>
</td>
</tr>
+</table><dtml-comment> End of listing table </dtml-comment>
-</table>
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING=2>
<TR>
diff -r -u 0.9.0/DemoPortal/Interfaces/generic/index_html.dtml 0.9.2/DemoPortal/Interfaces/generic/index_html.dtml
--- 0.9.0/DemoPortal/Interfaces/generic/index_html.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/generic/index_html.dtml Tue Nov 21 08:51:55 2000
@@ -6,39 +6,21 @@
<table cellpadding="2" cellspacing="2">
<tr>
<td valign="top">
-<p>You have just finished setting up a new Portal site.</p>
-<h3>Get Zope</h3>
+<h1> Welcome to &dtml-title; </h1>
-<p>
- Download Zope now for free!
- Zope runs on almost all Unix computers and Windows NT.
- Zope comes with everything you need
- to get up and running including a built-in web server and search engine.
+<dl>
+ <dt> Overview </dt>
+ <dd> <dtml-var description> </dd>
+</dl>
+
+<h4> CHANGEME! </h4>
+<p>You have just finished setting up a new Portal site. For
+ further information on building portals with the Zope
+ Portal Toolkit, please see the <a href="http://www.zope.org/Products/PTK"
+ >PTK Homepage</a>.
</p>
-<p>
-<a href="http://www.zope.org/Products" class="welcomelink">Download Zope</a>
-| <a href="http://www.zope.org/Documentation" class="welcomelink">Documentation</a>
-</p>
-
-<h3>Community</h3>
-
-<p>
- Zope benefits from a strong developer and user community. Zope
- community
- members drive Zope forward and
- help each other by providing peer support, advice,
- and open source software. More than any other factor, Zope owes its success to its
- large and active community.
-</p>
-
-<p>
-<a href="http://www.zope.org/Resources/MailingLists" class="welcomelink">Mailing Lists</a>
-| <a href="http://www.zope.org/Register/register.html" class="welcomelink">Join Zope.org</a>
-</p>
-
-
</TD>
<td valign="top">
<TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2" WIDTH="200">
@@ -46,17 +28,26 @@
<TR>
<TD WIDTH="1" ROWSPAN="2" BGCOLOR="#6699CC"><IMG SRC="Images/spacer.gif" ALT="Spacing image" WIDTH="1" HEIGHT="2" BORDER="0"></TD>
- <TD VALIGN="TOP" CLASS="righttitle"><H2 CLASS="righttitle">Zope News</TD>
+ <TD VALIGN="TOP" CLASS="righttitle"><H2 CLASS="righttitle">Portal News</TD>
</TR>
+ <dtml-in "portal_catalog.searchResults(meta_type='News Item', sort_on='Date', sort_order='reverse', review_state='published')" size="10">
+ <TR>
+ <TD VALIGN="TOP">
+ <P CLASS="right">
+ <a href="<dtml-var "portal_catalog.getpath(data_record_id_)">">&dtml-title;</a><br> <dtml-var Date>
+ </TD>
+ </TR>
+ <dtml-else>
<TR>
<TD VALIGN="TOP">
<P CLASS="right">
- <dtml-in "portal_catalog.searchResults(meta_type='News Item', sort_on='Date', sort_order='reverse', review_state='published')" size="10">
- <a href="<dtml-var "portal_catalog.getpath(data_record_id_)">">&dtml-title;</a> <dtml-var Date fmt=Date><br>
- <dtml-else>
No news is no news.
- </dtml-in>
+ </TD>
+ </TR>
+ </dtml-in>
+ <TR>
+ <TD VALIGN="TOP">
<p class="right">
<a href="&dtml.url-recent_news;">More...</a>
</p>
diff -r -u 0.9.0/DemoPortal/Interfaces/generic/mail_password_template.dtml 0.9.2/DemoPortal/Interfaces/generic/mail_password_template.dtml
--- 0.9.0/DemoPortal/Interfaces/generic/mail_password_template.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/generic/mail_password_template.dtml Tue Nov 21 08:51:55 2000
@@ -1,8 +1,9 @@
<dtml-var standard_html_header>
<dtml-with portal_properties>
<dtml-sendmail mailhost="MailHost">
-From: "&dtml-email_from_name;" <&dtml-email_from_address>
-To: <dtml-var email>
+From: "&dtml-email_from_name;" <&dtml-email_from_address;>
+To: <dtml-var "member.email">
+Errors-to: <&dtml-email_from_address;>
Subject: Membership reminder
Your password: <dtml-var password>
diff -r -u 0.9.0/DemoPortal/Interfaces/generic/recent_news.dtml 0.9.2/DemoPortal/Interfaces/generic/recent_news.dtml
--- 0.9.0/DemoPortal/Interfaces/generic/recent_news.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/generic/recent_news.dtml Tue Nov 21 08:51:55 2000
@@ -26,7 +26,7 @@
</td>
<td align="right" valign="top" bgcolor="#6699CC">
<p class="NewsDateline">
- <dtml-var Date fmt="aCommon">
+ <dtml-var Date>
</p>
</td>
</tr>
diff -r -u 0.9.0/DemoPortal/Interfaces/generic/search.dtml 0.9.2/DemoPortal/Interfaces/generic/search.dtml
--- 0.9.0/DemoPortal/Interfaces/generic/search.dtml Tue Nov 21 08:54:45 2000
+++ 0.9.2/DemoPortal/Interfaces/generic/search.dtml Tue Nov 21 08:51:55 2000
@@ -21,7 +21,7 @@
</dtml-if>
<tr>
<td><a href="<dtml-var "portal_catalog.getpath(data_record_id_)" url_quote>"><img border=0 src="<dtml-var SCRIPT_NAME><dtml-var icon>"> &dtml-title;</a></td> <td>&dtml-meta_type;</td>
- <td><dtml-var Date fmt="aCommon"></td>
+ <td><dtml-var Date></td>
</tr>
<dtml-if sequence-end>
</table>
Only in 0.9.2/DemoPortal/Interfaces: sweng
diff -r -u 0.9.0/DemoPortal/Portal/propertysheets/methods/PortalProperties/propertysheets/common/props 0.9.2/DemoPortal/Portal/propertysheets/methods/PortalProperties/propertysheets/common/props
--- 0.9.0/DemoPortal/Portal/propertysheets/methods/PortalProperties/propertysheets/common/props Tue Nov 21 08:54:44 2000
+++ 0.9.2/DemoPortal/Portal/propertysheets/methods/PortalProperties/propertysheets/common/props Tue Nov 21 08:51:55 2000
@@ -1,3 +1,4 @@
+content_zclasses:lines=['']
description:text=
email_from_address:string=
email_from_name:string=
diff -r -u 0.9.0/DemoPortal/Portal/propertysheets/methods/content_status_modify.dtml 0.9.2/DemoPortal/Portal/propertysheets/methods/content_status_modify.dtml
--- 0.9.0/DemoPortal/Portal/propertysheets/methods/content_status_modify.dtml Tue Nov 21 08:54:44 2000
+++ 0.9.2/DemoPortal/Portal/propertysheets/methods/content_status_modify.dtml Tue Nov 21 08:51:55 2000
@@ -4,6 +4,7 @@
new_location="portal_workflow.changeStateFor(this(),
REQUEST['transition'], REQUEST['comment'],
effective_date=REQUEST['effective_date']).absolute_url()">
+ <dtml-call reindexObject>
<dtml-if expr="old_location != new_location">
<dtml-call expr="RESPONSE.redirect(new_location + '/content_status_form')">
<dtml-else>
Only in 0.9.2/DemoPortal: UseCase
Only in 0.9.2/DemoPortal: UseCase_add.dtml
Only in 0.9.2/DemoPortal: UseCase_add.properties
Only in 0.9.2/DemoPortal: UseCase_add_permission.properties
Only in 0.9.2/DemoPortal: UseCase_edit_permission.properties