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 -N -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 @@ -@context_bar@ @subsite_name@ +@context_bar@ 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 -N -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 -N -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 @@ -@focus@ -@title@ -@title@ +@focus@ +@title@ +@context_bar@

@title@

@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 -N -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 -N -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 @@ - + @title@ +@context_bar@ -@decorate_top@ - -
-

Your discussion forum alerts

@@ -19,11 +16,11 @@ Keyword - + - Enabled + Enabled Disable @@ -36,8 +33,8 @@ @keyword@ - + @@ -66,7 +63,7 @@ @expires@ @frequency@ @alert_type@ - @alert_value@ + @alert_value@ 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 -N -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 "

Email Alerts

+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 -N -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 @@ - + @full_name@'s workspace at @system_name@ +@context_bar@ -

@full_name@'s workspace at @system_name@

- -@context_bar@ - -
-

    @@ -33,19 +28,18 @@

    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@

    Basic Information

      -
    • Name: @full_name@ -
    • email address: @email@ -
    • personal URL: @url@ -
    • screen name: @screen_name@ -
    • bio: @bio@ -

      -(update) +

    • Name: @full_name@
      • +
    • email address: @email@
      • +
    • personal URL: @url@
      • +
    • screen name: @screen_name@
      • +
    • bio: @bio@
    +

    (update)

    @@ -68,14 +62,9 @@ Then you should either +

    or

    +
      +
    • Unsubscribe (for a period of vacation or permanently)
      • +
    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 -N -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 -N --- /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 @@ + +@focus@ +@title@ +@context_bar@ + +

    @title@

    +@context_bar@ +
    + + 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 -N --- /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/set-on-vacation-to-null.adp,v diff -u -N -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 @@ - + Vacation Information Updated -

    Vacation Information Updated

    +

    You're marked as back from vacation at @site_link@.

    -in @site_link@ - -
    - -You're marked as back from vacation. - -

    - -Please return to @home_link@. +

    Please return to @home_link@.

    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/set-on-vacation-until.adp,v diff -u -N -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 @@ - + Vacation Information Updated -

    Vacation Information Updated

    +

    Your vacation information at @site_link@ has been updated.

    -in @site_link@ +

    You won't get any email until after @pretty_date@.

    -
    +

    Please return to @home_link@.

    -You won't get any email until after @pretty_date@. -

    - -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 -N -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 @@ - -Account Deleted + +Account Deleted -

    Account Deleted

    +Your account at @system_name@ has been marked as "deleted". -
    -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 -N -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 @@ - -Confirm Unsubscribe + +Confirm Unsubscribe -

    Confirm Unsubscribe

    -that you'd like to unsubscribe from @site_link@ +

    Confirm that you'd like to unsubscribe from @site_link@.

    -
    - 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 tell us that you're back. @@ -21,22 +18,20 @@
    • tell the system that you're going on vacation until -
      + @date_entry_widget@ - +

      - - -

    • The system is currently set to send you email notifications. Click here to tell the system not to send you any email notifications. +
    • The system is currently set to send you email notifications. Click here to tell the system not to send you any email notifications.
      • -
    • The system is currently set to not send you any email notifications. Click here allow system to send you email notifications. +
    • The system is currently set to not send you any email notifications. Click here allow system to send you email notifications.
      •  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 -N -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 @@ - -Awaiting Approval + +Awaiting Approval -

      Awaiting Approval

      - -
      - -Your registration request has been submitted +

      Your registration request has been submitted to the @system_name@ administrator. It is still -waiting approval. -

      -Thank you. +waiting approval.

      +

      Thank you.

      + 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 -N -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 @@ - -Awaiting email verification + +Awaiting email verification -

      Awaiting email verification

      +

      Registration information for this service has just been +sent to @email@.

      +

      Please read and follow the instructions in this email.

      -
      -Registration information for this service has just been -sent to @email@. -

      -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 -N -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 @@ - -Bad Password + +Bad Password +in @system_name@ -

      Bad Password

      - -in @system_name@ - -
      -

      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.

      -

      If you've forgotten your password, you can ask this server to reset - your password and email a new randomly generated password to you. - + your password and email a new randomly generated password to you.

       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 -N -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 @@ - + Sorry -

      Sorry

      - -
      - 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 -N -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 @@ - -Welcome Back + +Welcome Back +to @site_link@ -

      Welcome Back

      - -to @site_link@ - -
      - Your account is currently marked "deleted". If you wish, we -can restore your account -to live status. +can restore your account to live status. 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 -N -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 @@ - + Email Confirmation 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 -N -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 @@ - + Forgotten Password / Enter Your Email -

      Forgotten Password - Enter Your Email

      -
      - -
      -
      - Your email: + Your email:
      - -
      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 -N -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 @@ - + Check Your Inbox -

      Check Your Inbox

      - -
      - Please check your inbox. Within the next few minutes, you should find a message from @system_owner@ containing your password. -
      +
      - - - - + + + + for future reference, please type in a question and an answer to use as verification. -

      +

      - question:
      - answer:
      + question:
      + answer:
      - +
      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 -N -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 @@ - + Customized Question/Answer Entered -

      Wait for our Email

      +

      Please Wait for our Email

      -
      - -Thank you. When you get your email, go back +

      When you get your email, go back to the login page and use -@system_name@. +@system_name@.

      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 -N -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 @@ - + Email Password -

      Confirmation of Resetting and Emailing New Password

      -
      +

      Please verify your identity by providing the information below:

      -
      - -Please verify yourself by providing the information below: - -
      -
      - + - Full Name: + Full Name: - @password_question@: + @password_question@ -
      - +

      - -
      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 -N -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 @@ - -Saving email address and password + +Saving email address and password +at @home_link@ -

      Saving email address and password

      - -at @home_link@ - -
      - +

      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. +

      - 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. +

      - Note that you can erase your saved email address and password by choosing the "log out" option from your workspace. +

      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 -N -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 @@ - + Log In login.email +to @system_name@ -

      Log In

      - -to @system_name@ - -
      - -

      Current users: Please enter your email and password below.

      -

      New users: Welcome to @system_name@. Please begin the +

      Current users: Please enter your email and password below.

      +

      New users: 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.

      -
      + @export_vars@ - + - + - - +
      Your email address:
      Your email address:
      Your password:
      +
      - + - + - Remember this address and password? (help)
      -
      + -

      -Have you forgotten your password?

      +Have you forgotten your password? +

       -If you keep getting thrown back here, it is probably because your +

      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.

      - 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. - +

      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 -N -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 @@ - + Login Expired -

      Login Expired

      +

      The login page has expired. Please login again.

      -
      - -The login page has expired. Please login again. - -

      - - -
      Note: For security reasons, the login page expires + Note: 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.
      -       + 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 -N --- /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 @@ + +@focus@ +@title@ +@context_bar@ + +

      @title@

      +@context_bar@ +
      + + 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 -N --- /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 -N -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 @@ - -Your Account is Restored + +Your Account is Restored -

      Your Account is Restored

      -at @site_link@ +

      Your Account at @site_link@ is restored.

      -
      - -Your account has been restored. You can log in now using your old +

      You can log in now using your old password: -

      - -

      + @export_vars@ -Password: - +Password: +
      +

      - -Note: If you've forgotten your password, ask this server to email it +Note: If you've forgotten your password, ask this server to email it to @email@. +

      - 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 -N -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 @@ - -@context_bar@ + Join @group_name@ +@context_bar@ 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 -N -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 @@ - -@title@ + +@title@

      Please read your email

      -
      - +

      Registration information for this service has been sent to @email@. +

      Please read and follow the instructions in this email. +

       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 -N -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 @@ - -Register + +Register -

      Register

      -as a user of @system_name@ -
      +Register as a user of @system_name@
      @export_vars@ @@ -22,11 +20,11 @@ - + - +
      Password:
      Password Confirmation:

      @@ -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. - - + +

      About You

      @@ -52,7 +50,7 @@

      -Full Name: +Full Name:

      @@ -61,8 +59,8 @@

      - Question:
      - Answer: + Question:
      + Answer:

      @@ -72,12 +70,12 @@

      -Personal Home Page URL: +Personal Home Page URL:

      - +
      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 -N -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 @@ - + @first_names@ @last_name@ +@context_bar@ -

      @first_names@ @last_name@

      - -@context_bar@ - -
      - +
      -
      -       - -
    • Portrait
      • - + Portrait       A member of the @system_name@ community since @pretty_creation_date@ -
      this user is deleted
      +
      this user is deleted
       -
      this user is deleted and +
      this user is deleted and banned from the community.
      @@ -42,14 +34,14 @@
      • E-mail @first_names@ @last_name@: - @email@
        • + @email@ -
      • Personal home page: @url@
        • +
      • Personal home page: @url@
        •  -

        Biography: @bio@ +

        Biography:

        @bio@
      @@ -74,7 +66,7 @@ -

      @user_contributions.pretty_plural@

      +

      @user_contributions.pretty_plural@

        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 -N -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 @@ - -@title@ + +@title@ -

        @title@

        - -
        - @message@

        - +
        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 -N -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 @@ - -Application error -

        Database error

        - + +Database error + +

        We had a problem processing your entry. @custom_message@ +

        Here's what the database reported:

        @errmsg@
        +

        \ 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 -N -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 @@ - -@title@ + +ISO Codes not loaded + +

        The iso codes were not loaded on this server.

        - -

        ISO Codes not loaded

        -
        - -

        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 -N -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 @@ - -Complete List of ISO Codes + +Complete List of ISO Codes -

        Complete List of ISO Codes

        - Please locate your country's code among those listed below then use the "back" button on your browser to return to the previous form. -
        -
        + @export_vars_yes@ - +
        		-
        + @export_vars_no@ - +
        - - + - - - +
        Country NameISO Code
        Country NameISO Code
        @ccodes.country_name@@ccodes.iso@
        @ccodes.country_name@@ccodes.iso@
        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 -N --- /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 @@ + +@focus@ +@title@ +@context_bar@ + +

        @title@

        +@context_bar@ +
        + + 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 -N --- /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 -N -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 @@ - -Portrait of @first_names@ @last_name@ + +Portrait of @first_names@ @last_name@ +@context_bar@ -

        Portrait of @first_names@ @last_name@

        - -@context_bar@ - -
        - -
        -
        - -
        +

        +

        -
        -
        - -
          +

          • Comment:
            @description@
            -
          • Uploaded: @publish_date@ +
          • Uploaded: @publish_date@
          - +

          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 -N -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 @@ - + Application error -

          Application error

          + We had a problem processing your entry. 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 -N -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 @@ - -@sent_title@ + +Sent: @sent_subject@ -

          @sent_subject@

          - -
          - @sent_message@ -

          +

          You may return. 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 -N -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 @@ - -Who's Online + +@title@ +@context_bar@ -@decorate_top@ - -
          - This page is mostly useful in conjuction with @chat_system_name@. 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 -N -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 "

          Who's Online?

          \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 -N -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 @@ - -Update Basic Information + +Update Basic Information +in @site_link@ -

          Update Basic Information

          - -in @site_link@ - -
          - -
          + @export_vars@ - - - - + - - +
          Name: + Name: +
          email address: + email address:
          Personal URL:
          Personal URL:
          screen name: + screen name:
          Biography:Biography:
          -
          -
          -
          +

          -
          +

          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 -N --- /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 @@ + +@focus@ +@title@ +@context_bar@ + +

          @title@

          +@context_bar@ +
          + + 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 -N --- /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 -N -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 @@ - + Update Password +for @first_names@ @last_name@ in @site_link@ -

          Update Password

          - -for @first_names@ @last_name@ in @site_link@ - -
          - - - + + - + - + - + - +
          Current Password:
          New Password:
          Confirm:
          -
          -
          - -
          - +

          +
          +

          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 -N -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 @@ - -Edit comment for the portrait of @first_names@ @last_name@ + +Edit comment for the portrait of @first_names@ @last_name@ +@context_bar@ -

          Edit comment for the portrait of @first_names@ @last_name@

          - -@context_bar@ - -
          - -
          -
          + @export_vars@ -Story Behing Photo:
          - -

          -

          - -
          -
          +

          + +

          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 -N -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 @@ - -Erase Portrait + +Erase Portrait +@context_bar@ -

          Erase Portrait

          - -@context_bar@ - -
          - - Are you sure that you want to erase your portrait? +

          Are you sure that you want to erase your portrait?

           - Are you sure that you want to erase this user's portrait? +

          Are you sure that you want to erase this user's portrait?

           -
          -
          + @export_vars@ - +
          +
          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 -N -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 @@ - -Portrait of @first_names@ @last_name@ + +Portrait of @first_names@ @last_name@ +@context_bar@ -

          Portrait of @first_names@ @last_name@

          +

          This is the image that we show to other users at @system_name@:

          -@context_bar@ - -
          - -This is the image that we show to other users at @system_name@: - -
          -
          -
          Data:
            -
          • Uploaded: @pretty_date@ -
          • Comment: - +
          • Uploaded: @pretty_date@
            • +
          • Comment:
            @description@
            - +
          Options: 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 -N --- /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 @@ + +@focus@ +@title@ +@context_bar@ + +

          @title@

          +@context_bar@ +
          + + 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 -N --- /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 -N -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 @@ - + Upload Portrait +@context_bar@ -

          Upload Portrait

          - -@context_bar@ - -
          - How would you like the world to see @first_names@ @last_name@?