--- loncom/interface/lonhtmlcommon.pm 2006/06/14 18:34:46 1.133
+++ loncom/interface/lonhtmlcommon.pm 2006/06/22 15:53:48 1.135
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.133 2006/06/14 18:34:46 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.135 2006/06/22 15:53:48 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -288,7 +288,7 @@ The method used to restrict user input w
##############################################
sub date_setter {
my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
- $no_hh_mm_ss,$defhour,$defmin,$defsec) = @_;
+ $no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink) = @_;
my $wasdefined=1;
if (! defined($state) || $state ne 'disabled') {
$state = '';
@@ -330,7 +330,7 @@ sub date_setter {
}
my $result = "\n\n";
$result .= <
+
ENDJS
- $result .= ' ';
+ $result .= ' ';
my $monthselector = qq{\n";
my $minuteselector = qq{};
my $secondselector= qq{};
- my $cal_link = qq{};
+ my $cal_link;
+ if (!$nolink) {
+ $cal_link = qq{};
+ }
#
if ($no_hh_mm_ss) {
- $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]',
- $monthselector,$dayselector,$yearselector,
- $cal_link,'');
+ $result .= &mt('[_1] [_2] [_3] ',
+ $monthselector,$dayselector,$yearselector);
+ if (!$nolink) {
+ $result .= &mt('[_4]Select Date[_5]',$cal_link,'');
+ }
} else {
- $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s [_7]Select Date[_8]',
- $monthselector,$dayselector,$yearselector,
- $hourselector,$minuteselector,$secondselector,
- $cal_link,'');
+ $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s ',
+ $monthselector,$dayselector,$yearselector,
+ $hourselector,$minuteselector,$secondselector);
+ if (!$nolink) {
+ $result .= &mt('[_7]Select Date[_8]',$cal_link,'');
+ }
}
- $result .= "\n\n";
+ $result .= "\n\n";
return $result;
}