--- loncom/interface/loncreateuser.pm 2009/11/12 15:58:22 1.324
+++ loncom/interface/loncreateuser.pm 2009/11/23 13:03:58 1.328
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.324 2009/11/12 15:58:22 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.328 2009/11/23 13:03:58 wenzelju Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -552,10 +552,10 @@ sub print_username_entry_form {
&mt('View/Modify existing role:').''.
'
'.
''.
' | '.
@@ -3572,7 +3572,6 @@ sub custom_role_editor {
my $dompriv='';
my $coursepriv='';
my $body_top;
- my ($disp_dummy,$disp_roles) = &Apache::lonnet::get('roles',["st"]);
my ($rdummy,$roledef)=
&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
# ------------------------------------------------------- Does this role exist?
@@ -4418,7 +4417,7 @@ sub print_main_menu {
linktitle => $linktitle{$crstype}{'groups'},
},
{
- linktext => 'Change Logs',
+ linktext => 'Change Log',
icon => 'document-properties.png',
#help => 'Course_User_Logs',
url => '/adm/createuser?action=changelogs',
@@ -5162,7 +5161,6 @@ sub print_userchangelogs_display {
my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum);
if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }
- $r->print('';
-
- # Only display table, if content is available (has been collected above)
- if (!$content) {
+ if ($showntableheader) { # Table footer, if content displayed above
+ $r->print(&Apache::loncommon::end_data_table()
+ .$nav_links);
+ } else { # No content displayed above
$r->print(''
.&mt('There are no records to display.')
.'
'
);
- $r->print($form_footer);
- return;
}
- # Content to display, so create navigation and display table
+ # Form Footer
+ $r->print(
+ ''
+ .''
+ .'');
+ return;
+}
- # Create Navigation:
- # Navigation Script
- my $nav_script = <<"ENDSCRIPT";
+sub userlogdisplay_nav {
+ my ($formname,$curr,$more_records) = @_;
+ my ($nav_script,$nav_links);
+ if (ref($curr) eq 'HASH') {
+ # Create Navigation:
+ # Navigation Script
+ $nav_script = <<"ENDSCRIPT";
ENDSCRIPT
- # Navigation Buttons
- my $nav_links;
- $nav_links = '';
- if (($curr{'page'} > 1) || ($more_records)) {
- if ($curr{'page'} > 1) {
- $nav_links .= ' ';
- }
- if ($more_records) {
- $nav_links .= '';
+ # Navigation Buttons
+ $nav_links = '
';
+ if (($curr->{'page'} > 1) || ($more_records)) {
+ if ($curr->{'page'} > 1) {
+ $nav_links .= ' ';
+ }
+ if ($more_records) {
+ $nav_links .= '';
+ }
}
+ $nav_links .= '
';
}
- $nav_links .= '';
-
- # Table Header
- my $tableheader =
- &Apache::loncommon::start_data_table_header_row()
- .' | '
- .''.&mt('When').' | '
- .''.&mt('Who made the change').' | '
- .''.&mt('Changed User').' | '
- .''.&mt('Role').' | '
- .''.&mt('Section').' | '
- .''.&mt('Context').' | '
- .''.&mt('Start').' | '
- .''.&mt('End').' | '
- .&Apache::loncommon::end_data_table_header_row();
-
- # Print Content
- $r->print(
- $nav_script
- .$nav_links
- .&Apache::loncommon::start_data_table()
- .$tableheader
- .$content
- .&Apache::loncommon::end_data_table()
- .$nav_links
- .$form_footer
- );
- return;
+ return ($nav_script,$nav_links);
}
sub role_display_filter {