[BACK]Return to londocs.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.478 and 1.479

version 1.478, 2012/03/10 21:24:59 version 1.479, 2012/03/28 12:58:42
Line 1730  sub checkversions { Line 1730  sub checkversions {
         if (&Apache::lonnet::put('resourceversions',\%newsetversions,          if (&Apache::lonnet::put('resourceversions',\%newsetversions,
   $env{'course.'.$env{'request.course.id'}.'.domain'},    $env{'course.'.$env{'request.course.id'}.'.domain'},
   $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {    $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
     $r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');      $r->print(&Apache::loncommon::confirmwrapper(
                   &Apache::lonhtmlcommon::confirm_success(&mt('Your Version Settings have been Saved'))));
  } else {   } else {
     $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');      $r->print(&Apache::loncommon::confirmwrapper(
                   &Apache::lonhtmlcommon::confirm_success(&mt('An Error Occured while Attempting to Save your Version Settings'),1)));
  }   }
  &mark_hash_old();   &mark_hash_old();
     }      }
Line 1798  sub checkversions { Line 1800  sub checkversions {
 'sv' => 'Set Versions to be used in '.$crstype.' according to Selections below',  'sv' => 'Set Versions to be used in '.$crstype.' according to Selections below',
 'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',  'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',
 'sc' => 'Set all Resource Versions to current Version (Fix Versions)',  'sc' => 'Set all Resource Versions to current Version (Fix Versions)',
        'di' => 'Differences');         'di' => 'Differences',
          'save' => 'Save',
          'act' => 'Actions');
     $r->print(<<ENDHEADERS);      $r->print(<<ENDHEADERS);
 <form action="/adm/coursedocs" method="post">  <form action="/adm/coursedocs" method="post">
 <input type="hidden" name="versions" value="1" />  <input type="hidden" name="versions" value="1" />
 <input type="submit" name="setmostrecent" value="$lt{'sm'}" />  <div class="LC_columnSection">
 <input type="submit" name="setcurrent" value="$lt{'sc'}" /><hr />  <fieldset>
   <legend>$lt{'act'}</legend>
   $lt{'sm'}: <input type="submit" name="setmostrecent" value="Go" /><br />
   $lt{'sc'}: <input type="submit" name="setcurrent" value="Go" />
   </fieldset>
   </div>
 <select name="timerange">  <select name="timerange">
 <option value='all' $allsel>$lt{'al'}</option>  <option value='all' $allsel>$lt{'al'}</option>
 <option value="-1" $startsel>$lt{'st'}</option>  <option value="-1" $startsel>$lt{'st'}</option>
Line 1812  sub checkversions { Line 1821  sub checkversions {
 <option value="86400" $daysel>$lt{'sy'}</option>  <option value="86400" $daysel>$lt{'sy'}</option>
 </select>  </select>
 <input type="submit" name="display" value="$lt{'sd'}" />  <input type="submit" name="display" value="$lt{'sd'}" />
 <h3>$header</h3>  <h2>$header</h2>
 <input type="submit" name="setversions" value="$lt{'sv'}" />  <input type="submit" name="setversions" value="$lt{'save'}" />
 <table border="0">  <table border="0">
 ENDHEADERS  ENDHEADERS
       #number of columns for version history
       my $num_ver_col = 1;
       $r->print(
       &Apache::loncommon::start_data_table().
       &Apache::loncommon::start_data_table_header_row().
       '<th>'.&mt('Resources').'</th>'.
       "<th>$lt{'mr'}</th>".
       "<th>$lt{'ve'}</th>".
       "<th>$lt{'vu'}</th>".
       '<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'.
       '</b>');
     foreach my $key (sort(keys(%changes))) {      foreach my $key (sort(keys(%changes))) {
  if ($changes{$key}>$starttime) {   if ($changes{$key}>$starttime) {
     my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);      my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
     my $currentversion=&Apache::lonnet::getversion($key);      my $currentversion=&Apache::lonnet::getversion($key);
     if ($currentversion<0) {      if ($currentversion<0) {
  $currentversion=&mt('Could not be determined.');                  $currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>';
     }      }
     my $linkurl=&Apache::lonnet::clutter($key);      my $linkurl=&Apache::lonnet::clutter($key);
     $r->print(          $r->print(
       '<tr><td colspan="5"><br /><br /><font size="+1"><b>'.              &Apache::loncommon::end_data_table_header_row().
       &Apache::lonnet::gettitle($linkurl).              &Apache::loncommon::start_data_table_row().
                       '</b></font></td></tr>'.              '<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br>'.
                       '<tr><td>&nbsp;&nbsp;&nbsp;</td>'.              '<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'.
                       '<td colspan="4">'.              '<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br>('.
                       '<a href="'.$linkurl.'" target="cat">'.$linkurl.              &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')</span></td>'.
       '</a></td></tr>'.              '<td align="right">');
                       '<tr><td></td>'.  
                       '<td title="'.$lt{'md'}.'">'.  
       &Apache::lonlocal::locallocaltime(  
                            &Apache::lonnet::metadata($root.'.'.$extension,  
                                                      'lastrevisiondate')  
                                                         ).  
                       '</td>'.  
                       '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '.  
                       '<font size="+1">'.$currentversion.'</font>'.  
                       '</span></td>'.  
                       '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$crstype.': '.  
                       '<font size="+1">');  
 # Used in course  # Used in course
     my $usedversion=$hash{'version_'.$linkurl};      my $usedversion=$hash{'version_'.$linkurl};
     if (($usedversion) && ($usedversion ne 'mostrecent')) {      if (($usedversion) && ($usedversion ne 'mostrecent')) {
  $r->print($usedversion);                  if($usedversion != $currentversion){
                       $r->print('<span class="LC_warning">'.$usedversion.'</span>');
                   }else{
                       $r->print($usedversion);
                   }
     } else {      } else {
  $r->print($currentversion);   $r->print($currentversion);
     }      }
     $r->print('</font></span></td><td title="'.$lt{'vu'}.'">'.      $r->print('</td><td title="'.$lt{'vu'}.'">');
                       '<span class="LC_nobreak">Use: ');  
 # Set version  # Set version
     $r->print(&Apache::loncommon::select_form($setversions{$linkurl},      $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
       'set_version_'.$linkurl,        'set_version_'.$linkurl,
Line 1861  ENDHEADERS Line 1872  ENDHEADERS
        '' => '',         '' => '',
        'mostrecent' => &mt('most recent'),         'mostrecent' => &mt('most recent'),
        map {$_,$_} (1..$currentversion)}));         map {$_,$_} (1..$currentversion)}));
     $r->print('</span></td></tr><tr><td></td>');  
     my $lastold=1;      my $lastold=1;
     for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {      for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
  my $url=$root.'.'.$prevvers.'.'.$extension;   my $url=$root.'.'.$prevvers.'.'.$extension;
Line 1875  ENDHEADERS Line 1885  ENDHEADERS
             # each of the four columns              # each of the four columns
             my $entries_per_col = 0;              my $entries_per_col = 0;
             my $num_entries = ($currentversion-$lastold);              my $num_entries = ($currentversion-$lastold);
             if ($num_entries % 4 == 0) {              if ($num_entries % $num_ver_col == 0) {
                 $entries_per_col = $num_entries/4;                  $entries_per_col = $num_entries/$num_ver_col;
             } else {              } else {
                 $entries_per_col = $num_entries/4 + 1;                  $entries_per_col = $num_entries/$num_ver_col + 1;
             }              }
             my $entries_count = 0;              my $entries_count = 0;
             $r->print('<td valign="top"><font size="-2">');              $r->print('<td valign="top"><span class="LC_fontsize_medium">');
             my $cols_output = 1;              my $cols_output = 1;
             for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {              for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
  my $url=$root.'.'.$prevvers.'.'.$extension;   my $url=$root.'.'.$prevvers.'.'.$extension;
Line 1900  ENDHEADERS Line 1910  ENDHEADERS
  }   }
  $r->print('</span><br />');   $r->print('</span><br />');
                 if (++$entries_count % $entries_per_col == 0) {                  if (++$entries_count % $entries_per_col == 0) {
                     $r->print('</font></td>');                      $r->print('</span></td>');
                     if ($cols_output != 4) {                      if ($cols_output != $num_ver_col) {
                         $r->print('<td valign="top"><font size="-2">');                          $r->print('<td valign="top"><span class="LC_fontsize_medium">');
                         $cols_output++;                          $cols_output++;
                     }                      }
                 }                  }
     }      }
             while($cols_output++ < 4) {              while($cols_output++ < $num_ver_col) {
                 $r->print('</font></td><td><font>')                  $r->print('</span></td><td>');
             }              }
     $r->print('</font></td></tr>'."\n");  
  }   }
     }      }
     $r->print('</table></form>');      $r->print('</td>'.&Apache::loncommon::end_data_table_row().
     $r->print('<p class="LC_success">'.&mt('Done').'</p>');              &Apache::loncommon::end_data_table().
               '<input type="submit" name="setversions" value="'.$lt{'save'}.'" />');
   
     &untiehash();      &untiehash();
 }  }
Removed from v.1.478  
changed lines
  Added in v.1.479

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