Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/index.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/index.adp 3 Sep 2002 16:29:09 -0000 1.2
@@ -1,11 +1,11 @@
<master src="master">
-<property name="context_bar">@context_bar@</property>
<property name="title">@subsite_name@</property>
+<property name="context_bar">@context_bar@</property>
<ul>
<if @nodes:rowcount@ eq 0>
- <li> (no packages)</li>
+ <li>(no packages)</li>
</if>
<else>
<multiple name="nodes">
@@ -14,7 +14,7 @@
</else>
<if @admin_p@ eq 1>
- <p><li> <a href="admin/">Administration</a></li>
+ <li> <a href="admin/">Administration</a></li>
</if>
</ul>
Index: openacs-4/packages/acs-subsite/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/index.tcl 20 Apr 2001 20:40:31 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/index.tcl 3 Sep 2002 16:29:09 -0000 1.3
@@ -15,7 +15,7 @@
admin_p:onevalue
}
-set context_bar {}
+set context_bar [ad_context_bar]
set package_id [ad_conn package_id]
set admin_p [ad_permission_p $package_id admin]
Index: openacs-4/packages/acs-subsite/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/Attic/master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/master.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/master.adp 3 Sep 2002 16:29:09 -0000 1.2
@@ -1,7 +1,7 @@
<master>
-<property name=focus>@focus@</property>
-<property name=title>@title@</property>
-<property name=context_bar>@title@</property>
+<property name="focus">@focus@</property>
+<property name="title">@title@</property>
+<property name="context_bar">@context_bar@</property>
<h2>@title@</h2>
@context_bar@
Index: openacs-4/packages/acs-subsite/www/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/Attic/master.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/master.tcl 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/master.tcl 3 Sep 2002 16:29:09 -0000 1.2
@@ -12,4 +12,3 @@
set context_bar ""
}
-set context_bar [eval ad_context_bar $context_bar]
Index: openacs-4/packages/acs-subsite/www/pvt/alerts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/alerts.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/pvt/alerts.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/pvt/alerts.adp 3 Sep 2002 16:29:12 -0000 1.2
@@ -1,10 +1,7 @@
-<master>
+<master src="master">
<property name=title>@title@</property>
+<property name="context_bar">@context_bar@</property>
-@decorate_top@
-
-<hr>
-
<if @discussion_forum_alert_p@ eq 1>
<h3>Your discussion forum alerts</h3>
@@ -19,11 +16,11 @@
<th>Keyword</th>
</if>
</tr>
- <multiple name=bboard_rows>
+ <multiple name=bboard_rows>
<tr>
<if @status@ eq "enabled">
- <td><font color=red>Enabled</font></td>
+ <td><font color="red">Enabled</font></td>
<td><a href="@action_url@">Disable</a></td>
</if>
<else>
@@ -36,8 +33,8 @@
<td>@keyword@</td>
</if>
</tr>
-
</multiple>
+
</table>
</blockquote>
@@ -66,7 +63,7 @@
<td><a href="/gc/alert-extend?rowid=@rowid@">@expires@</a></td>
<td>@frequency@</td>
<td>@alert_type@</td>
- <td>@alert_value@</td></tr>
+ <td>@alert_value@</td>
</tr>
</multiple>
Index: openacs-4/packages/acs-subsite/www/pvt/alerts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/alerts.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/pvt/alerts.tcl 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/pvt/alerts.tcl 3 Sep 2002 16:29:12 -0000 1.2
@@ -3,7 +3,7 @@
} {
} -properties {
title:onevalue
- decorate_top:onevalue
+ context_bar:onevalue
discussion_forum_alert_p:onevalue
bboard_keyword_p:onevalue
bboard_rows:multirow
@@ -22,11 +22,9 @@
set full_name "name unknown"
}
-set title [ad_header "$full_name's alerts in [ad_system_name]"]
-set decorate_top [ad_decorate_top "<h2>Email Alerts</h2>
+set title "$full_name's alerts in [ad_system_name]"
-for $full_name in [ad_system_name]
-" [ad_parameter AlertPageDecoration pvt]]
+set context_bar [ad_context_bar "Alerts"]
set discussion_forum_alert_p 0
Index: openacs-4/packages/acs-subsite/www/pvt/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/pvt/home.adp 22 Jan 2002 20:08:00 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp 3 Sep 2002 16:29:12 -0000 1.3
@@ -1,12 +1,7 @@
-<master>
+<master src="master">
<property name=title>@full_name@'s workspace at @system_name@</property>
+<property name="context_bar">@context_bar@</property>
-<h2>@full_name@'s workspace at @system_name@</h2>
-
-@context_bar@
-
-<hr>
-
<ul>
<p>
@@ -33,19 +28,18 @@
<p>
If you want to check what other users of this service are shown, visit
-<%= [acs_community_member_link -user_id $user_id -label "${ad_url}[acs_community_member_url -user_id $user_id]"] %>
+@member_link@
<h4>Basic Information</h4>
<ul>
-<li>Name: @full_name@
-<li>email address: @email@
-<li>personal URL: <a target=new_window href="@url@">@url@</a>
-<li>screen name: @screen_name@
-<li>bio: @bio@
-<p>
-(<a href="/user/basic-info-update">update</a>)
+<li>Name: @full_name@</li>
+<li>email address: @email@</li>
+<li>personal URL: <a target=new_window href="@url@">@url@</a></li>
+<li>screen name: @screen_name@</li>
+<li>bio: @bio@</li>
</ul>
+<p>(<a href="/user/basic-info-update">update</a>)</p>
<if @portrait_state@ eq upload>
@@ -68,14 +62,9 @@
Then you should either
<ul>
-<li><a href="alerts">edit your alerts</a>
-
-<p>
-
-or
-
-<p>
-
-<li><a href="unsubscribe">Unsubscribe</a> (for a period of vacation or permanently)
-
+<li><a href="alerts">edit your alerts</a></li>
</ul>
+<p>or</p>
+<ul>
+<li><a href="unsubscribe">Unsubscribe</a> (for a period of vacation or permanently)</li>
+</ul>
Index: openacs-4/packages/acs-subsite/www/pvt/home.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/pvt/home.tcl 25 Jul 2002 06:57:18 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/pvt/home.tcl 3 Sep 2002 16:29:12 -0000 1.4
@@ -16,6 +16,7 @@
portrait_title:onevalue
export_user_id:onevalue
ad_url:onevalue
+ member_link:onevalue
}
set user_id [ad_verify_and_get_user_id]
@@ -51,6 +52,8 @@
where user_id=:user_id
}]
+
+
set bio [db_string biography "
select attr_value
from acs_attribute_values
@@ -165,6 +168,7 @@
set export_user_id [export_url_vars user_id]
set ad_url [ad_url]
+set member_link [acs_community_member_link -user_id $user_id -label "${ad_url}[acs_community_member_url -user_id $user_id]"]
set interest_items ""
Index: openacs-4/packages/acs-subsite/www/pvt/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/master.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/pvt/master.adp 3 Sep 2002 16:29:12 -0000 1.1
@@ -0,0 +1,10 @@
+<master>
+<property name="focus">@focus@</property>
+<property name="title">@title@</property>
+<property name="context_bar">@context_bar@</property>
+
+<h2>@title@</h2>
+@context_bar@
+<hr>
+
+<slave>
Index: openacs-4/packages/acs-subsite/www/pvt/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/master.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/pvt/master.tcl 3 Sep 2002 16:29:12 -0000 1.1
@@ -0,0 +1,15 @@
+# /packages/acs-subsite/www/master.tcl
+
+# Ensures variables needed by master.adp are defined
+
+if { ![info exists focus] } {
+ set focus ""
+}
+if { ![info exists title] } {
+ set title ""
+}
+if { ![info exists context_bar] } {
+ set context_bar ""
+}
+
+
Index: openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/set-on-vacation-to-null.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp 3 Sep 2002 16:29:12 -0000 1.2
@@ -1,14 +1,6 @@
-<master>
+<master src="master">
<property name=title>Vacation Information Updated</property>
-<h2>Vacation Information Updated</h2>
+<p>You're marked as back from vacation at @site_link@.</p>
-in @site_link@
-
-<hr>
-
-You're marked as back from vacation.
-
-<p>
-
-Please return to @home_link@.
+<p>Please return to @home_link@.</p>
Index: openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/set-on-vacation-until.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp 3 Sep 2002 16:29:12 -0000 1.2
@@ -1,16 +1,10 @@
-<master>
+<master src="master">
<property name=title>Vacation Information Updated</property>
-<h2>Vacation Information Updated</h2>
+<p>Your vacation information at @site_link@ has been updated.</p>
-in @site_link@
+<p>You won't get any email until after @pretty_date@.</p>
-<hr>
+<p>Please return to @home_link@.</p>
-You won't get any email until after @pretty_date@.
-<p>
-
-Please return to @home_link@.
-
-
Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp 3 Sep 2002 16:29:12 -0000 1.2
@@ -1,11 +1,7 @@
-<master>
-<property name=title>Account Deleted</property>
+<master src="master">
+<property name="title">Account Deleted</property>
-<h2>Account Deleted</h2>
+Your account at @system_name@ has been marked as "deleted".
-<hr>
-Your account at @system_name@ has been marked "deleted".
-
-
Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp 3 Sep 2002 09:07:23 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp 3 Sep 2002 16:29:12 -0000 1.3
@@ -1,12 +1,9 @@
-<master>
-<property name=title>Confirm Unsubscribe</property>
+<master src="master">
+<property name="title">Confirm Unsubscribe</property>
-<h2>Confirm Unsubscribe</h2>
-that you'd like to unsubscribe from @site_link@
+<p>Confirm that you'd like to unsubscribe from @site_link@.</p>
-<hr>
-
<if @on_vacation_p@ eq "t">
You are current marked as being on vacation until @pretty_no_alerts_until_date@. If you'd like to start receiving email alerts again, just <a href="set-on-vacation-to-null">tell us that you're back</a>.
@@ -21,22 +18,20 @@
<ul>
<li>tell the system that you're going on vacation until
-<form method=get action=set-on-vacation-until>
+<form method="get" action="set-on-vacation-until">
@date_entry_widget@
-<input type=submit value="Put email on hold">
+<input type="submit" value="Put email on hold" />
</form>
<p>
</else>
-
<if @parameter_enabled_p@ eq 1>
-
<if @dont_spam_me_p@ eq "f">
- <li>The system is currently set to send you email notifications. Click here to <a href="toggle-dont-spam-me-p">tell the system not to send you any email notifications</a>.
+ <li>The system is currently set to send you email notifications. Click here to <a href="toggle-dont-spam-me-p">tell the system not to send you any email notifications</a>.</li>
</if>
<else>
- <li>The system is currently set to <i>not</i> send you any email notifications. Click here <a href="toggle-dont-spam-me-p">allow system to send you email notifications</a>.
+ <li>The system is currently set to <em>not</em> send you any email notifications. Click here <a href="toggle-dont-spam-me-p">allow system to send you email notifications</a>.</li>
</else>
</if>
Index: openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-approval.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,14 +1,10 @@
-<master>
-<property name=title>Awaiting Approval</property>
+<master src="master">
+<property name="title">Awaiting Approval</property>
-<h2>Awaiting Approval</h2>
-
-<hr>
-
-Your registration request has been submitted
+<p>Your registration request has been submitted
to the @system_name@ administrator. It is still
-waiting approval.
-<p>
-Thank you.
+waiting approval.</p>
+<p>Thank you.</p>
+
Index: openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-email-verification.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,13 +1,8 @@
-<master>
-<property name=title>Awaiting email verification</property>
+<master src="master">
+<property name="title">Awaiting email verification</property>
-<h2>Awaiting email verification</h2>
+<p>Registration information for this service has just been
+sent to @email@.</p>
+<p>Please read and follow the instructions in this email.</p>
-<hr>
-Registration information for this service has just been
-sent to @email@.
-<p>
-Please read and follow the instructions in this email.
-
-
Index: openacs-4/packages/acs-subsite/www/register/bad-password.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/bad-password.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/bad-password.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/register/bad-password.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,22 +1,15 @@
-<master>
-<property name=title>Bad Password</property>
+<master src="master">
+<property name="title">Bad Password</property>
+<property name="context_bar">in <a href="/index">@system_name@</a></property>
-<h2>Bad Password</h2>
-
-in <a href="/index">@system_name@</a>
-
-<hr>
-
<p>The password you typed doesn't match what we have in the database.
If you think you made a typo, please back up using your browser and
try again.</p>
<if @email_forgotten_password_p@ eq 1>
-
<p>If you've forgotten your password, you can
<a href=email-password?user_id=@user_id@>ask this server to reset
- your password and email a new randomly generated password to you</a>.
-
+ your password and email a new randomly generated password to you</a>.</p>
</if>
Index: openacs-4/packages/acs-subsite/www/register/banned-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/banned-user.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/banned-user.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/register/banned-user.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,10 +1,6 @@
-<master>
+<master src="master">
<property name=title>Sorry</property>
-<h2>Sorry</h2>
-
-<hr>
-
Sorry but it seems that you've been banned from @system_name@.
Index: openacs-4/packages/acs-subsite/www/register/deleted-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/deleted-user.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/deleted-user.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/register/deleted-user.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,15 +1,9 @@
-<master>
-<property name=title>Welcome Back</property>
+<master src="master">
+<property name="title">Welcome Back</property>
+<property name="context_bar">to @site_link@</property>
-<h2>Welcome Back</h2>
-
-to @site_link@
-
-<hr>
-
Your account is currently marked "deleted". If you wish, we
-can <a href="restore-user?user_id=@user_id@">restore your account
-to live status</a>.
+can <a href="restore-user?user_id=@user_id@">restore your account to live status</a>.
Index: openacs-4/packages/acs-subsite/www/register/email-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/email-confirm.adp 16 Feb 2002 23:14:08 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/register/email-confirm.adp 3 Sep 2002 16:29:13 -0000 1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="master">
<property name=title>Email Confirmation</property>
<if @email_verified_p@ eq "f">
Index: openacs-4/packages/acs-subsite/www/register/email-for-password.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-for-password.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/email-for-password.adp 14 Apr 2002 04:34:36 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/register/email-for-password.adp 3 Sep 2002 16:29:13 -0000 1.3
@@ -1,14 +1,7 @@
-<master>
+<master src="master">
<property name="title">Forgotten Password / Enter Your Email</property>
-<h2>Forgotten Password - Enter Your Email</h2>
-<hr>
-
-<br>
-
<form method="get" action="email-for-password-2">
- Your email: <input type="text" name="email"> <input type="submit" value="send">
+ Your email: <input type="text" name="email" /> <input type="submit" value="send" />
</form>
-
-<br>
Index: openacs-4/packages/acs-subsite/www/register/email-password-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/email-password-2.adp 14 Apr 2002 04:34:36 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/register/email-password-2.adp 3 Sep 2002 16:29:13 -0000 1.3
@@ -1,32 +1,28 @@
-<master>
+<master src="master">
<property name=title>Check Your Inbox</property>
-<h2>Check Your Inbox</h2>
-
-<hr>
-
Please check your inbox. Within the next few minutes, you should find
a message from @system_owner@ containing your password.
-<br>
+<br />
<if @ask_question_p@ eq 1 and @require_question_p@ eq 1>
<form method="post" action="email-password-3.tcl">
- <input type="hidden" name="first_names" value="@first_names@">
- <input type="hidden" name="last_name" value="@last_name@">
- <input type="hidden" name="user_id" value="@user_id@">
- <input type="hidden" name="email" value="@email@">
+ <input type="hidden" name="first_names" value="@first_names@" />
+ <input type="hidden" name="last_name" value="@last_name@" />
+ <input type="hidden" name="user_id" value="@user_id@" />
+ <input type="hidden" name="email" value="@email@" />
for future reference, please type in a question and an answer to use as
verification.
- <br><br>
+ <br /><br />
- question: <input type="text" name="question" size="40"><br>
- answer: <input type="text" name="answer" size="40"><br>
+ question: <input type="text" name="question" size="40" /><br />
+ answer: <input type="text" name="answer" size="40" /><br />
- <input type="submit" value="Customize Question">
+ <input type="submit" value="Customize Question" />
</form>
</if>
Index: openacs-4/packages/acs-subsite/www/register/email-password-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-3.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/email-password-3.adp 14 Apr 2002 04:34:36 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/register/email-password-3.adp 3 Sep 2002 16:29:13 -0000 1.3
@@ -1,10 +1,8 @@
-<master>
+<master src="master">
<property name="title">Customized Question/Answer Entered</property>
-<h2>Wait for our Email</h2>
+<p>Please Wait for our Email</p>
-<hr>
-
-Thank you. When you get your email, go back
+<p>When you get your email, go back
to <a href="index?email=@email@">the login page</a> and use
-@system_name@.
+@system_name@.</p>
Index: openacs-4/packages/acs-subsite/www/register/email-password.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/email-password.adp 14 Apr 2002 04:34:36 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/register/email-password.adp 3 Sep 2002 16:29:13 -0000 1.3
@@ -1,29 +1,19 @@
-<master>
+<master src="master">
<property name="title">Email Password</property>
-<h2>Confirmation of Resetting and Emailing New Password</h2>
-<hr>
+<p>Please verify your identity by providing the information below:</p>
-<br>
-
-Please verify yourself by providing the information below:
-
-<br>
-
<form method="post" action="email-password-2">
- <input type="hidden" name="user_id" value=@user_id@>
+ <input type="hidden" name="user_id" value="@user_id@" />
<if @question_answer_p@ eq 0>
- Full Name: <input type="text" name="first_names" size="20"> <input type="text" name="last_name" size="20">
+ Full Name: <input type="text" name="first_names" size="20" /> <input type="text" name="last_name" size="20" />
</if>
<else>
- @password_question@: <input type="text" name="answer" size="20">
+ @password_question@ <input type="text" name="answer" size="20" />
</else>
- <br>
- <input type="submit" value="Reset and Email New Password">
+ <p><input type="submit" value="Reset and Email New Password" /></p>
</form>
-
-<br>
Index: openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,25 +1,22 @@
-<master>
-<property name=title>Saving email address and password</property>
+<master src="master">
+<property name="title">Saving email address and password</property>
+<property name="context_bar">at @home_link@</property>
-<h2>Saving email address and password</h2>
-
-at @home_link@
-
-<hr>
-
+<p>
Our server can tell your browser to remember certain things, such as
your email address and password. This is convenient for you because,
if you're the only person who uses your computer, you won't have to
keep telling us your email address and password.
+</p>
<p>
-
It would be a very bad idea to choose this option if you're using a
shared computer in a library or school. Any subsequent user of this
machine would be able to masquerade as you on our service.
+</p>
<p>
-
Note that you can erase your saved email address and password by
choosing the "log out" option from your workspace.
+</p>
Index: openacs-4/packages/acs-subsite/www/register/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/index.adp 16 Mar 2002 21:08:37 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/register/index.adp 3 Sep 2002 16:29:13 -0000 1.3
@@ -1,63 +1,56 @@
-<master>
+<master src="master">
<property name=title>Log In</property>
<property name=focus>login.email</property>
+<property name="context_bar">to <a href="/">@system_name@</a></property>
-<h2>Log In</h2>
-
-to <a href=/>@system_name@</a>
-
-<hr>
-
-<p><b>Current users:</b> Please enter your email and password below.</p>
-<p><b>New users:</b> Welcome to @system_name@. Please begin the
+<p><strong>Current users:</strong> Please enter your email and password below.</p>
+<p><strong>New users:</strong> Welcome to @system_name@. Please begin the
registration process by entering a valid email address and a
password for signing into the system. We will direct you to another form to
complete your registration.</p>
-<FORM method=post action=user-login name=login>
+<form method="post" action="user-login" name="login">
@export_vars@
<table>
-<tr><td>Your email address:</td><td><INPUT type=text name=email value="@email@"></tr>
+<tr><td>Your email address:</td><td><input type="text" name="email" value="@email@" /></td></tr>
<if @old_login_process@ eq 0>
<tr><td>Your password:</td>
- <td><input type=password name=password></td></tr>
+ <td><input type="password" name="password" /></td></tr>
<if @allow_persistent_login_p@ eq 1>
- <tr><td colspan=2>
+ <tr><td colspan="2">
<if @persistent_login_p@ eq 1>
- <input type=checkbox name=persistent_cookie_p value=1 CHECKED>
+ <input type="checkbox" name="persistent_cookie_p" value="1" checked="checked" />
</if>
<else>
- <input type=checkbox name=persistent_cookie_p value=1>
+ <input type="checkbox" name="persistent_cookie_p" value="1" />
</else>
-
Remember this address and password?
(<a href="explain-persistent-cookies">help</a>)</td></tr>
</if>
</if>
-<tr><td colspan=2 align=center><INPUT TYPE=submit value="Submit"></td></tr>
+<tr><td colspan="2" align="center"><input type="submit" value="Submit" /></td></tr>
</table>
-</FORM>
+</form>
-<p>
<if @email_forgotten_password_p@ eq 1>
-Have you <a href=email-for-password>forgotten your password?</a>
<p>
+Have you <a href="email-for-password">forgotten your password?</a>
+</p>
</if>
-If you keep getting thrown back here, it is probably because your
+<p>If you keep getting thrown back here, it is probably because your
browser does not accept cookies. We're sorry for the inconvenience
but it really is impossible to program a system like this without
-keeping track of who is posting what.
+keeping track of who is posting what.</p>
<p>
-
In Netscape 4.0, you can enable cookies from Edit -> Preferences
-> Advanced. In Microsoft Internet Explorer 4.0, you can enable cookies from View -> Internet Options -> Advanced -> Security.
-
+</p>
Index: openacs-4/packages/acs-subsite/www/register/login-expired.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/login-expired.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/login-expired.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/register/login-expired.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,23 +1,16 @@
-<master>
+<master src="master">
<property name=title>Login Expired</property>
-<h2>Login Expired</h2>
+<p>The login page has expired. Please <a href="./index">login</a> again.</p>
-<hr>
-
-The login page has expired. Please <a href="/index">login</a> again.
-
-<p>
-
-<font size=-1>
<table cellpadding=5 cellspacing=1 border=1>
<tr>
- <td bgcolor="#ffffcc"><b>Note:</b> For security reasons, the login page expires
+ <td bgcolor="#ffffcc"><strong>Note:</strong> For security reasons, the login page expires
after a certain interval to prevent malicious attackers from
- logging in as you using cached browser passwords.
+ logging in as you using previously entered passwords.
</td>
</tr>
</table>
-</font>
+
Index: openacs-4/packages/acs-subsite/www/register/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/master.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/register/master.adp 3 Sep 2002 16:29:13 -0000 1.1
@@ -0,0 +1,10 @@
+<master>
+<property name="focus">@focus@</property>
+<property name="title">@title@</property>
+<property name="context_bar">@context_bar@</property>
+
+<h2>@title@</h2>
+@context_bar@
+<hr>
+
+<slave>
Index: openacs-4/packages/acs-subsite/www/register/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/master.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/register/master.tcl 3 Sep 2002 16:29:13 -0000 1.1
@@ -0,0 +1,15 @@
+# /packages/acs-subsite/www/master.tcl
+
+# Ensures variables needed by master.adp are defined
+
+if { ![info exists focus] } {
+ set focus ""
+}
+if { ![info exists title] } {
+ set title ""
+}
+if { ![info exists context_bar] } {
+ set context_bar ""
+}
+
+
Index: openacs-4/packages/acs-subsite/www/register/restore-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-user.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/restore-user.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/register/restore-user.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,28 +1,22 @@
-<master>
-<property name=title>Your Account is Restored</property>
+<master src="master">
+<property name="title">Your Account is Restored</property>
-<h2>Your Account is Restored</h2>
-at @site_link@
+<p>Your Account at @site_link@ is restored.</p>
-<hr>
-
-Your account has been restored. You can log in now using your old
+<p>You can log in now using your old
password:
-<p>
-
-<form action="user-login" method=post>
+<form action="user-login" method="post">
@export_vars@
-Password: <input type=password name=password size=20>
-<input type=submit value="Login">
+Password: <input type="password" name="password" size="20" />
+<input type="submit" value="Login" />
</form>
+</p>
<p>
-
-Note: If you've forgotten your password, <a
-href="email-password.tcl?user_id=@user_id@">ask this server to email it
+Note: If you've forgotten your password, <a href="email-password.tcl?user_id=@user_id@">ask this server to email it
to @email@</a>.
+</p>
-
Index: openacs-4/packages/acs-subsite/www/register/user-join.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-join.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/user-join.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/register/user-join.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master src="master">
<property name="title">Join @group_name@</property>
+<property name="context_bar">@context_bar@</property>
<formtemplate id="join"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/register/user-new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/user-new-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/user-new-2.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/register/user-new-2.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,16 +1,17 @@
-<master>
-<property name=title>@title@</property>
+<master src="master">
+<property name="title">@title@</property>
<if @email_verified_p@ eq f>
<h2>Please read your email</h2>
-<hr>
-
+<p>
Registration information for this service has been
sent to @email@.
+</p>
<p>
Please read and follow the instructions in this email.
+</p>
</if>
<else>
Index: openacs-4/packages/acs-subsite/www/register/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/register/user-new.adp 18 May 2002 20:43:04 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/register/user-new.adp 3 Sep 2002 16:29:13 -0000 1.5
@@ -1,11 +1,9 @@
-<master>
-<property name=title>Register</property>
+<master src="master">
+<property name="title">Register</property>
-<h2>Register</h2>
-as a user of <a href="index">@system_name@</a>
-<hr>
+Register as a user of <a href="index">@system_name@</a>
<form method=post action="user-new-2">
@export_vars@
@@ -22,11 +20,11 @@
<table>
<tr>
<td>Password:</td>
- <td><input type=password name=password value="@password@" size=10></td>
+ <td><input type="password" name="password" value="@password@" size="10" /></td>
</tr>
<tr>
<td>Password Confirmation:</td>
- <td><input type=password name=password_confirmation size=10></td>
+ <td><input type="password" name="password_confirmation" size="10" /></td>
</tr>
</table>
<p>
@@ -41,8 +39,8 @@
We will generate and send to you a random password when your registration
is confirmed. Once you login, you can change your password.
- <input type="hidden" name="password" value="somevalue">
- <input type="hidden" name="password_confirmation" value="othervalue">
+ <input type="hidden" name="password" value="somevalue" />
+ <input type="hidden" name="password_confirmation" value="othervalue" />
</else>
<h3>About You</h3>
@@ -52,7 +50,7 @@
<p>
-Full Name: <input type=text name=first_names size=20 value="@first_names@"> <input type=text name=last_name size=25 value="@last_name@">
+Full Name: <input type="text" name="first_names" size="20" value="@first_names@" /> <input type="text" name="last_name" size="25" value="@last_name@" />
<p>
<if @require_question_p@ true and @custom_question_p@ true>
@@ -61,8 +59,8 @@
<p>
- Question: <input type=text name=question size=30><br>
- Answer: <input type=text name=answer size=30>
+ Question: <input type="text" name="question" size="30" /><br>
+ Answer: <input type="text" name="answer" size="30" />
<p>
@@ -72,12 +70,12 @@
<p>
-Personal Home Page URL: <input type=text name=url size=50 value="http://">
+Personal Home Page URL: <input type="text" name="url" size="50" value="http://">
<p>
<center>
-<input type=submit value="Register">
+<input type="submit" value="Register">
</center>
</form>
Index: openacs-4/packages/acs-subsite/www/shared/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/community-member.adp 2 Sep 2002 14:34:31 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/shared/community-member.adp 3 Sep 2002 16:29:13 -0000 1.3
@@ -1,33 +1,25 @@
-<master>
+<master src="master">
<property name=title>@first_names@ @last_name@</property>
+<property name="context_bar">@context_bar@</property>
-<h2>@first_names@ @last_name@</h2>
-
-@context_bar@
-
-<hr>
-
<if @inline_portrait_state@ eq "inline">
+ <a href="portrait?@portrait_export_vars@"><img src="portrait-bits?@portrait_export_vars@" align="right" width="@width@" height="@height@"></a><br />
- <a href="portrait?@portrait_export_vars@"><img src="portrait-bits?@portrait_export_vars@" align=right width=@width@ height=@height@></a><br>
-
</if>
<else><if @inline_portrait_state eq "link">
-
- <li><a href="portrait?@portrait_export_vars@">Portrait</a></li>
-
+ <a href="portrait?@portrait_export_vars@">Portrait</a>
</if></else>
A member of the @system_name@ community since @pretty_creation_date@
<if @member_state@ eq "deleted">
- <blockquote><font color=red>this user is deleted</font></blockquote>
+ <blockquote><font color="red">this user is deleted</font></blockquote>
</if>
<else><if @member_state@ eq "banned">
- <blockquote><font color=red>this user is deleted and
+ <blockquote><font color="red">this user is deleted and
banned from the community.</font></blockquote>
</if></else>
@@ -42,14 +34,14 @@
<ul>
<li>E-mail @first_names@ @last_name@:
- <A HREF="mailto:@email@">@email@</a></li>
+ <a href="mailto:@email@">@email@</a></li>
<if @url@ not nil>
- <li>Personal home page: <a href="@url@">@url@</a></li>
+ <li>Personal home page: <a href="@url@">@url@</a></li>
</if>
<if @bio@ not nil>
- <p> <em>Biography:</em> @bio@
+ <p> Biography:</p><p>@bio@</p>
</if>
</ul>
@@ -74,7 +66,7 @@
<multiple name="user_contributions">
- <H3>@user_contributions.pretty_plural@</H3>
+ <h3>@user_contributions.pretty_plural@</h3>
<ul>
<group column="pretty_name">
Index: openacs-4/packages/acs-subsite/www/shared/confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/confirm.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/confirm.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/shared/confirm.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,28 +1,24 @@
-<master>
-<property name=title>@title@</property>
+<master src="master">
+<property name="title">@title@</property>
-<h2>@title@</h2>
-
-<hr>
-
@message@
<p>
-<table align=center>
+<table align="center">
<tr>
<td>
-<form method=get action="@yes_path@">
+<form method="get" action="@yes_path@">
@export_vars_yes@
-<input type=submit value="@yes_label@">
+<input type="submit" value="@yes_label@">
</form>
</td>
<td>
-<form method=get action="@no_path@">
+<form method="get" action="@no_path@">
@export_vars_no@
-<input type=submit value="@no_label@">
+<input type="submit" value="@no_label@">
</form>
</td>
Index: openacs-4/packages/acs-subsite/www/shared/db-error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/db-error.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/db-error.adp 24 Feb 2002 20:18:35 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/shared/db-error.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,13 +1,15 @@
-<master>
-<property name="title">Application error</property>
-<h2>Database error</h2>
-<if @custom_message@ nil>
+<master src="master">
+<property name="title">Database error</property>
+
+<p><if @custom_message@ nil>
We had a problem processing your entry.
</if>
<else>
@custom_message@
</else>
+</p>
<p>Here's what the database reported:
<blockquote>
@errmsg@
</blockquote>
+</p>
\ No newline at end of file
Index: openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,11 +1,6 @@
-<master>
-<property name=title>@title@</property>
+<master src="master">
+<property name="title">ISO Codes not loaded</property>
+
+<p>The iso codes were not loaded on this server.</p>
-
-<H2>ISO Codes not loaded</H2>
-<hr>
-
-<p>The iso codes were not loaded on this server.
-
-
Index: openacs-4/packages/acs-subsite/www/shared/iso-codes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/iso-codes.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/iso-codes.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/shared/iso-codes.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,19 +1,13 @@
-<master>
-<property name=title>Complete List of ISO Codes</property>
+<master src="master">
+<property name="title">Complete List of ISO Codes</property>
-<h2>Complete List of ISO Codes</h2>
-
Please locate your country's code among those listed below then use
the "back" button on your browser to return to the previous form.
-<hr>
<table>
-<tr><th align=left>Country Name<th>ISO Code</tr>
-
+<tr><th align="left">Country Name</th><th>ISO Code</th></tr>
<multiple name="ccodes">
-
- <tr><td>@ccodes.country_name@<td align=center>@ccodes.iso@</tr>
-
+ <tr><td>@ccodes.country_name@</td><td align="center">@ccodes.iso@</td></tr>
</multiple>
</table>
Index: openacs-4/packages/acs-subsite/www/shared/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/Attic/master.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/shared/master.adp 3 Sep 2002 16:29:13 -0000 1.1
@@ -0,0 +1,10 @@
+<master>
+<property name="focus">@focus@</property>
+<property name="title">@title@</property>
+<property name="context_bar">@context_bar@</property>
+
+<h2>@title@</h2>
+@context_bar@
+<hr>
+
+<slave>
Index: openacs-4/packages/acs-subsite/www/shared/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/Attic/master.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/shared/master.tcl 3 Sep 2002 16:29:13 -0000 1.1
@@ -0,0 +1,15 @@
+# /packages/acs-subsite/www/master.tcl
+
+# Ensures variables needed by master.adp are defined
+
+if { ![info exists focus] } {
+ set focus ""
+}
+if { ![info exists title] } {
+ set title ""
+}
+if { ![info exists context_bar] } {
+ set context_bar ""
+}
+
+
Index: openacs-4/packages/acs-subsite/www/shared/portrait.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/portrait.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/shared/portrait.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,27 +1,17 @@
-<master>
-<property name=title>Portrait of @first_names@ @last_name@</property>
+<master src="master">
+<property name="title">Portrait of @first_names@ @last_name@</property>
+<property name="context_bar">@context_bar@</property>
-<h2>Portrait of @first_names@ @last_name@</h2>
-
-@context_bar@
-
-<hr>
-
-<br>
-<br>
-
-<center>
+<p><center>
<img @widthheight_param@ src="/shared/portrait-bits.tcl?@export_vars@">
</center>
+</p>
-<br>
-<br>
-
-<ul>
+<p><ul>
<li>Comment:
<blockquote>
@description@
</blockquote>
-<li>Uploaded: @publish_date@
+<li>Uploaded: @publish_date@
</ul>
-
+</p>
Index: openacs-4/packages/acs-subsite/www/shared/report-error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/report-error.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/report-error.adp 22 May 2002 00:11:01 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/shared/report-error.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,6 +1,6 @@
-<master>
+<master src="master">
<property name="title">Application error</property>
-<h2>Application error</h2>
+
<if @custom_message@ nil>
We had a problem processing your entry.
</if>
Index: openacs-4/packages/acs-subsite/www/shared/send-email.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/send-email.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/send-email.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/shared/send-email.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,11 +1,7 @@
-<master>
-<property name=title>@sent_title@</property>
+<master src="master">
+<property name=title>Sent: @sent_subject@</property>
-<H2>@sent_subject@</H2>
-
-<hr>
-
@sent_message@
-<br><br>
+<br /><br />
You may <a href="@return_url@">return</a>.
Index: openacs-4/packages/acs-subsite/www/shared/whos-online.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/whos-online.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/whos-online.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/shared/whos-online.adp 3 Sep 2002 16:29:13 -0000 1.2
@@ -1,10 +1,7 @@
-<master>
-<property name=title>Who's Online</property>
+<master src="master">
+<property name="title">@title@</property>
+<property name="context_bar">@context_bar@</property>
-@decorate_top@
-
-<hr>
-
<if @chat_system_name@ not nil>
This page is mostly useful in conjuction with
<a href="/chat">@chat_system_name@</a>.
Index: openacs-4/packages/acs-subsite/www/shared/whos-online.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/whos-online.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/whos-online.tcl 9 Mar 2002 02:00:02 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/shared/whos-online.tcl 3 Sep 2002 16:29:13 -0000 1.3
@@ -3,7 +3,8 @@
@cvs-id $Id$
} -properties {
- decorate_top:onevalue
+ title:onevalue
+ context_bar:onevalue
last_visit_interval:onevalue
chat_system_name:onevalue
connected_user_id:onevalue
@@ -19,7 +20,9 @@
db_release_unused_handles
-set decorate_top [ad_decorate_top "<h2>Who's Online?</h2>\n[ad_context_bar_ws_or_index "Who's Online"]" [ad_parameter WhosOnlineDecoration]]
+set title "Who's Online?"
+set context_bar [ad_context_bar_ws_or_index "Who's Online"]
+
set last_visit_interval [ad_parameter LastVisitUpdateInterval ""]
#if ![ad_parameter EnabledP chat 0] {
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.adp 3 Sep 2002 16:29:14 -0000 1.2
@@ -1,37 +1,30 @@
-<master>
-<property name=title>Update Basic Information</property>
+<master src="master">
+<property name="title">Update Basic Information</property>
+<property name="context_bar">in @site_link@</property>
-<h2>Update Basic Information</h2>
-
-in @site_link@
-
-<hr>
-
-<form method=POST action="basic-info-update-2">
+<form method="post" action="basic-info-update-2">
@export_vars@
<table>
<tr>
-<tr>
- <th>Name:<td><input type=text name=first_names size=20 value="@first_names@"> <input type=text name=last_name size=25 value="@last_name@">
+ <th>Name:</th><td><input type="text" name="first_names" size="20" value="@first_names@" />
+ <input type="text" name="last_name" size="25" value="@last_name@" /></td>
</tr>
<tr>
- <th>email address:<td><input type=text name=email size=30 value="@email@">
+ <th>email address:</th><td><input type="text" name="email" size="30" value="@email@" /></td>
</tr>
<tr>
- <th>Personal URL:<td><input type=text name=url size=50 value="@url@"></tr>
+ <th>Personal URL:</th><td><input type="text" name="url" size="50" value="@url@" /></td>
</tr>
<tr>
- <th>screen name:<td><input type=text name=screen_name size=30 value="@screen_name@">
+ <th>screen name:</th><td><input type="text" name="screen_name" size="30" value="@screen_name@" /></td>
</tr>
<tr>
- <th>Biography:<td><textarea name=bio rows=10 cols=50 wrap=soft>@bio@</textarea></td>
+ <th>Biography:</th><td><textarea name="bio" rows="10" cols="50" wrap="soft">@bio@</textarea></td>
</tr>
</table>
-<br>
-<br>
-<center>
+<p><center>
<input type=submit value="Update">
-</center>
+</center></p>
Index: openacs-4/packages/acs-subsite/www/user/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/Attic/master.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/user/master.adp 3 Sep 2002 16:29:14 -0000 1.1
@@ -0,0 +1,10 @@
+<master>
+<property name="focus">@focus@</property>
+<property name="title">@title@</property>
+<property name="context_bar">@context_bar@</property>
+
+<h2>@title@</h2>
+@context_bar@
+<hr>
+
+<slave>
Index: openacs-4/packages/acs-subsite/www/user/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/Attic/master.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/user/master.tcl 3 Sep 2002 16:29:14 -0000 1.1
@@ -0,0 +1,15 @@
+# /packages/acs-subsite/www/master.tcl
+
+# Ensures variables needed by master.adp are defined
+
+if { ![info exists focus] } {
+ set focus ""
+}
+if { ![info exists title] } {
+ set title ""
+}
+if { ![info exists context_bar] } {
+ set context_bar ""
+}
+
+
Index: openacs-4/packages/acs-subsite/www/user/password-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/user/password-update.adp 3 May 2002 15:08:48 -0000 1.6
+++ openacs-4/packages/acs-subsite/www/user/password-update.adp 3 Sep 2002 16:29:14 -0000 1.7
@@ -1,43 +1,36 @@
-<master>
+<master src="master">
<property name="title">Update Password</property>
+<property name="context_bar">for @first_names@ @last_name@ in @site_link@</property>
-<h2>Update Password</h2>
-
-for @first_names@ @last_name@ in @site_link@
-
-<hr>
-
<form method="post" action="password-update-2">
- <input type="hidden" name="user_id" value="@user_id@">
- <input type="hidden" name="return_url" value="@return_url@">
+ <input type="hidden" name="user_id" value="@user_id@" />
+ <input type="hidden" name="return_url" value="@return_url@" />
<table>
<if @admin_p@ false and @password_old@ eq "">
<tr>
<th>Current Password:</th>
- <td><input type="password" name="password_old" size="15"></td>
+ <td><input type="password" name="password_old" size="15" /></td>
</tr>
</if>
<else>
- <input type="hidden" name="password_old" value=@password_old@>
+ <input type="hidden" name="password_old" value="@password_old@" />
</else>
<tr>
<th>New Password:</th>
- <td><input type="password" name="password_1" size="15"></td>
+ <td><input type="password" name="password_1" size="15" /></td>
</tr>
<tr>
<th>Confirm:</th>
- <td><input type="password" name="password_2" size="15"></td>
+ <td><input type="password" name="password_2" size="15" /></td>
</tr>
</table>
-<br>
-<br>
-
-<center>
- <input type="submit" value="Update">
+<p><center>
+ <input type="submit" value="Update" />
</center>
+</p>
</form>
Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp 3 Sep 2002 16:29:15 -0000 1.2
@@ -1,26 +1,18 @@
-<master>
-<property name=title>Edit comment for the portrait of @first_names@ @last_name@</property>
+<master src="master">
+<property name="title">Edit comment for the portrait of @first_names@ @last_name@</property>
+<property name="context_bar">@context_bar@</property>
-<h2>Edit comment for the portrait of @first_names@ @last_name@</h2>
-
-@context_bar@
-
-<hr>
-
-<blockquote>
-<form method=post action=comment-edit-2.tcl>
+<form method="post" action="comment-edit-2.tcl">
@export_vars@
-Story Behing Photo:<br>
-<textarea rows=6 cols=50 wrap=soft name=description>
+Story Behing Photo:<br />
+<textarea rows="6" cols="50" wrap="soft" name="description">
@description@
</textarea>
-<p>
-<center>
-<input type=submit value="Save comment">
-</center>
-</blockquote>
+<p><center>
+<input type="submit" value="Save comment" />
+</center></p>
</form>
Index: openacs-4/packages/acs-subsite/www/user/portrait/erase.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/erase.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/portrait/erase.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/erase.adp 3 Sep 2002 16:29:15 -0000 1.2
@@ -1,22 +1,17 @@
-<master>
-<property name=title>Erase Portrait</property>
+<master src="master">
+<property name="title">Erase Portrait</property>
+<property name="context_bar">@context_bar@</property>
-<h2>Erase Portrait</h2>
-
-@context_bar@
-
-<hr>
-
<if @admin_p@ eq 0>
- Are you sure that you want to erase your portrait?
+ <p>Are you sure that you want to erase your portrait?</p>
</if>
<else>
- Are you sure that you want to erase this user's portrait?
+ <p>Are you sure that you want to erase this user's portrait?</p>
</else>
-<center>
-<form method=GET action="erase-2">
+<form method="get" action="erase-2">
@export_vars@
-<input type=submit value="Yes, I'm sure">
+<center>
+<input type="submit" value="Yes, I'm sure" />
</center>
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/portrait/index.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.adp 3 Sep 2002 16:29:15 -0000 1.2
@@ -1,43 +1,32 @@
-<master>
-<property name=title>Portrait of @first_names@ @last_name@</property>
+<master src="master">
+<property name="title">Portrait of @first_names@ @last_name@</property>
+<property name="context_bar">@context_bar@</property>
-<h2>Portrait of @first_names@ @last_name@</h2>
+<p>This is the image that we show to other users at @system_name@:</p>
-@context_bar@
-
-<hr>
-
-This is the image that we show to other users at @system_name@:
-
-<br>
-<br>
-
<center>
<img @widthheight@ src="/shared/portrait-bits.tcl?@export_vars@">
</center>
Data:
<ul>
-<li>Uploaded: @pretty_date@
-<li>Comment:
-
+<li>Uploaded: @pretty_date@</li>
+<li>Comment:
<blockquote>
@description@
</blockquote>
-
+</li>
</ul>
Options:
<ul>
-<li><a href=comment-edit?@export_edit_vars@>edit comment</a>
-<li><a href="upload?@export_edit_vars@">upload a replacement</a>
+<li><a href="comment-edit?@export_edit_vars@">edit comment</a></li>
+<li><a href="upload?@export_edit_vars@">upload a replacement portrait</a></li>
-<p>
+<li><a href="erase?@export_edit_vars@">erase portrait</a><li>
-<li><a href="erase?@export_edit_vars@">erase</a>
-
</ul>
Index: openacs-4/packages/acs-subsite/www/user/portrait/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/Attic/master.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/user/portrait/master.adp 3 Sep 2002 16:29:15 -0000 1.1
@@ -0,0 +1,10 @@
+<master>
+<property name="focus">@focus@</property>
+<property name="title">@title@</property>
+<property name="context_bar">@context_bar@</property>
+
+<h2>@title@</h2>
+@context_bar@
+<hr>
+
+<slave>
Index: openacs-4/packages/acs-subsite/www/user/portrait/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/Attic/master.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/user/portrait/master.tcl 3 Sep 2002 16:29:15 -0000 1.1
@@ -0,0 +1,15 @@
+# /packages/acs-subsite/www/master.tcl
+
+# Ensures variables needed by master.adp are defined
+
+if { ![info exists focus] } {
+ set focus ""
+}
+if { ![info exists title] } {
+ set title ""
+}
+if { ![info exists context_bar] } {
+ set context_bar ""
+}
+
+
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.adp 13 Mar 2001 22:59:26 -0000 1.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.adp 3 Sep 2002 16:29:15 -0000 1.2
@@ -1,12 +1,7 @@
-<master>
+<master src="master">
<property name=title>Upload Portrait</property>
+<property name="context_bar">@context_bar@</property>
-<h2>Upload Portrait</h2>
-
-@context_bar@
-
-<hr>
-
How would you like the world to see @first_names@ @last_name@?
<p>