--- loncom/interface/londocs.pm	2006/11/13 17:20:29	1.251
+++ loncom/interface/londocs.pm	2006/11/20 17:45:11	1.254
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.251 2006/11/13 17:20:29 www Exp $
+# $Id: londocs.pm,v 1.254 2006/11/20 17:45:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1027,7 +1027,6 @@ sub log_docs {
         my ($plain)=@_;
         my %storehash=('folder' => $plain);
         if ($parmidx) {
-           $storehash{'parameter_idx'}=$parmidx;
            $storehash{'parameter_res'}=$oldresources[$parmidx];
            foreach my $parm (keys %parmaction) {
               $storehash{'parameter_action_'.$parm}=$parmaction{$parm};
@@ -1045,10 +1044,8 @@ sub log_docs {
               $changedflag=1;
            }
            if ($LONCAPA::map::order[$idx] ne $oldorder[$idx]) {
-              $storehash{'before_order_'.$idx}=$oldorder[$idx];
-              $storehash{'after_order_'.$idx}=$LONCAPA::map::order[$idx];
-              $storehash{'before_order_res_'.$idx}=$oldresources[$idx];
-              $storehash{'after_order_res_'.$idx}=$LONCAPA::map::resources[$idx];
+              $storehash{'before_order_res_'.$idx}=$oldresources[$oldorder[$idx]];
+              $storehash{'after_order_res_'.$idx}=$LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
               $changedflag=1;
            }
         }
@@ -1065,27 +1062,32 @@ sub docs_change_log {
     my ($r)=@_;
     $r->print(&Apache::loncommon::start_page('Course Document Change Log'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Document Change Log'));
-                                                                                                                            
+
     my %docslog=&Apache::lonnet::dump('nohist_docslog',
                                       $env{'course.'.$env{'request.course.id'}.'.domain'},
                                       $env{'course.'.$env{'request.course.id'}.'.num'});
-                                                                                                                            
+
     if ((keys(%docslog))[0]=~/^error\:/) { undef(%docslog); }
-                                                                                                                            
+
     $r->print('<form action="/adm/coursedocs" method="post" name="docslog">'.
               '<input type="hidden" name="docslog" value="1" />');
-                                                                                                                            
+
     my %saveable_parameters = ('show' => 'scalar',);
     &Apache::loncommon::store_course_settings('docs_log',
                                               \%saveable_parameters);
     &Apache::loncommon::restore_course_settings('docs_log',
                                                 \%saveable_parameters);
     if (!$env{'form.show'}) { $env{'form.show'}=10; }
-                                                                                                                            
+    my %lt=('hiddenresource' => 'Resources hidden',
+	    'encrypturl'     => 'URL hidden',
+	    'randompick'     => 'Randomly pick',
+	    'set'            => 'set to',
+	    'del'            => 'deleted');
+
     my $countselect =
         &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
                                     (&mt('all'),10,20,50,100,1000,10000));
-                                                                                                                            
+
     $r->print('<nobr>'.&mt('[_1] Records',$countselect).'</nobr>'.
               '<input type="submit" value="'.&mt('Display').'" /></form>');
     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
@@ -1125,9 +1127,16 @@ sub docs_change_log {
 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
 	    if ($oldname ne $newname) {
-		$r->print(&LONCAPA::map::qtunescape($oldname));
+		$r->print(&LONCAPA::map::qtescape($oldname));
 	    }
 	}
+	$r->print('<ul>');
+	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+            if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) {
+		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]).'</li>');
+	    }
+	}
+	$r->print('</ul>');
 # After
         $r->print('</td><td>');
 
@@ -1135,9 +1144,28 @@ sub docs_change_log {
 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
 	    if ($oldname ne $newname) {
-		$r->print(&LONCAPA::map::qtunescape($newname));
+		$r->print(&LONCAPA::map::qtescape($newname));
 	    }
 	}        
+	$r->print('<ul>');
+	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+            if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
+		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]).'</li>');
+	    }
+	}
+	$r->print('</ul>');
+	if ($docslog{$id}{'logentry'}{'parameter_res'}) {
+	    $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
+	    foreach my $parameter ('randompick','hiddenresource','encrypturl') {
+		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
+		    $r->print('<li>'.
+			      &mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',
+				  $docslog{$id}{'logentry'}{'parameter_value_'.$parameter})
+			      .'</li>');
+		}
+	    }
+	    $r->print('</ul>');
+	}
 # End
         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
         $shown++;