Index: openacs-4/packages/acs-admin/www/users/complex-search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/users/complex-search.adp 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-admin/www/users/complex-search.adp 2 Sep 2002 14:44:42 -0000 1.2 @@ -1,10 +1,9 @@ - -Complex User Search + +Complex User Search +@context_bar@ -

Complex User Search

- - all users + all matching users for users matching the criterion: @@ -24,12 +23,10 @@
    -
  • @user_search.first_names@ @user_search.last_name@ (@user_search.email@) - @user_search.member_state@ @user_search.user_finite_state_links@ + @user_search.member_state@ @user_search.user_finite_state_links@ - Index: openacs-4/packages/acs-admin/www/users/complex-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-admin/www/users/complex-search.tcl 8 Jul 2002 10:20:55 -0000 1.4 +++ openacs-4/packages/acs-admin/www/users/complex-search.tcl 2 Sep 2002 14:44:42 -0000 1.5 @@ -54,12 +54,16 @@ export_authorize:onevalue passthrough_parameters:onevalue combine_method:onevalue + context_bar:onevalue } # Check input. set exception_count 0 set exception_text "" + +set context_bar [ad_admin_context_bar [list "index" "Users"] "Complex search"] + if { ![info exists target] || [empty_string_p $target] } { incr exception_count append exception_text "
  • Target was not specified. This shouldn't have @@ -128,6 +132,8 @@ lappend where_clause {member_state = 'approved'} } elseif { $only_needs_approval_p } { lappend where_clause {member_state = 'needs approval'} + incr rowcount + set criteria:[set rowcount](data) "Needs approval" } if { $registration_before_days >= 0 } { Index: openacs-4/packages/acs-admin/www/users/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/index.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/users/index.adp 8 Jul 2002 10:20:55 -0000 1.2 +++ openacs-4/packages/acs-admin/www/users/index.adp 2 Sep 2002 14:44:42 -0000 1.3 @@ -1,24 +1,21 @@ - + Users +@context_bar@ -

    Users

    - -@context_bar@ - -
    -
      -
    • total users: @n_users@ (@n_deleted_users@ deleted). Last registration on @last_registration@ (history). +
    • total users: @n_users@ (@n_deleted_users@ deleted). Last registration on @last_registration@ (history).
      • -

      +

      - - -
    • Quick search: + + +
    • Quick search: +
      • -
    • Find all users needing approval -
    • Add a user +

      +
    • Find all users needing approval
      • +
    • Add a user
      • Index: openacs-4/packages/acs-admin/www/users/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/master.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-admin/www/users/master.adp 2 Sep 2002 14:44:42 -0000 1.1 @@ -0,0 +1,10 @@ + +@title@ +@context_bar@ +@focus@ + +

      @title@

      +@context_bar@ +
      + + Index: openacs-4/packages/acs-admin/www/users/member-state-change.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/users/member-state-change.adp 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-admin/www/users/member-state-change.adp 2 Sep 2002 14:44:42 -0000 1.2 @@ -1,11 +1,6 @@ - + @action@ +@context_bar@ -

      @action@

      - -@context_bar@ - -
      - -Done

      -You can send the user email or go back. +

      Done.

      +

      You can send the user email or go back.

      Index: openacs-4/packages/acs-admin/www/users/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/users/one.adp 21 Feb 2002 17:13:17 -0000 1.2 +++ openacs-4/packages/acs-admin/www/users/one.adp 2 Sep 2002 14:44:42 -0000 1.3 @@ -1,32 +1,27 @@ - + @first_names@ @last_name@ +@context_bar@ -

      @first_names@ @last_name@

      - -@context_bar@ - -
      -
        -
      • Name: @first_names@ @last_name@ (edit) +
      • Name: @first_names@ @last_name@ (edit)
      • Email: @email@ -(edit) -
      • Screen name: @screen_name@ (edit) -
      • User ID: @user_id@ -
      • Registration date: @registration_date@ +(edit)
        • +
      • Screen name: @screen_name@ (edit)
        • +
      • User ID: @user_id@
        • +
      • Registration date: @registration_date@
        • -
      • Last visit: @last_visit@ +
      • Last visit: @last_visit@
        •  -
      • Portrait: @portrait_title@ +
      • Portrait: @portrait_title@
        •  -
      • Member state: @member_state@ @user_finite_state_links@ +
      • Member state: @member_state@ @user_finite_state_links@
      -

      This user is a member of the following groups:

      +

      This user is a member of the following groups:

      Note: These are the groups to which the user has been granted direct membership.

      @@ -42,34 +37,31 @@ above.

      -
      • - - @all_group_membership.group_name@, - +
        • @all_group_membership.group_name@,
        -

        @user_contributions.pretty_plural@

        +

        @user_contributions.pretty_plural@

          -
        • @creation_date@: @user_contributions.object_name@ +
        • @creation_date@: @user_contributions.object_name@
          •
        -

        Administrative Actions

        +

        Administrative Actions

        Index: openacs-4/packages/acs-admin/www/users/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/users/one.tcl 21 Feb 2002 17:13:17 -0000 1.2 +++ openacs-4/packages/acs-admin/www/users/one.tcl 2 Sep 2002 14:44:42 -0000 1.3 @@ -32,7 +32,7 @@ set return_url "/acs-admin/users/one?user_id=$user_id" -set context_bar [ad_admin_context_bar [list "index.tcl" "Users"] "One User"] +set context_bar [ad_admin_context_bar [list "index" "Users"] "One User"] set export_edit_vars [export_url_vars user_id return_url] set registration_date [util_AnsiDatetoPrettyDate $creation_date] Index: openacs-4/packages/acs-admin/www/users/registration-history.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/registration-history.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/users/registration-history.adp 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-admin/www/users/registration-history.adp 2 Sep 2002 14:44:42 -0000 1.2 @@ -1,28 +1,14 @@ - + Registration History - -

        Registration History

        - -@context_bar@ - -
        - -
        +@context_bar@ - - - - - + - - + - -
        YearMonthRegistrations
        YearMonthRegistrations
        @user_rows.pretty_year@ @user_rows.pretty_month@@user_rows.n_new@@user_rows.n_new@
        -
        + Index: openacs-4/packages/acs-admin/www/users/search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/users/search.adp 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-admin/www/users/search.adp 2 Sep 2002 14:44:42 -0000 1.2 @@ -1,8 +1,7 @@ - -User Search in @group_name@ + +@title@ +@context_bar@ -

        User Search in @group_name@

        - for name or email matching "@keyword@" @@ -12,7 +11,6 @@ for last name "@last_name@" -
        We're showing all users, authorized or not (show only @@ -26,12 +24,10 @@
          -
        • @user_search.first_names@ @user_search.last_name@ (@user_search.email@) @user_search.member_state@ @user_search.user_finite_state_links@ - - +
          • Index: openacs-4/packages/acs-admin/www/users/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/users/search.tcl 9 Mar 2002 02:00:02 -0000 1.2 +++ openacs-4/packages/acs-admin/www/users/search.tcl 2 Sep 2002 14:44:42 -0000 1.3 @@ -32,12 +32,15 @@ only_authorized_p:onevalue export_authorize:onevalue passthrough_parameters:onevalue + context_bar:onevalue } # Check input. set exception_count 0 set exception_text "" +set context_bar [ad_admin_context_bar [list "index" "Users"] "Search"] + if [info exists keyword] { # this is an administrator if { [empty_string_p $keyword] } { @@ -148,11 +151,12 @@ # We are limiting the search to one group - display that group's name if { [exists_and_not_null limit_to_users_in_group_id] && ![regexp {[^0-9]} $limit_to_users_in_group_id] } { set group_name [db_string user_group_name_from_id "select group_name from user_groups where group_id = :limit_to_users_in_group_id"] + set title "User search in $group_name" } else { set group_name "" + set title "User search" } set export_authorize [export_ns_set_vars {url} {only_authorized_p}] - ad_return_template Index: openacs-4/packages/acs-admin/www/users/user-add-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-2.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/users/user-add-2.adp 12 Jan 2002 10:31:29 -0000 1.2 +++ openacs-4/packages/acs-admin/www/users/user-add-2.adp 2 Sep 2002 14:44:42 -0000 1.3 @@ -1,24 +1,19 @@ - + Add a user +@context_bar@ -

          Add a user

          -@context_bar@ - -
          - +

          @first_names@ @last_name@ has been added to @system_name@. Edit the message below and hit "Send Email" to notify this user. +

          @export_vars@ Message: - -

          - -

          -

          - - - +
          -

          +

          Index: openacs-4/packages/acs-admin/www/users/user-add-3.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-3.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/users/user-add-3.adp 12 Jan 2002 10:31:29 -0000 1.2 +++ openacs-4/packages/acs-admin/www/users/user-add-3.adp 2 Sep 2002 14:44:42 -0000 1.3 @@ -1,17 +1,14 @@ - + Email sent +@context_bar@ -

          Email sent

          - -@context_bar@ - -
          - +

          @first_names@ @last_name@ has been notified. +

          +

          - Index: openacs-4/packages/acs-admin/www/users/user-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-admin/www/users/user-add.adp 26 Jul 2002 13:56:27 -0000 1.3 +++ openacs-4/packages/acs-admin/www/users/user-add.adp 2 Sep 2002 14:44:42 -0000 1.4 @@ -1,29 +1,20 @@ - + Add a user user.email +@context_bar@ -

          Add a user

          - -@context_bar@ - -
          - -
          + @export_vars@ - + - - - - - + + + + + +
          Email:
          Full Name:
          Password:
          Password confirmation:
          (If you don't provide a password, a random password will be generated.)
          Email:
          Full Name:
          Password:
          Password confirmation:
          (If you don't provide a password, a random password will be generated.)
          -

          -

          - -
          -
          -

          +