Index: openacs-4/packages/ecommerce/www/admin/user-classes/add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/add.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/user-classes/add.adp 19 Aug 2008 10:27:51 -0000 1.1 @@ -0,0 +1,16 @@ + + @title;noquote@ + @context;noquote@ +

@title@

+ +

Add the following new user class?

+ +
        $user_class_name
+
+ +
+@export_form_vars_html;noquote@ +
+ +
+
Index: openacs-4/packages/ecommerce/www/admin/user-classes/add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/add.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/user-classes/add.tcl 9 Mar 2004 00:59:54 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/user-classes/add.tcl 19 Aug 2008 10:27:51 -0000 1.5 @@ -12,33 +12,9 @@ ad_require_permission [ad_conn package_id] admin -set page_html "[ad_admin_header "Confirm New User Class"] +set title "Confirm New User Class" +set context [list [list index "User Classes"] $title] -

Confirm New User Class

- -[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "User Classes"] "Confirm New User Class"] - -
- -Add the following new user class? - -
-$user_class_name -
-" - - set user_class_id [db_nextval ec_user_class_id_sequence] -append page_html "
-[export_form_vars user_class_name user_class_id] -
- -
-
- -[ad_admin_footer] -" - - -doc_return 200 text/html $page_html \ No newline at end of file +set export_form_vars_html [export_form_vars user_class_name user_class_id] Index: openacs-4/packages/ecommerce/www/admin/user-classes/delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/delete.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/user-classes/delete.adp 19 Aug 2008 10:27:51 -0000 1.1 @@ -0,0 +1,15 @@ + + @title;noquote@ + @context;noquote@ +

@title@

+ +

Are you sure you want to delete this user class?

+

Users who are currently in this class will be without a class.

+ +
+@export_form_vars_html;noquote@ +
+ +
+
+ Index: openacs-4/packages/ecommerce/www/admin/user-classes/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/delete.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/user-classes/delete.tcl 9 Mar 2004 00:59:54 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/user-classes/delete.tcl 19 Aug 2008 10:27:51 -0000 1.4 @@ -13,29 +13,7 @@ set user_class_name [db_string get_ucname "select user_class_name from ec_user_classes where user_class_id=:user_class_id"] +set title "Delete $user_class_name" +set context [list [list index "User Classes"] $title] - -set page_html "[ad_admin_header "Delete $user_class_name"] - -

Delete $user_class_name

- -[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "User Classes"] [list "one.tcl?[export_url_vars user_class_name user_class_id]" $user_class_name] "Delete User Class"] - -
-Please confirm that you wish to delete this user class. Note that this will leave any users who are currently in this class (if any) classless. - -

- -

-
-[export_form_vars user_class_id] - -
-
- -[ad_admin_footer] -" - - -doc_return 200 text/html $page_html - +set export_form_vars_html [export_form_vars user_class_id] Index: openacs-4/packages/ecommerce/www/admin/user-classes/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/index.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/user-classes/index.adp 19 Aug 2008 10:27:51 -0000 1.1 @@ -0,0 +1,24 @@ + + @title;noquote@ + @context;noquote@ +

@title@

+ +

Current User Classes

+ +
    + @uc_info_lines_html;noquote@ +
+ +

No user classes exist.

+ +
+ +

Actions

+
+ +
+ Index: openacs-4/packages/ecommerce/www/admin/user-classes/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/index.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/user-classes/index.tcl 9 Mar 2004 00:59:54 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/user-classes/index.tcl 19 Aug 2008 10:27:51 -0000 1.5 @@ -10,75 +10,37 @@ ad_require_permission [ad_conn package_id] admin -set page_html "[ad_admin_header "User Class Administration"] +set title "User Classes" +set context [list $title] -

User Class Administration

+set user_class_approve_p [parameter::get -package_id [ec_id] -parameter UserClassApproveP -default 1] -[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] "User Classes"] - -
- -

Current User Classes

- -
    -" - +set uc_info_lines_count 0 +set uc_info_lines_html "" db_foreach get_uc_info_lines " select ec_user_classes.user_class_id, ec_user_classes.user_class_name, count(user_id) as n_users from ec_user_classes, ec_user_class_user_map m where ec_user_classes.user_class_id = m.user_class_id(+) group by ec_user_classes.user_class_id, ec_user_classes.user_class_name - order by user_class_name -" { + order by user_class_name" { - append page_html "
  • $user_class_name ($n_users user[ec_decode $n_users "1" "" "s"]" - - if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { - set n_approved_users [db_string get_n_approved_users " + append uc_info_lines_html "
  • $user_class_name ($n_users user[ec_decode $n_users "1" "" "s"]" + incr uc_info_lines_count + if { $user_class_approve_p } { + set n_approved_users [db_string get_n_approved_users " select count(*) as approved_n_users from ec_user_class_user_map where user_class_approved_p = 't' - and user_class_id=:user_class_id - "] + and user_class_id=:user_class_id"] - append page_html " , $n_approved_users approved user[ec_decode $n_approved_users "1" "" "s"]" + append uc_info_lines_html " , $n_approved_users approved user[ec_decode $n_approved_users "1" "" "s"]" } - append page_html ")\n" -} if_no_rows { + append uc_info_lines_html ")
    • \n" +} - append page_html "You haven't set up any user classes.\n" -} - # For audit tables set table_names_and_id_column [list ec_user_classes ec_user_classes_audit user_class_id] -append page_html " -
- -

- -

Actions

- - - -

- -

Add a New User Class

- -
    - -
    -Name: - -
    - -
- -[ad_admin_footer] -" - -doc_return 200 text/html $page_html \ No newline at end of file +set audit_url_html "[ec_url_concat [ec_url] /admin]/audit-tables?[export_url_vars table_names_and_id_column]" Index: openacs-4/packages/ecommerce/www/admin/user-classes/member-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/member-add.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/user-classes/member-add.adp 19 Aug 2008 10:27:51 -0000 1.1 @@ -0,0 +1,19 @@ + + @title;noquote@ + @context;noquote@ +

@title@

+ + +

Users whose last name contains '@last_name@':

+ +

Users whose email contains '@email@':

+ + + +
    + @users_select_html;noquote@ +
+

Click on a name to add that user to $user_class_name.

+ +

No users were found.

+ Index: openacs-4/packages/ecommerce/www/admin/user-classes/member-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/member-add.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/user-classes/member-add.tcl 9 Mar 2004 00:59:54 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/user-classes/member-add.tcl 19 Aug 2008 10:27:51 -0000 1.5 @@ -17,45 +17,27 @@ ad_require_permission [ad_conn package_id] admin -set page_html "[ad_admin_header "Add Member to $user_class_name"] +set title "Add Member to $user_class_name" +set context [list [list index "User Classes"] $title] -

Add Member to $user_class_name

- -[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "User Classes"] [list "one.tcl?[export_url_vars user_class_id user_class_name]" $user_class_name] "Add Member" ] - -
-" - if { [info exists last_name] } { set u_last_name %[string toupper $last_name]% append page_html "

Users whose last name contains '$last_name':

\n" set last_bit_of_query "upper(last_name) like :u_last_name" + set last_name_search_p 1 } else { - set l_email %[string tolower $email]% + set l_email %[string tolower $email]% append page_html "

Users whose email contains '$email':

\n" set last_bit_of_query "email like :l_email" + set last_name_search_p 0 } -append page_html "
    -" - - +set users_select_html "" +set users_count 0 db_foreach get_users_for_map "select user_id, first_names, last_name, email -from cc_users -where $last_bit_of_query" { + from cc_users + where $last_bit_of_query" { - - append page_html "
  • $first_names $last_name ($email)\n" - -} if_no_rows { - append page_html "No such users were found.\n
\n" + append users_select_html "
  • $first_names $last_name ($email)
    • \n" + incr users_count } - -append page_html "\n

    Click on a name to add that user to $user_class_name.\n" - - -append page_html "[ad_admin_footer] -" - - -doc_return 200 text/html $page_html Index: openacs-4/packages/ecommerce/www/admin/user-classes/member-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/member-delete.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/user-classes/member-delete.adp 19 Aug 2008 10:27:51 -0000 1.1 @@ -0,0 +1,14 @@ + + @title;noquote@ + @context;noquote@ +

    @title@

    + +

    Please confirm that you wish to remove this member from @user_class_name@.

    + +
    + @export_form_vars_html;noquote@ +
    + +
    +
    + Index: openacs-4/packages/ecommerce/www/admin/user-classes/member-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/member-delete.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/user-classes/member-delete.tcl 9 Mar 2004 00:59:54 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/user-classes/member-delete.tcl 19 Aug 2008 10:27:51 -0000 1.4 @@ -15,24 +15,7 @@ ad_require_permission [ad_conn package_id] admin -set page_html "[ad_admin_header "Remove Member from $user_class_name"] +set title "Remove Member from $user_class_name" +set context [list [list index "User Classes"] $title] -

    Remove Member from $user_class_name

    - -[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "User Classes"] [list "one.tcl?[export_url_vars user_class_id user_class_name]" $user_class_name] "Members" ] - -
    - -Please confirm that you wish to remove this member from $user_class_name. - -
    -
    -[export_form_vars user_class_id user_class_name user_id] - -
    -
    - -[ad_admin_footer] -" - -doc_return 200 text/html $page_html +set export_form_vars_html [export_form_vars user_class_id user_class_name user_id] Index: openacs-4/packages/ecommerce/www/admin/user-classes/members.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/members.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/user-classes/members.adp 19 Aug 2008 10:27:51 -0000 1.1 @@ -0,0 +1,12 @@ + + @title;noquote@ + @context;noquote@ +

    @title@

    + + +
      + @users_in_ec_user_class_html;noquote@ +
    +     +

    There are no users in this user class.

    +     Index: openacs-4/packages/ecommerce/www/admin/user-classes/members.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/members.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/user-classes/members.tcl 9 Mar 2004 00:59:54 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/user-classes/members.tcl 19 Aug 2008 10:27:51 -0000 1.5 @@ -13,53 +13,31 @@ set user_class_name [db_string get_uc_name "select user_class_name from ec_user_classes where user_class_id = :user_class_id"] -set page_html "[ad_admin_header "Members of $user_class_name"] +set title "Members of $user_class_name" +set context [list [list index "User Classes"] $title] -

    Members of $user_class_name

    +set requires_approval_p [parameter::get -package_id [ec_id] -parameter UserClassApproveP -default 1] -[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "User Classes"] [list "one.tcl?[export_url_vars user_class_id user_class_name]" "One Class"] "Members" ] - -
    - -
      -" - +set users_count 0 +set users_in_ec_user_class_html "" db_foreach get_users_in_ec_user_class "select cc.user_id, first_names, last_name, email, m.user_class_approved_p from cc_users cc, ec_user_class_user_map m where cc.user_id = m.user_id and m.user_class_id=:user_class_id" { - - append page_html "
    • $first_names $last_name ($email) " - - if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { - append page_html "[ec_decode $user_class_approved_p "t" "" "un"]approved " + incr users_count + append users_in_ec_user_class_html "
    • $first_names $last_name ($email) " + if { $requires_approval_p } { + append users_in_ec_user_class_html "[ec_decode $user_class_approved_p "t" "" "un"]approved " } - - append page_html "(remove" - - if { [ad_parameter -package_id [ec_id] UserClassApproveP ecommerce] } { - if { $user_class_approved_p == "t" } { - append page_html " | unapprove" - } else { - append page_html " | approve" - } + append users_in_ec_user_class_html "(remove" + if { $requires_approval_p } { + if { $user_class_approved_p == "t" } { + append users_in_ec_user_class_html " | unapprove" + } else { + append users_in_ec_user_class_html " | approve" + } } - - append page_html ")\n" - -} if_no_rows { - - append page_html "There are no users in this user class." -} - -append page_html "
    - -[ad_admin_footer] -" - - - -doc_return 200 text/html $page_html - + append users_in_ec_user_class_html ")\n" +} Index: openacs-4/packages/ecommerce/www/admin/user-classes/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/one.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/ecommerce/www/admin/user-classes/one.adp 19 Aug 2008 10:27:51 -0000 1.1 @@ -0,0 +1,32 @@ + + @title;noquote@ + @context;noquote@ +

    @title@

    + + + Index: openacs-4/packages/ecommerce/www/admin/user-classes/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/one.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/user-classes/one.tcl 9 Mar 2004 00:59:54 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/user-classes/one.tcl 19 Aug 2008 10:27:51 -0000 1.4 @@ -1,5 +1,4 @@ # www/[ec_url_concat [ec_url] /admin]/user-classes/one.tcl - ad_page_contract { @param user_class_id @param user_class_name @@ -14,30 +13,9 @@ ad_require_permission [ad_conn package_id] admin -set page_html "[ad_admin_header "$user_class_name"] +set title "Class $user_class_name" +set context [list [list index "User Classes"] $title] -

    $user_class_name

    - -[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index.tcl" "User Classes"] "One Class"] - -
    - -
      -
      -[export_form_vars user_class_id] -
    • Change user class name to: - -
      • - -
    • View all members of this user class - -

      - -

    • Delete this user class - -

      -" - # Set audit variables # audit_name, audit_id, audit_id_column, return_url, audit_tables, main_tables set audit_name "$user_class_name" @@ -47,31 +25,6 @@ set audit_tables [list ec_user_classes_audit] set main_tables [list ec_user_classes] -append page_html "

    • Audit Trail - -

      - -

    • Add a member to this user class. Search for a member to add
      - -
      -[export_form_vars user_class_id user_class_name] -By last name: - -
      - -
      -[export_form_vars user_class_id user_class_name] -By email address: - -
      - -
    - -[ad_admin_footer] -" - - - -doc_return 200 text/html $page_html - - +set export_form_user_class_id_html [export_form_vars user_class_id] +set export_form_user_class_name_id_html [export_url_vars user_class_id user_class_name] +set audit_url_html [ec_url_concat [ec_url] /admin]/audit?[export_url_vars audit_name audit_id audit_id_column return_url audit_tables main_tables]