[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface loncreateuser.pm
raeburn
raeburn@source.lon-capa.org
Fri, 14 Aug 2009 14:21:01 -0000
This is a MIME encoded message
--raeburn1250259661
Content-Type: text/plain
raeburn Fri Aug 14 14:21:01 2009 EDT
Modified files: (Branch: version_2_9_X)
/loncom/interface loncreateuser.pm
Log:
- Backport part of 1.301.
--raeburn1250259661
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20090814142101.txt"
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.295.2.3 loncom/interface/loncreateuser.pm:1.295.2.4
--- loncom/interface/loncreateuser.pm:1.295.2.3 Thu Aug 13 20:20:12 2009
+++ loncom/interface/loncreateuser.pm Fri Aug 14 14:21:00 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.295.2.3 2009/08/13 20:20:12 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.295.2.4 2009/08/14 14:21:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -143,6 +143,7 @@
$custom_off = ' checked="checked" ';
my $quota_javascript = <<"END_SCRIPT";
<script type="text/javascript">
+// <![CDATA[
function quota_changes(caller) {
if (caller == "custom") {
if (document.cu.customquota[0].checked) {
@@ -153,6 +154,7 @@
document.cu.customquota[1].checked = true;
}
}
+// ]]>
</script>
END_SCRIPT
if ($quotatype eq 'custom') {
@@ -387,7 +389,9 @@
my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n".
'<script type="text/javascript">'."\n".
- &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset}).
+ '// <![CDATA['."\n".
+ &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset})."\n".
+ '// ]]>'."\n".
'</script>'."\n";
my %loaditems = (
@@ -554,6 +558,7 @@
return <<END;
<script type="text/javascript" language="Javascript">
+// <![CDATA[
function pclose() {
parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -571,7 +576,7 @@
}
$nondc_setsection_code
-
+// ]]>
</script>
END
}
@@ -590,6 +595,7 @@
my $jscript = (<<ENDSCRIPT);
<script type="text/javascript">
+// <![CDATA[
function pickuser(uname,udom) {
document.usersrchform.seluname.value=uname;
document.usersrchform.seludom.value=udom;
@@ -598,6 +604,7 @@
}
$jsback
+// ]]>
</script>
ENDSCRIPT
@@ -846,7 +853,9 @@
$response
$forminfo
<script type="text/javascript" language="Javascript">
+// <![CDATA[
$loginscript
+// ]]>
</script>
<input type='hidden' name='makeuser' value='1' />
<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
@@ -903,7 +912,7 @@
} else {
if ($authtype eq 'int') {
$varauth = '<br />'.
-&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" name="intarg" value="" />')."<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
+&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" name="intarg" value="" />')."<label><input type=\"checkbox\" name=\"visible\" onclick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
} elsif ($authtype eq 'loc') {
$varauth = '<br />'.
&mt('[_1] Local Authentication with argument [_2]','','<input type="text" name="'.$authtype.'arg" value="" />')."\n";
@@ -962,7 +971,7 @@
}
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
$r->print('<h3>'.&mt('User Can Request Creation of Courses?').'</h3>'.
- &Apache::loncommon::start_data_table()).
+ &Apache::loncommon::start_data_table());
if ($env{'request.role.domain'} eq $ccdomain) {
$r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
} else {
@@ -1045,7 +1054,7 @@
} ## End of new user/old user logic
if ($env{'form.action'} eq 'singlestudent') {
- $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onClick="setSections(this.form)" />'."\n");
+ $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onclick="setSections(this.form)" />'."\n");
} else {
$r->print('<h3>'.&mt('Add Roles').'</h3>');
my $addrolesdisplay = 0;
@@ -1058,14 +1067,14 @@
$addrolesdisplay = $add_domainroles;
}
$r->print(&course_level_dc($env{'request.role.domain'},'Course'));
- $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setCourse()" />'."\n");
+ $r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n");
} elsif ($context eq 'author') {
if ($addrolesdisplay) {
$r->print('<br /><input type="button" value="'.&mt('Save').'"');
if ($newuser) {
- $r->print(' onClick="auth_check()" \>'."\n");
+ $r->print(' onclick="auth_check()" \>'."\n");
} else {
- $r->print('onClick="this.form.submit()" \>'."\n");
+ $r->print('onclick="this.form.submit()" \>'."\n");
}
} else {
$r->print('<br /><a href="javascript:backPage(document.cu)">'.
@@ -1073,7 +1082,7 @@
}
} else {
$r->print(&course_level_table(%inccourses));
- $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setSections(this.form)" />'."\n");
+ $r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n");
}
}
$r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
@@ -1141,7 +1150,11 @@
$nondc_setsection_code,$groupslist);
my ($jsback,$elements) = &crumb_utilities();
$js .= "\n".
- '<script type="text/javascript">'."\n".$jsback."\n".'</script>';
+ '<script type="text/javascript">'."\n".
+ '// <![CDATA['."\n".
+ $jsback."\n".
+ '// ]]>'."\n".
+ '</script>'."\n";
return $js;
}
@@ -1494,7 +1507,9 @@
my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc);
$outcome = <<ENDBADAUTH;
<script type="text/javascript" language="Javascript">
+// <![CDATA[
$loginscript
+// ]]>
</script>
<span class="LC_error">$lt{'err'}:
$lt{'uuas'} ($currentauth). $lt{'sldb'}.</span>
@@ -1523,7 +1538,9 @@
);
$outcome =
'<script type="text/javascript" language="Javascript">'."\n".
+ '// <![CDATA['."\n".
$loginscript."\n".
+ '// ]]>'."\n".
'</script>'."\n".
'<h3>'.$lt{'ld'}.'</h3>'.
&Apache::loncommon::start_data_table().
@@ -1854,7 +1871,10 @@
my $newuser = 0;
my ($jsback,$elements) = &crumb_utilities();
my $jscript = '<script type="text/javascript">'."\n".
- $jsback."\n".'</script>'."\n";
+ '// <![CDATA['."\n".
+ $jsback."\n".
+ '// ]]>'."\n".
+ '</script>'."\n";
my %breadcrumb_text = &singleuser_breadcrumb();
my $args;
if ($env{'form.popup'}) {
@@ -3316,13 +3336,16 @@
my ($jsback,$elements) = &crumb_utilities();
my $button_code = "\n";
my $head_script = "\n";
- $head_script .= '<script type="text/javascript">'."\n";
+ $head_script .= '<script type="text/javascript">'."\n".
+ '// <![CDATA['."\n";
my @template_roles = ("cc","in","ta","ep","st");
foreach my $role (@template_roles) {
$head_script .= &make_script_template($role);
$button_code .= &make_button_code($role).' ';
}
- $head_script .= "\n".$jsback."\n".'</script>'."\n";
+ $head_script .= "\n".$jsback."\n".
+ '// ]]>'."\n".
+ '</script>'."\n";
$r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.form1,'pickrole','')",
@@ -3452,7 +3475,7 @@
sub make_button_code {
my ($role) = @_;
my $label = &Apache::lonnet::plaintext($role);
- my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';
+ my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />';
return ($button_code);
}
# ---------------------------------------------------------- Call to definerole
@@ -3465,7 +3488,11 @@
return;
}
my ($jsback,$elements) = &crumb_utilities();
- my $jscript = '<script type="text/javascript">'.$jsback."\n".'</script>';
+ my $jscript = '<script type="text/javascript">'.
+ '// <![CDATA['."\n".
+ $jsback."\n".
+ '// ]]>'."\n".
+ '</script>';
$r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
&Apache::lonhtmlcommon::add_breadcrumb
@@ -3837,7 +3864,11 @@
sub add_script {
my ($js) = @_;
- return '<script type="text/javascript">'."\n".$js."\n".'</script>';
+ return '<script type="text/javascript">'."\n".
+ '// <![CDATA['."\n".
+ "\n".$js."\n".
+ '// ]]>'."\n"
+ '</script>'."\n";
}
sub verify_user_display {
@@ -4171,7 +4202,9 @@
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $output = '<script type="text/javascript">'."\n".
+ '// <![CDATA['."\n".
$setsec_js."\n".$selfenroll_js."\n".
+ '// ]]>'."\n".
'</script>'."\n".
'<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";
my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
@@ -5063,6 +5096,7 @@
$r->print('</tr></table>');
$r->print(<<"ENDSCRIPT");
<script type="text/javascript">
+// <![CDATA[
function chgPage(caller) {
if (caller == 'previous') {
document.$formname.page.value --;
@@ -5073,11 +5107,14 @@
document.$formname.submit();
return;
}
+// ]]>
</script>
ENDSCRIPT
}
} else {
- $r->print(&mt('There are no records to display'));
+ $r->print('<p class="LC_info">'.
+ &mt('There are no records to display').
+ '</p>');
}
$r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
'<input type="hidden" name="action" value="changelogs" /></form>');
@@ -5089,7 +5126,7 @@
my $context = 'course';
my $nolink = 1;
my $output = '<table><tr><td valign="top">'.
- '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'.
+ '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
&Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
(&mt('all'),5,10,20,50,100,1000,10000)).
'</td><td> </td>';
@@ -5130,7 +5167,7 @@
foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {
my $selstr = '';
if ($curr->{'chgcontext'} eq $chgtype) {
- $output .= $selstr = ' selected="selected"';
+ $selstr = ' selected="selected"';
}
if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) {
next if (!&Apache::lonnet::auto_run($cnum,$cdom));
@@ -5772,7 +5809,7 @@
'<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
&Apache::loncommon::end_data_table_header_row();
my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
- '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
+ '<td><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
'<td><select name="role">'."\n";
foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role);
--raeburn1250259661--