[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface loncommon.pm
raeburn
raeburn@source.lon-capa.org
Fri, 14 Aug 2009 03:48:50 -0000
raeburn Fri Aug 14 03:48:50 2009 EDT
Modified files: (Branch: version_2_9_X)
/loncom/interface loncommon.pm
Log:
- Backport 1.824.
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.692.4.3 loncom/interface/loncommon.pm:1.692.4.4
--- loncom/interface/loncommon.pm:1.692.4.3 Thu May 21 15:43:52 2009
+++ loncom/interface/loncommon.pm Fri Aug 14 03:48:49 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.692.4.3 2009/05/21 15:43:52 raeburn Exp $
+# $Id: loncommon.pm,v 1.692.4.4 2009/08/14 03:48:49 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -407,6 +407,7 @@
) { return ''; }
return (<<'ENDSTDBRW');
<script type="text/javascript" language="Javascript">
+// <![CDATA[
var stdeditbrowser;
function openstdbrowser(formname,uname,udom,roleflag,ignorefilter,courseadvonly) {
var url = '/adm/pickstudent?';
@@ -429,6 +430,7 @@
stdeditbrowser = open(url,title,options,'1');
stdeditbrowser.focus();
}
+// ]]>
</script>
ENDSTDBRW
}
@@ -461,6 +463,7 @@
sub authorbrowser_javascript {
return <<"ENDAUTHORBRW";
<script type="text/javascript">
+// <![CDATA[
var stdeditbrowser;
function openauthorbrowser(formname,udom) {
@@ -472,7 +475,7 @@
stdeditbrowser = open(url,title,options,'1');
stdeditbrowser.focus();
}
-
+// ]]>
</script>
ENDAUTHORBRW
}
@@ -482,6 +485,7 @@
my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
my $output = '
<script type="text/javascript" language="JavaScript">
+// <![CDATA[
var stdeditbrowser;'."\n";
$output .= <<"ENDSTDBRW";
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
@@ -564,6 +568,7 @@
$output .= &setsec_javascript($sec_element,$formname);
}
$output .= '
+// ]]>
</script>';
return $output;
}
@@ -825,6 +830,7 @@
# output the javascript to do the changing
my $result = '';
$result.='<script type="text/javascript" language="JavaScript">'."\n";
+ $result.="// <![CDATA[\n";
$result.="var select2data = new Object();\n";
$" = '","';
my $debug = '';
@@ -870,6 +876,7 @@
}
}
}
+// ]]>
</script>
END
# output the initial values for the selection lists
@@ -1023,7 +1030,9 @@
my $banner_link = "/adm/helpmenu?page=banner&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
my $output .= <<"ENDOUTPUT";
<script type="text/javascript">
+// <![CDATA[
banner_link = '$banner_link';
+// ]]>
</script>
ENDOUTPUT
return $output;
@@ -1395,6 +1404,7 @@
my $geometry = &viewport_geometry_js();
return <<"RESIZE";
<script type="text/javascript">
+// <![CDATA[
$geometry
function getX(element) {
@@ -1433,6 +1443,7 @@
}
textarea.style.height=new_height+'px';
}
+// ]]>
</script>
RESIZE
@@ -2300,7 +2311,7 @@
$result = &mt
('[_1] Internally authenticated (with initial password [_2])',
'<label>'.$authtype,'</label>'.$autharg);
- $result.="<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>';
+ $result.="<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>';
return $result;
}
@@ -6936,6 +6947,7 @@
my $output = <<"END_BLOCK";
<script type="text/javascript">
+// <![CDATA[
function validateEntry(callingForm) {
var checkok = 1;
@@ -7004,6 +7016,7 @@
$newuserscript
+// ]]>
</script>
$new_user_create