Index: openacs-4/packages/wp-slim/www/attach-detail.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-detail.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/attach-detail.adp 15 Nov 2001 01:47:13 -0000 1.2 +++ openacs-4/packages/wp-slim/www/attach-detail.adp 6 Sep 2002 15:32:23 -0000 1.3 @@ -1,12 +1,7 @@ Details +@context@ -

Details

-@nav_bar@ -
- -
- Revision in red is the current live revision. -
Index: openacs-4/packages/wp-slim/www/attach-detail.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-detail.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/attach-detail.tcl 15 Nov 2001 01:47:13 -0000 1.3 +++ openacs-4/packages/wp-slim/www/attach-detail.tcl 6 Sep 2002 15:32:23 -0000 1.4 @@ -12,7 +12,7 @@ attach_item_id:naturalnum,notnull file_name:notnull } -properties { - nav_bar + context slide_item_id attach_item_id revisions:multirow @@ -30,7 +30,7 @@ and item_id = :slide_item_id }] -set nav_bar [ad_context_bar [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "Details"] +set context [list [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "Details"] db_multirow revisions revisions_get { select r.revision_id, Index: openacs-4/packages/wp-slim/www/attach-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-list.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/attach-list.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/attach-list.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,11 +1,7 @@ List of Attachments +@context@ -

List of Attachments

-@nav_bar@ -
- -
  • @att.name@ (remove | details) @@ -32,5 +28,3 @@
    Display a link the viewer can use to download the file

    - -

\ No newline at end of file Index: openacs-4/packages/wp-slim/www/attach-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-list.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/attach-list.tcl 4 Oct 2001 04:29:01 -0000 1.2 +++ openacs-4/packages/wp-slim/www/attach-list.tcl 6 Sep 2002 15:32:23 -0000 1.3 @@ -12,7 +12,7 @@ slide_item_id:naturalnum,notnull } -properties { slide_item_id - nav_bar + context att:multirow } @@ -24,7 +24,7 @@ and item_id = :slide_item_id }] -set nav_bar [ad_context_bar [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "List Attachemnts"] +set context [list [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "List Attachments"] db_multirow att attachments_get { select name, item_id Index: openacs-4/packages/wp-slim/www/create-presentation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/create-presentation.adp 4 Oct 2001 04:29:01 -0000 1.2 +++ openacs-4/packages/wp-slim/www/create-presentation.adp 6 Sep 2002 15:32:23 -0000 1.3 @@ -1,8 +1,7 @@ Create Presentation +@context@ -@header@ -
Index: openacs-4/packages/wp-slim/www/create-presentation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/create-presentation.tcl 4 Oct 2001 04:29:01 -0000 1.2 +++ openacs-4/packages/wp-slim/www/create-presentation.tcl 6 Sep 2002 15:32:23 -0000 1.3 @@ -7,19 +7,10 @@ @cvs-id $Id$ } { } -properties { - header + title:onevalue + context:onevalue } -set package_id [ad_conn package_id] - - set title "Create Presentation" +set context [list $title] -#set presentation_id [db_nextval acs_object_id_seq] - -set header "

$title

-[ad_context_bar $title] -
" - - -ad_return_template Index: openacs-4/packages/wp-slim/www/create-slide.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-slide.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/create-slide.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/create-slide.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,11 +1,8 @@ Create A Slide +@context@ -

@pres_title@

-@nav_bar@ -
- Index: openacs-4/packages/wp-slim/www/create-slide.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-slide.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/create-slide.tcl 4 Oct 2001 04:29:01 -0000 1.2 +++ openacs-4/packages/wp-slim/www/create-slide.tcl 6 Sep 2002 15:32:23 -0000 1.3 @@ -9,7 +9,7 @@ pres_item_id:naturalnum,notnull {sort_key:naturalnum,optional ""} } -properties { - nav_bar + context pres_item_id sort_key pres_title @@ -26,7 +26,7 @@ and i.live_revision = p.presentation_id } -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "$pres_title"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "$pres_title"] if {[empty_string_p $sort_key]} { set sort_key [db_string get_sort_key { Index: openacs-4/packages/wp-slim/www/delete-presentation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/delete-presentation.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/delete-presentation.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,10 +1,8 @@ Delete Presentation +@context@ -

Delete Presentation

-@nav_bar@ -
Index: openacs-4/packages/wp-slim/www/delete-presentation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/delete-presentation.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/delete-presentation.tcl 6 Sep 2002 15:32:23 -0000 1.2 @@ -11,12 +11,12 @@ pres_item_id:naturalnum,notnull title:notnull } -properties { - nav_bar + context pres_item_id } ad_require_permission $pres_item_id wp_delete_presentation -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "Delete Presentation"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "Delete Presentation"] ad_return_template \ No newline at end of file Index: openacs-4/packages/wp-slim/www/delete-slide.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/delete-slide.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/delete-slide.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,10 +1,8 @@ Delete a Slide +@context@ -

Delete a Slide

-@nav_bar@ -
Are you sure that you want to delete this slide? Index: openacs-4/packages/wp-slim/www/delete-slide.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/delete-slide.tcl 4 Oct 2001 04:29:01 -0000 1.2 +++ openacs-4/packages/wp-slim/www/delete-slide.tcl 6 Sep 2002 15:32:23 -0000 1.3 @@ -13,6 +13,6 @@ } -set nav_bar [ad_context_bar "Delete a Slide"] +set context [list "Delete a Slide"] ad_return_template Index: openacs-4/packages/wp-slim/www/edit-presentation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/edit-presentation.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/edit-presentation.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,9 +1,7 @@ Edit Presentation +@context@ -

Edit Presentation

-@nav_bar@ -
Index: openacs-4/packages/wp-slim/www/edit-presentation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/edit-presentation.tcl 15 Nov 2001 01:47:13 -0000 1.3 +++ openacs-4/packages/wp-slim/www/edit-presentation.tcl 6 Sep 2002 15:32:23 -0000 1.4 @@ -7,7 +7,7 @@ } { pres_item_id:integer } -properties { - nav_bar + context pres_item_id pres_title page_signature @@ -45,6 +45,6 @@ and r.revision_id = i.live_revision } -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "Edit Presentation"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "Edit Presentation"] ad_return_template Index: openacs-4/packages/wp-slim/www/edit-slide-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/edit-slide-2.tcl 13 Mar 2002 22:50:53 -0000 1.3 +++ openacs-4/packages/wp-slim/www/edit-slide-2.tcl 6 Sep 2002 15:32:23 -0000 1.4 @@ -20,7 +20,7 @@ } -properties { slide_item_id pres_item_id - nav_bar + context attachment_count } @@ -54,7 +54,7 @@ } if {[regexp {Upload} $button]} { - set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "Presentation Top"] [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "$slide_title"] + set context [list [list "presentation-top?[export_url_vars pres_item_id]" "Presentation Top"] [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "$slide_title"] # get the number of attachments set attachment_count [db_string get_number_of_attachments { select count(1) Index: openacs-4/packages/wp-slim/www/edit-slide.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/edit-slide.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/edit-slide.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,11 +1,7 @@ Edit Slide +@context@ -

Edit Slide

-@nav_bar@ -
- - Index: openacs-4/packages/wp-slim/www/edit-slide.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/edit-slide.tcl 15 Nov 2001 01:47:13 -0000 1.3 +++ openacs-4/packages/wp-slim/www/edit-slide.tcl 6 Sep 2002 15:32:23 -0000 1.4 @@ -10,7 +10,7 @@ pres_item_id:naturalnum,notnull } -properties { pres_item_id - nav_bar + context slide_title preamble postamble @@ -21,7 +21,7 @@ } -set nav_bar [ad_context_bar "Edit Slide"] +set context [list "Edit Slide"] db_1row get_slide_info { select s.slide_title, Index: openacs-4/packages/wp-slim/www/index-unregistered.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index-unregistered.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/index-unregistered.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/index-unregistered.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,10 +1,7 @@ WimpyPoint + -

WimpyPoint

-Your Workspace: Wimpy Point -
-

Everyone's Presentations

    Index: openacs-4/packages/wp-slim/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/index.adp 16 Jun 2002 14:04:42 -0000 1.2 +++ openacs-4/packages/wp-slim/www/index.adp 6 Sep 2002 15:32:23 -0000 1.3 @@ -1,12 +1,9 @@ WimpyPoint +@context@ -

    WimpyPoint

    -@context_bar@ -
    +

    My Presentations

    -

    My Presentations

    -
    • @presentations.pres_title@ created on @presentations.creation_date@ [ edit ] Index: openacs-4/packages/wp-slim/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/index.tcl 16 Jun 2002 14:04:42 -0000 1.3 +++ openacs-4/packages/wp-slim/www/index.tcl 6 Sep 2002 15:32:23 -0000 1.4 @@ -13,7 +13,7 @@ set package_id [ad_conn package_id] -set context_bar [ad_context_bar] +set context [list] set user_id [ad_verify_and_get_user_id] Index: openacs-4/packages/wp-slim/www/invite-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite-2.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/invite-2.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/invite-2.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,12 +1,9 @@ Email Sent +@context@ -

      Email Sent

      -@nav_bar@ -
      +@name@ (@email@) has been invited to work on the presentation test. The following E-mail was sent: -Haolan Qin (qinhl@hotmail.com) has been invited to work on the presentation test. The following E-mail was sent: -
       @email_content@
       
      Index: openacs-4/packages/wp-slim/www/invite-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/invite-2.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/invite-2.tcl 6 Sep 2002 15:32:23 -0000 1.2 @@ -15,14 +15,14 @@ email message } -properties { - nav_bar + context pres_item_id role } ad_require_permission $pres_item_id wp_admin_presentation -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] [list "invite?[export_url_vars pres_item_id role title]" "Invite User"] "Email Sent"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] [list "invite?[export_url_vars pres_item_id role title]" "Invite User"] "Email Sent"] set user_id [ad_verify_and_get_user_id] Index: openacs-4/packages/wp-slim/www/invite.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/invite.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/invite.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,10 +1,8 @@ Invite User +@context@ -

      Invite User

      -@nav_bar@ -
      Index: openacs-4/packages/wp-slim/www/invite.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/invite.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/invite.tcl 6 Sep 2002 15:32:23 -0000 1.2 @@ -12,15 +12,15 @@ role:notnull title:notnull } -properties { - nav_bar + context pres_item_id role encoded_title } ad_require_permission $pres_item_id wp_admin_presentation -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Invite User"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Invite User"] set encoded_title [ad_urlencode $title] ad_return_template \ No newline at end of file Index: openacs-4/packages/wp-slim/www/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/master.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/master.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/master.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,19 +1,6 @@ - - - - @title@ - - + +@title@ +@context@ - - -
      -
      - - <%=[ad_parameter -package_id [ad_acs_kernel_id] HostAdministrator]%> - -
      - - Index: openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,10 +1,8 @@ -Add User +Confirm Add User +@context@ -

      Confirm Add User

      -@nav_bar@ -
      Index: openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl 6 Sep 2002 15:32:23 -0000 1.2 @@ -16,14 +16,14 @@ last_name_from_search email_from_search:notnull } -properties { - nav_bar + context pres_item_id role } ad_require_permission $pres_item_id wp_admin_presentation -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Confirm Add User"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Confirm Add User"] set privilege [ad_decode $role "read" "wp_view_presentation" "write" "wp_edit_presentation" "admin" "wp_admin_presentation" ""] Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,10 +1,7 @@ Confirm Add Users - +@context@ -

      Confirm Add Users

      -@nav_bar@ -
      Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl 6 Sep 2002 15:32:23 -0000 1.2 @@ -14,15 +14,15 @@ title:notnull group_id:integer,notnull } -properties { - nav_bar + context pres_item_id role groups:multirow } ad_require_permission $pres_item_id wp_admin_presentation -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Confirm Add Users"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Confirm Add Users"] db_multirow group users_get { select p.first_names, Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp 5 Jul 2002 15:56:54 -0000 1.2 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp 6 Sep 2002 15:32:23 -0000 1.3 @@ -1,10 +1,8 @@ Add Group +@context@ -

      Add Group

      -@nav_bar@ -
      Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl 6 Sep 2002 15:32:23 -0000 1.2 @@ -13,15 +13,15 @@ role:notnull title:notnull } -properties { - nav_bar + context pres_item_id role groups:multirow } ad_require_permission $pres_item_id wp_admin_presentation -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Add Group"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Add Group"] db_multirow groups groups_get { select group_id, group_name Index: openacs-4/packages/wp-slim/www/presentation-acl-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/presentation-acl-add.adp 5 Jul 2002 15:56:54 -0000 1.3 +++ openacs-4/packages/wp-slim/www/presentation-acl-add.adp 6 Sep 2002 15:32:23 -0000 1.4 @@ -1,10 +1,7 @@ Add User - +@context@ -

      Add User

      -@nav_bar@ -
      @params@ @@ -23,4 +20,5 @@
      -

\ No newline at end of file +

+ \ No newline at end of file Index: openacs-4/packages/wp-slim/www/presentation-acl-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/presentation-acl-add.tcl 18 Jun 2002 15:13:23 -0000 1.2 +++ openacs-4/packages/wp-slim/www/presentation-acl-add.tcl 6 Sep 2002 15:32:23 -0000 1.3 @@ -12,15 +12,15 @@ role:notnull title:notnull } -properties { - nav_bar + context pres_item_id role encoded_title } ad_require_permission $pres_item_id wp_admin_presentation -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Add User"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Add User"] set encoded_title [ns_urlencode $title] Index: openacs-4/packages/wp-slim/www/presentation-acl.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/presentation-acl.adp 5 Jul 2002 15:56:54 -0000 1.2 +++ openacs-4/packages/wp-slim/www/presentation-acl.adp 6 Sep 2002 15:32:23 -0000 1.3 @@ -1,14 +1,9 @@ Authorization +@context@ -

Authorization

-@nav_bar@ -
- - -

Index: openacs-4/packages/wp-slim/www/presentation-acl.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/presentation-acl.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/presentation-acl.tcl 6 Sep 2002 15:32:23 -0000 1.2 @@ -10,7 +10,7 @@ } { pres_item_id:naturalnum,notnull } -properties { - nav_bar + context public_p presentation_title pres_item_id @@ -44,7 +44,7 @@ set encoded_title [ns_urlencode $title] -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "Authorization"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "Authorization"] Index: openacs-4/packages/wp-slim/www/presentation-revisions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/presentation-revisions.adp 4 Oct 2001 04:29:01 -0000 1.2 +++ openacs-4/packages/wp-slim/www/presentation-revisions.adp 6 Sep 2002 15:32:23 -0000 1.3 @@ -1,12 +1,8 @@ All Revisions of This Presentation +@context@ -

All Revisions

-@nav_bar@ -
-
- Revision in red is the current live revision.
    @@ -29,4 +25,3 @@

Create a new revision -

Index: openacs-4/packages/wp-slim/www/presentation-revisions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/presentation-revisions.tcl 4 Oct 2001 04:29:01 -0000 1.2 +++ openacs-4/packages/wp-slim/www/presentation-revisions.tcl 6 Sep 2002 15:32:23 -0000 1.3 @@ -9,7 +9,7 @@ } { pres_item_id:integer } -properties { - nav_bar + context pres_item_id } @@ -32,7 +32,7 @@ order by creation_date } -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "Presentation"] "All Revisions"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "Presentation"] "All Revisions"] set return_url [ns_urlencode "presentation-revisions?[export_url_vars pres_item_id]"] Index: openacs-4/packages/wp-slim/www/presentation-top.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/presentation-top.adp 15 Nov 2001 01:47:13 -0000 1.2 +++ openacs-4/packages/wp-slim/www/presentation-top.adp 6 Sep 2002 15:32:23 -0000 1.3 @@ -1,10 +1,7 @@ @presentation_title@ +@context@ -

@presentation_title@

-@nav_bar@ -
-

The Slides

@@ -15,7 +12,7 @@
- +
@slides.sort_key@. @slides.slide_title@ @slides.slide_title@ [ edit | Index: openacs-4/packages/wp-slim/www/presentation-top.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/presentation-top.tcl 15 Nov 2001 01:47:13 -0000 1.3 +++ openacs-4/packages/wp-slim/www/presentation-top.tcl 6 Sep 2002 15:32:23 -0000 1.4 @@ -12,7 +12,7 @@ } { pres_item_id:naturalnum } -properties { - nav_bar + context slides:multirow viewers:multirow public_p @@ -39,7 +39,7 @@ } set encoded_title [ns_urlencode $presentation_title] -set nav_bar [ad_context_bar "$presentation_title"] +set context [list "$presentation_title"] set subsite_name [ad_conn package_url] db_multirow slides get_slides { Index: openacs-4/packages/wp-slim/www/search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/search.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/search.adp 18 Jun 2002 15:13:23 -0000 1.1 +++ openacs-4/packages/wp-slim/www/search.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,8 +1,8 @@ User Search in @group_name@ +@context@ -

User Search in @group_name@

- +Search for name or email matching "@keyword@" @@ -12,8 +12,6 @@ for last name "@last_name@" -
-
    Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/serve-presentation-revision.adp 15 Nov 2001 01:47:13 -0000 1.3 +++ openacs-4/packages/wp-slim/www/serve-presentation-revision.adp 6 Sep 2002 15:32:23 -0000 1.4 @@ -1,10 +1,7 @@ @pres_title@ +@context@ -

    @pres_title@

    -@nav_bar@ -
    -

    One Revision

    Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl 15 Nov 2001 01:47:13 -0000 1.3 +++ openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl 6 Sep 2002 15:32:23 -0000 1.4 @@ -53,6 +53,6 @@ and r.revision_id = pb.id } -set nav_bar [ad_context_bar [list "$subsite_name/presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "One Revision"] +set context [list [list "$subsite_name/presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "One Revision"] ad_return_template Index: openacs-4/packages/wp-slim/www/serve-presentation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/serve-presentation.adp 15 Nov 2001 01:47:13 -0000 1.2 +++ openacs-4/packages/wp-slim/www/serve-presentation.adp 6 Sep 2002 15:32:23 -0000 1.3 @@ -1,7 +1,7 @@ @pres_title@ +"one presentation" -
    done | Index: openacs-4/packages/wp-slim/www/serve-slide-revision.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/serve-slide-revision.adp 5 Jul 2002 15:56:54 -0000 1.2 +++ openacs-4/packages/wp-slim/www/serve-slide-revision.adp 6 Sep 2002 15:32:23 -0000 1.3 @@ -1,9 +1,7 @@ @slide_title@ +@context@ -

    @slide_title@

    -
    - Last modified @modified_date@ Index: openacs-4/packages/wp-slim/www/serve-slide-revision.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/serve-slide-revision.tcl 4 Oct 2001 04:29:01 -0000 1.2 +++ openacs-4/packages/wp-slim/www/serve-slide-revision.tcl 6 Sep 2002 15:32:23 -0000 1.3 @@ -20,6 +20,7 @@ page_signature href_back_forward attach_list:multirow + context:onevalue subsite_name } @@ -50,6 +51,8 @@ and ao.object_id = s.slide_id } +set context [list [list "$subsite_name/display/$pres_item_id" "one presentation"] "one slide"] + db_1row get_presentation_page_signature { select p.page_signature, p.show_modified_p @@ -65,5 +68,3 @@ where i.parent_id = :slide_item_id and i.live_revision = x.attach_id } - -ad_return_template Index: openacs-4/packages/wp-slim/www/serve-slide.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/serve-slide.adp 15 Nov 2001 01:47:13 -0000 1.4 +++ openacs-4/packages/wp-slim/www/serve-slide.adp 6 Sep 2002 15:32:23 -0000 1.5 @@ -1,13 +1,12 @@ @slide_title@ +@context@
    @href_back_forward@
    -

    @slide_title@

    -
    Last modified @modified_date@ Index: openacs-4/packages/wp-slim/www/serve-slide.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/serve-slide.tcl 10 Jul 2002 07:31:09 -0000 1.4 +++ openacs-4/packages/wp-slim/www/serve-slide.tcl 6 Sep 2002 15:32:23 -0000 1.5 @@ -18,6 +18,7 @@ page_signature href_back_forward attach_list:multirow + context:onevalue subsite_name } @@ -55,6 +56,8 @@ and i.live_revision = p.presentation_id } +set context [list [list "$subsite_name/display/$pres_item_id" "one presentation"] "one slide"] + # Figure out what the previous slide link should be. if {$sort_key == 1} { set href_back "top | " Index: openacs-4/packages/wp-slim/www/slide-revisions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/slide-revisions.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/slide-revisions.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,10 +1,7 @@ All Revisions of This Slide +@context@ -

    All Revisions

    -@nav_bar@ -
    -
    Revision in red is the current live revision. Index: openacs-4/packages/wp-slim/www/slide-revisions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/slide-revisions.tcl 4 Oct 2001 04:29:01 -0000 1.2 +++ openacs-4/packages/wp-slim/www/slide-revisions.tcl 6 Sep 2002 15:32:23 -0000 1.3 @@ -12,14 +12,14 @@ pres_item_id:naturalnum,notnull } -properties { pres_item_id - nav_bar + context subsite_name } set subsite_name [ad_conn package_url] -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "Presentation"] "Slide Revisions"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "Presentation"] "Slide Revisions"] db_multirow revisions revisions_get { Index: openacs-4/packages/wp-slim/www/slides-reorder.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/slides-reorder.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/slides-reorder.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,10 +1,7 @@ Reorder Slides +@context@ -

    Reorder Slides

    -@nav_bar@ -
    - To move a slide in your presentation, select its title and click the Up or Down arrow. When you're done, click Save Changes. Index: openacs-4/packages/wp-slim/www/slides-reorder.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/slides-reorder.tcl 4 Oct 2001 04:29:01 -0000 1.2 +++ openacs-4/packages/wp-slim/www/slides-reorder.tcl 6 Sep 2002 15:32:23 -0000 1.3 @@ -17,7 +17,7 @@ set header [ad_header "Reorder Slides"] -set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "presentation"] "Reorder Slides"] +set context [list [list "presentation-top?[export_url_vars pres_item_id]" "presentation"] "Reorder Slides"] set counter 0 Index: openacs-4/packages/wp-slim/www/upload-attachments.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/upload-attachments.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/upload-attachments.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/upload-attachments.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,11 +1,7 @@ Upload Attachments +@context@ -

    Upload Attachments

    -@nav_bar@ -
    - - Index: openacs-4/packages/wp-slim/www/users.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/users.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/users.adp 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/wp-slim/www/users.adp 6 Sep 2002 15:32:23 -0000 1.2 @@ -1,9 +1,7 @@ Wimpy Point Users +@context@ -

    Wimpy Point Users

    -@nav_bar@ -
    Select an author from this list of users who have created presentations (number of presentations shown in parentheses.)
      Index: openacs-4/packages/wp-slim/www/users.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/users.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/users.tcl 13 Mar 2002 22:50:53 -0000 1.2 +++ openacs-4/packages/wp-slim/www/users.tcl 6 Sep 2002 15:32:23 -0000 1.3 @@ -9,7 +9,7 @@ starts_with:html,optional bulk_copy:naturalnum,optional } -properties { - nav_bar + context users:multirow } @@ -19,7 +19,7 @@ # What presentations that users has created (but only if the current user has permission to see/view # those presentations.) -set nav_bar "[ad_context_bar "All Authors"]" +set context "[list "All Authors"]" db_multirow users get_wp_users { select p.person_id, p.first_names, p.last_name, parties.email, count(i.item_id) as num_presentations