Index: openacs-4/packages/contacts/contacts.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v diff -u -r1.10 -r1.11 --- openacs-4/packages/contacts/contacts.info 12 Jun 2005 19:58:37 -0000 1.10 +++ openacs-4/packages/contacts/contacts.info 13 Jun 2005 07:22:36 -0000 1.11 @@ -1,41 +1,36 @@ - + Contacts Contacts f - t + f - + Matthew Geddert This application lets you collaboratively view, edit and categorize contacts. 2005-05-21 Contacts is an application for managing all those people and or organization you need to keep track of. It has a complete UI for storing and categorizing contacts. Each contact can have an arbitrary number of custom attributes associated with it, including other contacts (i.e. a certain contact "belongs" to a certain organization). It also functions as a service contract provider for attributes related to users in your system - 0 - - + + - - - - + - Index: openacs-4/packages/contacts/lib/contacts-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts-master.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/contacts/lib/contacts-master.adp 13 Jun 2005 07:23:55 -0000 1.1 @@ -0,0 +1,20 @@ + +@title@ +@context@ + + + + +@focus@ + +
+ +
+ + + + Index: openacs-4/packages/contacts/lib/contacts-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts-master.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/contacts/lib/contacts-master.tcl 13 Jun 2005 07:23:55 -0000 1.1 @@ -0,0 +1,78 @@ +# @author Matthew Geddert openacs@geddert.com +# @creation-date 2005-05-09 +# @cvs-id $Id: contacts-master.tcl,v 1.1 2005/06/13 07:23:55 matthewg Exp $ + + +# Set up links in the navbar that the user has access to +set package_url [ad_conn package_url] + +if { [site_node::get_package_url -package_key "tasks"] != "" } { + set prefix "/contacts/" +} else { + set prefix "${package_url}" +} + +set link_list [list] +lappend link_list "${prefix}" +lappend link_list "[_ contacts.Contacts]" + +if { ![parameter::get -boolean -parameter "ForceSearchBeforeAdd" -default "0"] } { + lappend link_list "${prefix}add/person" + lappend link_list "[_ contacts.Add_Person]" + + lappend link_list "${prefix}add/organization" + lappend link_list "[_ contacts.Add_Organization]" +} + +lappend link_list "${prefix}search" +lappend link_list "[_ contacts.Advanced_Search]" + +lappend link_list "${prefix}my-searches" +lappend link_list "[_ contacts.My_Searches]" + +lappend link_list "${prefix}public-searches" +lappend link_list "[_ contacts.Public_Searches]" + +if { [site_node::get_package_url -package_key "tasks"] != "" } { + lappend link_list "/tasks/" + lappend link_list "[_ contacts.Tasks]" +} + +lappend link_list "${prefix}settings" +lappend link_list "[_ contacts.Settings]" + +if { [permission::permission_p -object_id [ad_conn package_id] -privilege "admin"] } { + lappend link_list "${prefix}admin/" + lappend link_list "[_ contacts.Admin]" +} + + + +set page_url [ad_conn url] +set page_query [ad_conn query] + +# Convert the list to a multirow and add the selected_p attribute +multirow create links label url selected_p + +foreach {url label} $link_list { + set selected_p 0 + + if {[string equal $page_url $url]} { + set selected_p 1 + if { ${url} == ${prefix} } { + set title [ad_conn instance_name] + } else { + set title $label + } + } + multirow append links $label [subst $url] $selected_p +} + +if { ![exists_and_not_null title] } { + set title [ad_conn instance_name] + set context [list] +} else { + set context [list $title] +} + +ad_return_template Index: openacs-4/packages/contacts/www/contact-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-add.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/contacts/www/contact-add.adp 10 Jun 2005 09:23:27 -0000 1.3 +++ openacs-4/packages/contacts/www/contact-add.adp 13 Jun 2005 07:22:36 -0000 1.4 @@ -1,20 +1,5 @@ - -@title@ -@context@ - - - + party_ae.first_names - Index: openacs-4/packages/contacts/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/contacts/www/index.adp 12 Jun 2005 21:23:16 -0000 1.9 +++ openacs-4/packages/contacts/www/index.adp 13 Jun 2005 07:22:36 -0000 1.10 @@ -1,24 +1,7 @@ - + -@title@ -@context@ - - - - -

- Index: openacs-4/packages/contacts/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/contacts/www/index.tcl 12 Jun 2005 21:23:16 -0000 1.9 +++ openacs-4/packages/contacts/www/index.tcl 13 Jun 2005 07:22:36 -0000 1.10 @@ -13,12 +13,18 @@ {page:optional} {page_size:integer "25"} {tasks_interval:integer "7"} + {add_person:optional} + {add_organization:optional} + {clear_query:optional} } - -set title "[_ contacts.Contacts]" -set context {} - +if { [exists_and_not_null add_person] } { + ad_returnredirect "add/person" + ad_script_abort +} elseif { [exists_and_not_null add_organization] } { + ad_returnredirect "add/organization" + ad_script_abort +} if { [exists_and_not_null query_id] } { if { [contact::search::exists_p -search_id $query_id] } { set search_id $query_id @@ -151,6 +157,14 @@ } } +if { [parameter::get -boolean -parameter "ForceSearchBeforeAdd" -default "0"] } { + if { [exists_and_not_null query] && $group_id == "-2" } { + append form_elements { + {add_person:text(submit) {label {[_ contacts.Add_Person]}} {value "1"}} + {add_organization:text(submit) {label {[_ contacts.Add_Organization]}} {value "1"}} + } + } +} ad_form -name "search" -method "GET" -export {orderby page_size page format} -form $form_elements \ -on_request { @@ -163,4 +177,4 @@ # Make the Navigation bar context sensitive set person_add_url [export_vars -base "contact-add" -url {{object_type "person"} group_id}] -set organization_add_url [export_vars -base "contact-add" -url {{object_type "organization"} group_id}] \ No newline at end of file +set organization_add_url [export_vars -base "contact-add" -url {{object_type "organization"} group_id}] Index: openacs-4/packages/contacts/www/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.vuh,v diff -u -r1.2 -r1.3 --- openacs-4/packages/contacts/www/index.vuh 27 May 2005 00:18:58 -0000 1.2 +++ openacs-4/packages/contacts/www/index.vuh 13 Jun 2005 07:22:36 -0000 1.3 @@ -62,7 +62,24 @@ ad_script_abort } } else { - ns_returnnotfound - ad_script_abort + switch $file_url { + "add/person" { + if { [ns_queryget object_type] != "" } { + rp_form_put object_type "person" + } + rp_internal_redirect contact-add + } + "add/organization" { + if { [ns_queryget object_type] != "" } { + rp_form_put object_type "organization" + } + rp_internal_redirect contact-add + } + default { + ns_returnnotfound + ad_script_abort + } + } + } Index: openacs-4/packages/contacts/www/my-searches.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/Attic/my-searches.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/contacts/www/my-searches.adp 10 Jun 2005 09:23:27 -0000 1.2 +++ openacs-4/packages/contacts/www/my-searches.adp 13 Jun 2005 07:22:36 -0000 1.3 @@ -1,19 +1,3 @@ - -@title@ -@context@ - - - - + - Index: openacs-4/packages/contacts/www/my-searches.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/Attic/my-searches.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/contacts/www/my-searches.tcl 10 Jun 2005 09:23:27 -0000 1.3 +++ openacs-4/packages/contacts/www/my-searches.tcl 13 Jun 2005 07:22:36 -0000 1.4 @@ -9,9 +9,6 @@ } -validate { } -set title "[_ contacts.My_Searches]" -set context [list [list "search" "[_ contacts.Advanced_Search]"] $title] - template::list::create \ -name "searches" \ -multirow "searches" \ Index: openacs-4/packages/contacts/www/search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/contacts/www/search.adp 10 Jun 2005 09:23:27 -0000 1.4 +++ openacs-4/packages/contacts/www/search.adp 13 Jun 2005 07:22:36 -0000 1.5 @@ -1,21 +1,5 @@ - + -@page_title@ -@context@ - - - - - Index: openacs-4/packages/contacts/www/settings.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/settings.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/contacts/www/settings.adp 10 Jun 2005 09:23:27 -0000 1.3 +++ openacs-4/packages/contacts/www/settings.adp 13 Jun 2005 07:22:36 -0000 1.4 @@ -1,24 +1,5 @@ - -@title@ -@context@ - - - - + -

-#contacts.Add_Signature# -#contacts.Administer_Contacts# -

#contacts.My_Signatures#

Index: openacs-4/packages/contacts/www/settings.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/settings.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/contacts/www/settings.tcl 7 Jun 2005 07:45:40 -0000 1.3 +++ openacs-4/packages/contacts/www/settings.tcl 13 Jun 2005 07:22:36 -0000 1.4 @@ -18,6 +18,7 @@ -name "signatures" \ -multirow "signatures" \ -row_pretty_plural "[_ contacts.signatures]" \ + -actions [list [_ contacts.Add_Signature] "signature" [_ contacts.Add_Signature]] \ -elements { default_p { label ""