Index: openacs-4/packages/acs-admin/www/users/merge.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-admin/www/users/merge.tcl 27 Oct 2014 16:38:57 -0000 1.6 +++ openacs-4/packages/acs-admin/www/users/merge.tcl 7 Aug 2017 23:47:45 -0000 1.7 @@ -26,13 +26,13 @@ # # Information of user_id_one # -if { [db_0or1row one_user_portrait { *SQL* }] } { +if { [db_0or1row one_user_portrait {}] } { set one_img_src "[subsite::get_element -element url]shared/portrait-bits.tcl?user_id=$user_id" } else { set one_img_src "/resources/acs-admin/not_available.gif" } -db_1row one_get_info { *SQL* } +db_1row one_get_info {} db_multirow -extend {one_item_object_url} one_user_contributions one_user_contributions { *SQL* } { set one_item_object_url "[site_node::get_url_from_object_id -object_id $object_id]" @@ -57,13 +57,13 @@ # # Information of user_id_two # -if { [db_0or1row two_user_portrait { *SQL* }] } { +if { [db_0or1row two_user_portrait {}] } { set two_img_src "[subsite::get_element -element url]shared/portrait-bits.tcl?user_id=$user_id_from_search" } else { set two_img_src "/resources/acs-admin/not_available.gif" } -db_1row two_get_info { *SQL* } +db_1row two_get_info {} db_multirow -extend {two_item_object_url} two_user_contributions two_user_contributions { *SQL* } { set two_item_object_url "[site_node::get_url_from_object_id -object_id $object_id]" @@ -88,3 +88,27 @@ template::head::add_css \ -href "/resources/acs-admin/um-more-info.css" \ -media all + +template::add_body_script -script { + function toggle_footer(event) { + event.preventDefault(); + var el = document.getElementsByTagName('div'); + for(i = 0; i < el.length; i++) { + if (el[i].className=='um-more-info') { + el[i].className='um-more-info-off'; + } else { + if (el[i].className=='um-more-info-off') { + el[i].className='um-more-info'; + } + } + }; + return false; + }; + document.getElementById('toggle-footer-display-control-1').addEventListener('click', toggle_footer, false); + document.getElementById('toggle-footer-display-control-2').addEventListener('click', toggle_footer, false); +} +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: