--- loncom/interface/lonhtmlcommon.pm 2011/12/21 21:25:40 1.297 +++ loncom/interface/lonhtmlcommon.pm 2012/01/03 00:28:29 1.300 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.297 2011/12/21 21:25:40 www Exp $ +# $Id: lonhtmlcommon.pm,v 1.300 2012/01/03 00:28:29 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1462,9 +1462,11 @@ returns: nothing } my $links; if ((&show_return_link) && (!$CourseBreadcrumbs)) { - $links=&htmltag( 'a',"<img src='/res/adm/pages/reload.png' border='0' style='vertical-align:middle;' />", + my $alttext = &mt('Go Back'); + $links=&htmltag( 'a',"<img src='/res/adm/pages/reload.png' border='0' style='vertical-align:middle;' alt='$alttext' />", { href => '/adm/flip?postdata=return:', title => &mt("Back to most recent content resource") }); + $links=&htmltag('li',$links); } $links.= join "", map { @@ -2001,26 +2003,41 @@ sub course_custom_roles { sub resource_info_box { - my ($symb,$onlyfolderflag)=@_; + my ($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp)=@_; my $return=''; + if ($stuvcurrent ne '') { + $return = '<div class="LC_left_float">'; + } if ($symb) { - $return=&Apache::loncommon::start_data_table(); + $return.=&Apache::loncommon::start_data_table(); my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symb); my $folder=&Apache::lonnet::gettitle($map); $return.=&Apache::loncommon::start_data_table_row(). - '<th>'.&mt('Folder:').'</th><td>'.$folder.'</td>'. + '<th align="left">'.&mt('Folder:').'</th><td>'.$folder.'</td>'. &Apache::loncommon::end_data_table_row(); unless ($onlyfolderflag) { $return.=&Apache::loncommon::start_data_table_row(). - '<th>'.&mt('Resource:').'</th><td>'.&Apache::lonnet::gettitle($symb).'</td>'. + '<th align="left">'.&mt('Resource:').'</th><td>'.&Apache::lonnet::gettitle($symb).'</td>'. + &Apache::loncommon::end_data_table_row(); + } + if ($stuvcurrent ne '') { + $return .= &Apache::loncommon::start_data_table_row(). + '<th align="left">'.&mt("Student's current version:").'</th><td>'.$stuvcurrent.'</td>'. + &Apache::loncommon::end_data_table_row(); + } + if ($stuvdisp ne '') { + $return .= &Apache::loncommon::start_data_table_row(). + '<th align="left">'.&mt("Student's version displayed:").'</th><td>'.$stuvdisp.'</td>'. &Apache::loncommon::end_data_table_row(); } $return.=&Apache::loncommon::end_data_table(); } else { $return='<p><span class="LC_error">'.&mt('No context provided.').'</span></p>'; } + if ($stuvcurrent ne '') { + $return .= '</div>'; + } return $return; - } ##############################################