loncom/interface/lonhtmlcommon.pm - diff

Return to lonhtmlcommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.335 and 1.338

version 1.335, 2012/11/30 11:28:51	version 1.338, 2012/12/18 15:27:46
Line 1396 sub htmlareaselectactive {	Line 1396 sub htmlareaselectactive {
# is used to determine when the countdown timer turns red to warn the user	# is used to determine when the countdown timer turns red to warn the user
# to think about submitting.	# to think about submitting.

my $dueDateLayout = &mt('Due in: {dn} {dl} {hnn}{sep}{mnn}{sep}{snn} [_1]',"<span id='submitearly'></span>");	my $dueDateLayout = &mt('Due in: {dn} {dl} {hnn}{sep}{mnn}{sep}{snn} [_1]',
	"<span id='submitearly'></span>");
my $early = '- <b>'.&mt('Submit Early').'</b>';	my $early = '- <b>'.&mt('Submit Early').'</b>';
my $pastdue = '- <b>'.&mt('Past Due').'</b>';	my $pastdue = '- <b>'.&mt('Past Due').'</b>';
$output .= <<JAVASCRIPT;	$output .= <<JAVASCRIPT;
Line 1895 returns: nothing	Line 1896 returns: nothing
sub docs_breadcrumbs {	sub docs_breadcrumbs {
my ($allowed,$crstype,$contenteditor,$title,$precleared)=@_;	my ($allowed,$crstype,$contenteditor,$title,$precleared)=@_;
my ($folderpath,@folders);	my ($folderpath,@folders);
if ($env{'form.pagepath'}) {	my @folders = split('&',$env{'form.folderpath'});
@folders = split('&',$env{'form.pagepath'});
} else {
@folders = split('&',$env{'form.folderpath'});
}
my $plain='';	my $plain='';
	my $container = 'sequence';
my ($randompick,$isencrypted,$ishidden,$is_random_order) = (-1,0,0,0);	my ($randompick,$isencrypted,$ishidden,$is_random_order) = (-1,0,0,0);
my @docs_crumbs;	my @docs_crumbs;
while (@folders) {	while (@folders) {
Line 1916 sub docs_breadcrumbs {	Line 1914 sub docs_breadcrumbs {
}	}
$url .= &escape($folderpath);	$url .= &escape($folderpath);
my $name=&unescape($foldername);	my $name=&unescape($foldername);
# each of randompick number, hidden, encrypted, random order are	# each of randompick number, hidden, encrypted, random order, is_page
# appended with ":"s to the foldername	# are appended with ":"s to the foldername
$name=~s/\:(\d)\:(\w)\:(\w):(\d)$//;	$name=~s/\:(\d)\:(\w)\:(\w):(\d)\:?(\d*)$//;
if ($contenteditor) {	if ($contenteditor) {
if ($1 ne '') {	if ($1 ne '') {
$randompick=$1;	$randompick=$1;
Line 1928 sub docs_breadcrumbs {	Line 1926 sub docs_breadcrumbs {
if ($2) { $ishidden=1; }	if ($2) { $ishidden=1; }
if ($3) { $isencrypted=1; }	if ($3) { $isencrypted=1; }
if ($4 ne '') { $is_random_order = 1; }	if ($4 ne '') { $is_random_order = 1; }
	if ($5 == 1) {$container = 'page'; }
}	}
if ($folder eq 'supplemental') {	if ($folder eq 'supplemental') {
$name = &mt('Supplemental '.$crstype.' Contents');	$name = &mt('Supplemental '.$crstype.' Contents');
Line 1964 sub docs_breadcrumbs {	Line 1963 sub docs_breadcrumbs {
return (&breadcrumbs(undef,undef,$menulink,'nohelp',undef,undef,	return (&breadcrumbs(undef,undef,$menulink,'nohelp',undef,undef,
$contenteditor),	$contenteditor),
$randompick,$ishidden,$isencrypted,$plain,	$randompick,$ishidden,$isencrypted,$plain,
$is_random_order);	$is_random_order,$container);
} else {	} else {
return \@docs_crumbs;	return \@docs_crumbs;
}	}
Line 3118 ENDUTILITY	Line 3117 ENDUTILITY

sub jump_to_editres {	sub jump_to_editres {
my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath,	my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath,
$title,$idx,$suppurl) = @_;	$title,$idx,$suppurl,$todocs) = @_;
my $jscall;	my $jscall;
if ($switchserver) {	if ($switchserver) {
if ($home) {	if ($home) {
Line 3162 sub jump_to_editres {	Line 3161 sub jump_to_editres {
if ($forcereg) {	if ($forcereg) {
$cfile .= (($cfile=~/\?/)?'&':'?').'register=1';	$cfile .= (($cfile=~/\?/)?'&':'?').'register=1';
}	}
	if ($todocs) {
	$cfile .= (($cfile=~/\?/)?'&':'?').'todocs=1';
	}
}	}
$jscall = "go('$cfile')";	$jscall = "go('$cfile')";
}	}

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

Removed from v.1.335
changed lines
	Added in v.1.338