--- loncom/interface/lonhtmlcommon.pm 2012/01/02 05:07:06 1.298
+++ loncom/interface/lonhtmlcommon.pm 2012/03/20 13:36:19 1.303
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.298 2012/01/02 05:07:06 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.303 2012/03/20 13:36:19 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1072,6 +1072,8 @@ sub Close_PrgWin {
sub crumbs {
my ($uri,$target,$prefix,$form,$skiplast)=@_;
+# You cannot crumbnify uploaded or adm resources
+ if ($uri=~/^\/*(uploaded|adm)\//) { return &mt('(Internal Course/Group Content)'); }
if ($target) {
$target = ' target="'.
&Apache::loncommon::escape_single($target).'"';
@@ -1170,6 +1172,9 @@ ENDEDITOR
+
+
ENDJQUERY
return $s;
}
@@ -1298,6 +1303,9 @@ sub htmlareaselectactive {
$(this).before("
");
$("#LC_rt_"+id).click(editorHandler);
});
+ $.fn.jPicker.defaults.images.clientPath="/adm/jpicker/images/";
+ $(".colorchooser").jPicker();
+
});
';
if ($dragmath_prefix ne '') {
@@ -1462,11 +1470,11 @@ returns: nothing
}
my $links;
if ((&show_return_link) && (!$CourseBreadcrumbs)) {
- my $alttext = 'Go Back';
+ my $alttext = &mt('Go Back');
$links=&htmltag( 'a',"
",
{ href => '/adm/flip?postdata=return:',
title => &mt("Back to most recent content resource") });
- $links=&htmltag('li',$links);
+ $links=&htmltag('li',$links);
}
$links.= join "",
map {
@@ -2003,26 +2011,41 @@ sub course_custom_roles {
sub resource_info_box {
- my ($symb,$onlyfolderflag)=@_;
+ my ($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp)=@_;
my $return='';
+ if ($stuvcurrent ne '') {
+ $return = '';
+ }
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().
- '
'.&mt('Folder:').' | '.$folder.' | '.
+ '
'.&mt('Folder:').' | '.$folder.' | '.
&Apache::loncommon::end_data_table_row();
unless ($onlyfolderflag) {
$return.=&Apache::loncommon::start_data_table_row().
- '
'.&mt('Resource:').' | '.&Apache::lonnet::gettitle($symb).' | '.
+ '
'.&mt('Resource:').' | '.&Apache::lonnet::gettitle($symb).' | '.
+ &Apache::loncommon::end_data_table_row();
+ }
+ if ($stuvcurrent ne '') {
+ $return .= &Apache::loncommon::start_data_table_row().
+ '
'.&mt("Student's current version:").' | '.$stuvcurrent.' | '.
+ &Apache::loncommon::end_data_table_row();
+ }
+ if ($stuvdisp ne '') {
+ $return .= &Apache::loncommon::start_data_table_row().
+ '
'.&mt("Student's version displayed:").' | '.$stuvdisp.' | '.
&Apache::loncommon::end_data_table_row();
}
$return.=&Apache::loncommon::end_data_table();
} else {
$return='
'.&mt('No context provided.').'
';
}
+ if ($stuvcurrent ne '') {
+ $return .= '
';
+ }
return $return;
-
}
##############################################