Diff for /loncom/interface/groupsort.pm between versions 1.50 and 1.54

version 1.50, 2006/12/05 02:55:51 version 1.54, 2007/07/11 20:32:15
Line 65  sub readfromdb { Line 65  sub readfromdb {
  foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {   foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {
     my $key = $_;      my $key = $_;
     if ($ahash{$key} eq '1') {      if ($ahash{$key} eq '1') {
           if ($hash{'pre_'.$key.'_title'} eq 'Not_retrieved') {
               $hash{'pre_'.$key.'_title'} = &Apache::lonnet::gettitle($hash{'pre_'.$key.'_link'});
           }
  $hash{'store_'.$hash{'pre_'.$key.'_link'}} =   $hash{'store_'.$hash{'pre_'.$key.'_link'}} =
     $hash{'pre_'.$key.'_title'};      $hash{'pre_'.$key.'_title'};
  $hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =   $hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =
Line 328  END Line 331  END
  'ci' => 'Continue Import',   'ci' => 'Continue Import',
  'cs' => 'Continue Search',   'cs' => 'Continue Search',
  'fi' => 'Finish Import',   'fi' => 'Finish Import',
    're' => 'Recover Checked',
  'ca' => 'Cancel',   'ca' => 'Cancel',
  'co' => 'Change Order',   'co' => 'Change Order',
  'ti' => 'Title',   'ti' => 'Title',
Line 349  END Line 353  END
 <input type="hidden" name="recover" value="$env{'form.recover'}" />  <input type="hidden" name="recover" value="$env{'form.recover'}" />
 END  END
   
           $r->print(&Apache::loncommon::inhibit_menu_check('input'));
           # ---
       
           if ($env{'form.recover'}) {
       $r->print(<<END);
   <input type="button" name="alter" value="$lt{'re'}"
    onClick="finish_import()" />&nbsp;
   <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
   END
    } else {
         # --- Continue Buttons          # --- Continue Buttons
         my $resurl =       my $resurl = 
    &Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());   &Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
         $r->print(<<END);      $r->print(<<END);
 <input type="button" name="alter" value="$lt{'ci'}"  <input type="button" name="alter" value="$lt{'ci'}"
  onClick="window.location='$resurl?catalogmode=import'" />&nbsp;   onClick="window.location='$resurl?inhibitmenu=yes&amp;catalogmode=import'" />&nbsp;
 <input type="button" name="altersearch" value="$lt{'cs'}"  <input type="button" name="altersearch" value="$lt{'cs'}"
  onClick="window.location='/adm/searchcat?catalogmode=import'" />&nbsp;   onClick="window.location='/adm/searchcat?inhibitmenu=yes&amp;catalogmode=import'" />&nbsp;
 END  
         # ---  
   
  $r->print(<<END);  
 <input type="button" name="alter" value="$lt{'fi'}"  <input type="button" name="alter" value="$lt{'fi'}"
  onClick="finish_import()" />&nbsp;   onClick="finish_import()" />&nbsp;
 <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />  <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
 END  END
           }
         $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");          $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
  $r->print("<table border=0><tr>\n");   $r->print("<table border=0><tr>\n");
  if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {    if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { 
Line 385  END Line 396  END
 <input type="hidden" name="newval" value="" />  <input type="hidden" name="newval" value="" />
 <input type="hidden" name="mode" value="$env{'form.mode'}" />  <input type="hidden" name="mode" value="$env{'form.mode'}" />
 END  END
           $r->print(&Apache::loncommon::inhibit_menu_check('input'));
   
     }      }
     foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {      foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {
  my $key=$_;   my $key=$_;

Removed from v.1.50  
changed lines
  Added in v.1.54


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>