[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm londropadd.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 01 Nov 2005 20:47:16 -0000
This is a MIME encoded message
--albertel1130878036
Content-Type: text/plain
albertel Tue Nov 1 15:47:16 2005 EDT
Modified files:
/loncom/interface londropadd.pm loncommon.pm
Log:
- <label>
--albertel1130878036
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20051101154716.txt"
Index: loncom/interface/londropadd.pm
diff -u loncom/interface/londropadd.pm:1.130 loncom/interface/londropadd.pm:1.131
--- loncom/interface/londropadd.pm:1.130 Fri Jun 3 12:27:26 2005
+++ loncom/interface/londropadd.pm Tue Nov 1 15:47:15 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.130 2005/06/03 16:27:26 www Exp $
+# $Id: londropadd.pm,v 1.131 2005/11/01 20:47:15 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -253,8 +253,8 @@
$r->print('<input type="button" value="Reverse Association" '.
'name="'.&mt('Reverse Association').'" '.
'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
- $r->print('<input type="checkbox" name="noFirstLine" $checked />'.
- &mt('Ignore First Line'));
+ $r->print('<label><input type="checkbox" name="noFirstLine" $checked />'.
+ &mt('Ignore First Line').'</label>');
$r->print("<hr />\n".
'<script type="text/javascript" language="Javascript">'."\n".
$javascript."\n".$javascript_validations.'</script>');
@@ -617,14 +617,14 @@
$Str .= "<h3>".&mt('Starting and Ending Dates')."</h3>\n";
$Str .= "<p>\n".$date_table."</p>\n";
$Str .= "<h3>".&mt('Full Update')."</h3>\n";
- $Str .= '<input type="checkbox" name="fullup" value="yes">'.
+ $Str .= '<label><input type="checkbox" name="fullup" value="yes">'.
' '.&mt('Full update (also print list of users not enrolled anymore)').
- "</p>\n";
+ "</label></p>\n";
$Str .= "<h3>".&mt('Student Number')."</h3>\n";
- $Str .= "<p>\n".'<input type="checkbox" name="forceid" value="yes">';
+ $Str .= "<p>\n".'<label><input type="checkbox" name="forceid" value="yes">';
$Str .= &mt('Disable ID/Student Number Safeguard and Force Change '.
'of Conflicting IDs (only do if you know what you are doing)').
- "\n</p><p>\n";
+ "</label>\n</p><p>\n";
$Str .= '<input type="button" onClick="javascript:verify(this.form)" '.
'value="Update Class List" />'."<br />\n";
$Str .= &mt('Note: for large courses, this operation may be time '.
@@ -853,16 +853,16 @@
my ($starttime,$endtime,$mode) = @_;
my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
my $dateDefault = '<nobr>'.
- '<input type="checkbox" name="makedatesdefault" /> '.
- &mt('make these dates the default for future enrollment');
+ '<label><input type="checkbox" name="makedatesdefault" /> '.
+ &mt('make these dates the default for future enrollment').'</label>';
if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
$dateDefault = ' ';
}
- my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';
+ my $perpetual = '<nobr><label><input type="checkbox" name="no_end_date"';
if (defined($endtime) && $endtime == 0) {
$perpetual .= ' checked';
}
- $perpetual.= ' /> '.&mt('no ending date').'</nobr>';
+ $perpetual.= ' /> '.&mt('no ending date').'</label></nobr>';
if ($mode eq 'create_enrolldates') {
$perpetual = ' ';
}
@@ -1117,8 +1117,10 @@
<p>
$lt{'idsn'}: <input type="text" name="cstid" size="10">
</p><p>
+<label>
<input type="checkbox" name="forceid" value="yes">
$lt{'disn'}
+</label>
</p><p>
<input type="button" onClick="verify(this.form)" value="$lt{'eas'}">
</p>
@@ -1393,16 +1395,16 @@
$studentcount++;
my $cellentry;
if ($type eq 'auto') {
- $cellentry = '<b>'.&mt('auto').'</b> <input type="checkbox" name="chgauto" value="'.$username.':'.$domain.'" /> Change';
+ $cellentry = '<b>'.&mt('auto').'</b> <label><input type="checkbox" name="chgauto" value="'.$username.':'.$domain.'" /> Change</label>';
$autocount ++;
} else {
- $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><input type="checkbox" name="chgmanual" value="'.$username.':'.$domain.'" /> Change</nobr></td></tr><tr><td><nobr>';
+ $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><label><input type="checkbox" name="chgmanual" value="'.$username.':'.$domain.'" /> Change</label></nobr></td></tr><tr><td><nobr>';
$manualcount ++;
if ($lockedtype) {
- $cellentry .= '<input type="checkbox" name="unlockchg" value="'.$username.':'.$domain.'" /> '.&mt('Unlock');
+ $cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$username.':'.$domain.'" /> '.&mt('Unlock').'</label>';
$unlockcount ++;
} else {
- $cellentry .= '<input type="checkbox" name="lockchg" value="'.$username.':'.$domain.'" /> '.&mt('Lock');
+ $cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$username.':'.$domain.'" /> '.&mt('Lock').'</label>';
$lockcount ++;
}
$cellentry .= '</nobr></td></tr></table>';
@@ -1594,8 +1596,10 @@
</p><p>
<b>$lt{'sid'}</b>: <input type="text" name="id" value="$info{'id'}" size="12"/>
</p><p>
+<label>
<input type="checkbox" name="forceid" >
$lt{'disn'}
+</label>
</p><p>
<b>$lt{'sec'}</b>: <input type="text" name="section" value="$section" size="14"/>
</p>
@@ -1975,8 +1979,8 @@
$str .= "<p>\n";
$str .= '<input type="submit" name="fileupload" value="'.
&mt('Upload class list').'">'."\n";
- $str .= '<input type="checkbox" name="noFirstLine" /> '.
- &mt('Ignore First Line')."</p>\n";
+ $str .= '<label><input type="checkbox" name="noFirstLine" /> '.
+ &mt('Ignore First Line')."</label></p>\n";
$str .= &Apache::loncommon::help_open_topic("Course_Create_Class_List",
&mt("How do I create a class list from a spreadsheet")).
"<br />\n";
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.280 loncom/interface/loncommon.pm:1.281
--- loncom/interface/loncommon.pm:1.280 Fri Oct 14 16:16:46 2005
+++ loncom/interface/loncommon.pm Tue Nov 1 15:47:15 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.280 2005/10/14 20:16:46 albertel Exp $
+# $Id: loncommon.pm,v 1.281 2005/11/01 20:47:15 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1565,10 +1565,11 @@
kerb_def_dom => 'MSU.EDU',
@_,
);
- my $result = &mt('[_1] Do not change login data',
+ my $result = '<label>'.&mt('[_1] Do not change login data',
'<input type="radio" name="login" value="nochange" '.
'checked="checked" onclick="'.
- "javascript:changed_radio('nochange',$in{'formname'});".'" />');
+ "javascript:changed_radio('nochange',$in{'formname'});".'" />').
+ '</label>';
return $result;
}
@@ -1600,14 +1601,15 @@
my $jscall = "javascript:changed_radio('krb',$in{'formname'});";
my $result .= &mt
('[_1] Kerberos authenticated with domain [_2] '.
- '[_3] Version 4 [_4] Version 5',
- '<input type="radio" name="login" value="krb" '.
+ '[_3] Version 4 [_4] Version 5 [_5]',
+ '<label><input type="radio" name="login" value="krb" '.
'onclick="'.$jscall.'" onchange="'.$jscall.'"'.$krbcheck.' />',
- '<input type="text" size="10" name="krbarg" '.
+ '</label><input type="text" size="10" name="krbarg" '.
'value="'.$krbarg.'" '.
'onchange="'.$jscall.'" />',
- '<input type="radio" name="krbver" value="4" '.$check4.' />',
- '<input type="radio" name="krbver" value="5" '.$check5.' />');
+ '<label><input type="radio" name="krbver" value="4" '.$check4.' />',
+ '</label><label><input type="radio" name="krbver" value="5" '.$check5.' />',
+ '</label>');
return $result;
}
@@ -1632,9 +1634,9 @@
my $jscall = "javascript:changed_radio('int',$args{'formname'});";
my $result.=&mt
('[_1] Internally authenticated (with initial password [_2])',
- '<input type="radio" name="login" value="int" '.$intcheck.
+ '<label><input type="radio" name="login" value="int" '.$intcheck.
' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
- '<input type="text" size="10" name="intarg" '.$intarg.
+ '</label><input type="text" size="10" name="intarg" '.$intarg.
' onchange="'.$jscall.'" />');
return $result;
}
@@ -1659,9 +1661,9 @@
my $jscall = "javascript:changed_radio('loc',$in{'formname'});";
my $result.=&mt('[_1] Local Authentication with argument [_2]',
- '<input type="radio" name="login" value="loc" '.$loccheck.
+ '<label><input type="radio" name="login" value="loc" '.$loccheck.
' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
- '<input type="text" size="10" name="locarg" '.$locarg.
+ '</label><input type="text" size="10" name="locarg" '.$locarg.
' onchange="'.$jscall.'" />');
return $result;
}
@@ -1675,9 +1677,9 @@
my $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
my $result.= &mt
('[_1] Filesystem Authenticated (with initial password [_2])',
- '<input type="radio" name="login" value="fsys" '.
+ '<label><input type="radio" name="login" value="fsys" '.
'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
- '<input type="text" size="10" name="fsysarg" value="" '.
+ '</label><input type="text" size="10" name="fsysarg" value="" '.
'onchange="'.$jscall.'" />');
return $result;
}
--albertel1130878036--