Index: openacs-4/packages/dotfolio/catalog/dotfolio.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/catalog/dotfolio.en_US.ISO-8859-1.xml,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotfolio/catalog/dotfolio.en_US.ISO-8859-1.xml 16 Sep 2005 03:10:22 -0000 1.9 +++ openacs-4/packages/dotfolio/catalog/dotfolio.en_US.ISO-8859-1.xml 16 Sep 2005 13:18:15 -0000 1.10 @@ -46,6 +46,7 @@ dotFOLIO properties for this user. Email Return to + User Search Some of the emails failed. Those users had random passwords generated for them, however. The best way to proceed is to have these users log in and ask them to click on 'I have forgotten my password'. <p>Database error while trying to create the last user in the list above!<br> The transaction has been aborted, no users have been entered, and no e-mail notifications have been sent.<p> Screen name @@ -83,6 +84,9 @@ Creating user Create A New User Search Users + Search + Search Results + Search for users by entering a name or email. Bulk Upload Bulk uploading in progress. Upload @@ -93,6 +97,7 @@ Here you can create several users at once using a correctly formatted CSV (comma-separated values) file. You can create a spreadsheet and save it as a CSV file to import here. Be sure to use valid email addresses since the process will send the new user's password to the given email address. No Users + No users found Fields Required Upload Formatted CSV File Index: openacs-4/packages/dotfolio/www/admin/search-users-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/admin/search-users-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotfolio/www/admin/search-users-postgresql.xql 16 Sep 2005 13:18:15 -0000 1.1 @@ -0,0 +1,16 @@ + + + + postgresql7.1 + + + + SELECT DISTINCT user_id, username, first_names, last_name, email, pretty_type as user_type + FROM dotfolio_users + WHERE (lower(email) LIKE lower('%' || :q || '%') OR + lower(first_names) LIKE lower('%' || :q || '%') OR + lower(last_name) LIKE lower('%' || :q || '%') OR + lower(username) LIKE lower('%' || :q || '%')) + + + \ No newline at end of file Index: openacs-4/packages/dotfolio/www/admin/search-users.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/admin/search-users.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotfolio/www/admin/search-users.adp 16 Sep 2005 13:18:15 -0000 1.1 @@ -0,0 +1,62 @@ + +@title@ +@context_bar@ + +
+ + + + + + + + + + +
#dotfolio.search# + +
+ [i] + #dotfolio.search_help_text# +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#dotfolio.name##dotfolio.Username##dotfolio.user_type#
#dotfolio.no_users_found#
@users.last_name;noquote@, @users.first_names;noquote@ (@users.email@)@users.username;noquote@@users.user_type;noquote@
+ +
\ No newline at end of file Index: openacs-4/packages/dotfolio/www/admin/search-users.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/admin/search-users.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotfolio/www/admin/search-users.tcl 16 Sep 2005 13:18:15 -0000 1.1 @@ -0,0 +1,51 @@ +# +# Copyright (C) 2005 Nick Carroll +# +# This file is part of dotFOLIO. +# +# dotFOLIO is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# dotFOLIO is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# + +ad_page_contract { + Search for users. + + @author Nick Carroll (ncarroll@ee.usyd.edu.au) + @creation-date 2005-09-16 + @version $Id: search-users.tcl,v 1.1 2005/09/16 13:18:15 ncarroll Exp $ +} + +set title [_ dotfolio.search_users] +set context_bar [list [_ dotfolio.user_search]] + +ad_form -name fred -form { + {query:text {label "hello"} {help_text "hello world this is help"} {html {size 30}}} +} + +form create search_users + +element create search_users q \ + -label "Search" \ + -help_text "Search for a user based on a name or email." \ + -html {size 40} \ + -datatype text \ + -widget text \ + -optional + +set is_request [form is_request search_users] + +if {[form is_valid search_users]} { + set title [_ dotfolio.search_results] + + form get_values search_users q + db_multirow users get_users {} +} + +ad_return_template Index: openacs-4/packages/dotfolio/www/admin/users.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotfolio/www/admin/users.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotfolio/www/admin/users.adp 5 May 2005 08:51:32 -0000 1.1 +++ openacs-4/packages/dotfolio/www/admin/users.adp 16 Sep 2005 13:18:15 -0000 1.2 @@ -23,7 +23,7 @@ [ #dotfolio.create_a_new_user# | - #dotfolio.search_users# + #dotfolio.search_users# | #dotfolio.bulk_upload# ]