[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface londocs.pm

[raeburn]

raeburn		Wed Dec 12 23:11:20 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	londocs.pm 
  Log:
  - For 2.11
    - Backport 1.496, 1.497, 1.498, 1.499.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.9 loncom/interface/londocs.pm:1.484.2.10
--- loncom/interface/londocs.pm:1.484.2.9	Tue Sep 25 23:44:34 2012
+++ loncom/interface/londocs.pm	Wed Dec 12 23:11:19 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.9 2012/09/25 23:44:34 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.10 2012/12/12 23:11:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -322,7 +322,6 @@
         @folders=split('&',$env{'form.folderpath'});
     }
     my $folderpath;
-    my $cpinfo='';
     my $plain='';
     my $randompick=-1;
     my $isencrypted=0;
@@ -355,7 +354,7 @@
             $name = &mt('Supplemental '.$crstype.' Content');
         }
 	&Apache::lonhtmlcommon::add_breadcrumb(
-		      {'href'=>$url.$cpinfo,
+		      {'href'=>$url,
 		       'title'=>$name,
 		       'text'=>$name,
 		       'no_mt'=>1,
@@ -2152,7 +2151,6 @@
 	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
         $symb=&escape($env{'form.pagesymb'});
     }
-    my $cpinfo='';
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
@@ -2286,12 +2284,12 @@
 	$line.=(<<END);
 <td>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=up_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'>
+  <a href='/adm/coursedocs?cmd=up_$index&${type}path=$esc_path&${type}symb=$symb'>
     <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" />
   </a>
 </div>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=down_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'>
+  <a href='/adm/coursedocs?cmd=down_$index&${type}path=$esc_path&${type}symb=$symb'>
     <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
   </a>
 </div>
@@ -2397,7 +2395,7 @@
                                               'parameter_encrypturl'))[0]=~/^yes$/i)
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randomorder'))[0]=~/^yes$/i);
-	$url.='folderpath='.&escape($folderpath).$cpinfo;
+	$url.='folderpath='.&escape($folderpath);
         my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
                                                    'parameter_randompick'))[0];
         my $rpckchk;
@@ -2436,7 +2434,7 @@
 					       $path.$pagearg.'.page');
 	}
 	$url.='pagepath='.&escape($pagepath).
-	    '&pagesymb='.&escape($symb).$cpinfo;
+	    '&pagesymb='.&escape($symb);
     }
     if (($external) && ($allowed)) {
 	my $form = ($folder =~ /^default/)? 'newext' : 'supnewext';
@@ -2864,7 +2862,8 @@
     '<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'.
     '</b>');
     foreach my $key (sort(keys(%changes))) {
-	if ($changes{$key}>$starttime) {
+        #excludes not versionable problems from resource version history:
+        next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/);
 	    my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
 	    my $currentversion=&Apache::lonnet::getversion($key);
 	    if ($currentversion<0) {
@@ -3981,7 +3980,7 @@
   } elsif ($showdoc) {
 # -------------------------------------------------------- This is showdoc mode
       $r->print("<h1>".&mt('Uploaded Document').' - '.
-		&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
+		&Apache::lonnet::gettitle($r->uri).'</h1><p class="LC_warning">'.
 &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>".
                 &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
   }