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.358.2.11.2.2 and 1.358.2.13

version 1.358.2.11.2.2, 2018/04/29 16:30:35	version 1.358.2.13, 2018/09/03 20:37:00
Line 671 ENDJS	Line 671 ENDJS
my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />};	my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />};
my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />};	my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />};
my $cal_link;	my $cal_link;
if (!$nolink) {	unless (($nolink) \|\| ($state eq 'disabled')) {
$cal_link = qq{<a href="javascript:$dname\_opencalendar()">};	$cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
}	}
#	#
Line 696 ENDJS	Line 696 ENDJS
$hourselector,$minuteselector,$secondselector).	$hourselector,$minuteselector,$secondselector).
$tzone;	$tzone;
}	}
if (!$nolink) {	unless (($nolink) \|\| ($state eq 'disabled')) {
$result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');	$result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
}	}
$result .= "</span>\n<!-- end $dname date setting form -->\n";	$result .= "</span>\n<!-- end $dname date setting form -->\n";
Line 1690 sub show_return_link {	Line 1690 sub show_return_link {
(($env{'request.noversionuri'}=~/^\/adm\//) &&	(($env{'request.noversionuri'}=~/^\/adm\//) &&
($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&	($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
($env{'request.noversionuri'}!~	($env{'request.noversionuri'}!~
m{^/adm/.*/(smppg\|bulletinboard\|ext\.tool)($\|\?)})	m{^/adm/.*/(smppg\|bulletinboard)($\|\?)})
));	));
}	}

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

Removed from v.1.358.2.11.2.2
changed lines
	Added in v.1.358.2.13