--- loncom/interface/lonhtmlcommon.pm 2004/11/30 08:06:38 1.100
+++ loncom/interface/lonhtmlcommon.pm 2005/10/04 19:59:15 1.112
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.100 2004/11/30 08:06:38 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.112 2005/10/04 19:59:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -55,10 +55,11 @@ html.
package Apache::lonhtmlcommon;
+use strict;
use Time::Local;
use Time::HiRes;
use Apache::lonlocal;
-use strict;
+use Apache::lonnet;
##############################################
##############################################
@@ -80,7 +81,7 @@ sub authorbombs {
foreach (keys %bombs) {
if ($_=~/^$udom\/$uname\//) {
return '<a href="/adm/bombs/'.$url.
- '"><img src="/adm/lonMisc/bomb.gif" border="0" /></a>'.
+ '"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/bomb.gif').'" border="0" /></a>'.
&Apache::loncommon::help_open_topic('About_Bombs');
}
}
@@ -99,7 +100,7 @@ sub store_recent {
my ($area,$name,$value)=@_;
my $file=&recent_filename($area);
my %recent=&Apache::lonnet::dump($file);
- if (scalar(keys(%recent))>10) {
+ if (scalar(keys(%recent))>20) {
# remove oldest value
my $oldest=time;
my $delkey='';
@@ -257,18 +258,23 @@ The method used to restrict user input w
##############################################
sub date_setter {
my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
- $no_hh_mm_ss) = @_;
+ $no_hh_mm_ss,$defhour,$defmin,$defsec) = @_;
+ my $wasdefined=1;
if (! defined($state) || $state ne 'disabled') {
$state = '';
}
if (! defined($no_hh_mm_ss)) {
$no_hh_mm_ss = 0;
}
- if (! defined($currentvalue) || $currentvalue eq 'now') {
- unless ($includeempty) {
- $currentvalue = time;
- } else {
+ if ($currentvalue eq 'now') {
+ $currentvalue=time;
+ }
+ if ((!defined($currentvalue)) || ($currentvalue eq '')) {
+ $wasdefined=0;
+ if ($includeempty) {
$currentvalue = 0;
+ } else {
+ $currentvalue = time;
}
}
# other potentially useful values: wkday,yrday,is_daylight_savings
@@ -278,6 +284,20 @@ sub date_setter {
localtime($currentvalue);
$year += 1900;
}
+ unless ($wasdefined) {
+ if (($defhour) || ($defmin) || ($defsec)) {
+ ($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) =
+ localtime(time);
+ $year += 1900;
+ $sec=($defsec?$defsec:0);
+ $min=($defmin?$defmin:0);
+ $hour=($defhour?$defhour:0);
+ } elsif (!$includeempty) {
+ $sec=0;
+ $min=0;
+ $hour=0;
+ }
+ }
my $result = "\n<!-- $dname date setting form -->\n";
$result .= <<ENDJS;
<script language="Javascript">
@@ -435,8 +455,8 @@ sub get_date_from_form {
my ($dname) = @_;
my ($sec,$min,$hour,$day,$month,$year);
#
- if (defined($ENV{'form.'.$dname.'_second'})) {
- my $tmpsec = $ENV{'form.'.$dname.'_second'};
+ if (defined($env{'form.'.$dname.'_second'})) {
+ my $tmpsec = $env{'form.'.$dname.'_second'};
if (($tmpsec =~ /^\d+$/) && ($tmpsec >= 0) && ($tmpsec < 60)) {
$sec = $tmpsec;
}
@@ -444,8 +464,8 @@ sub get_date_from_form {
} else {
$sec = 0;
}
- if (defined($ENV{'form.'.$dname.'_minute'})) {
- my $tmpmin = $ENV{'form.'.$dname.'_minute'};
+ if (defined($env{'form.'.$dname.'_minute'})) {
+ my $tmpmin = $env{'form.'.$dname.'_minute'};
if (($tmpmin =~ /^\d+$/) && ($tmpmin >= 0) && ($tmpmin < 60)) {
$min = $tmpmin;
}
@@ -453,28 +473,28 @@ sub get_date_from_form {
} else {
$min = 0;
}
- if (defined($ENV{'form.'.$dname.'_hour'})) {
- my $tmphour = $ENV{'form.'.$dname.'_hour'};
+ if (defined($env{'form.'.$dname.'_hour'})) {
+ my $tmphour = $env{'form.'.$dname.'_hour'};
if (($tmphour =~ /^\d+$/) && ($tmphour >= 0) && ($tmphour < 24)) {
$hour = $tmphour;
}
} else {
$hour = 0;
}
- if (defined($ENV{'form.'.$dname.'_day'})) {
- my $tmpday = $ENV{'form.'.$dname.'_day'};
+ if (defined($env{'form.'.$dname.'_day'})) {
+ my $tmpday = $env{'form.'.$dname.'_day'};
if (($tmpday =~ /^\d+$/) && ($tmpday > 0) && ($tmpday < 32)) {
$day = $tmpday;
}
}
- if (defined($ENV{'form.'.$dname.'_month'})) {
- my $tmpmonth = $ENV{'form.'.$dname.'_month'};
+ if (defined($env{'form.'.$dname.'_month'})) {
+ my $tmpmonth = $env{'form.'.$dname.'_month'};
if (($tmpmonth =~ /^\d+$/) && ($tmpmonth > 0) && ($tmpmonth < 13)) {
$month = $tmpmonth - 1;
}
}
- if (defined($ENV{'form.'.$dname.'_year'})) {
- my $tmpyear = $ENV{'form.'.$dname.'_year'};
+ if (defined($env{'form.'.$dname.'_year'})) {
+ my $tmpyear = $env{'form.'.$dname.'_year'};
if (($tmpyear =~ /^\d+$/) && ($tmpyear > 1900)) {
$year = $tmpyear - 1900;
}
@@ -505,11 +525,13 @@ parameter setting wizard.
##############################################
sub pjump_javascript_definition {
my $Str = <<END;
- function pjump(type,dis,value,marker,ret,call) {
+ function pjump(type,dis,value,marker,ret,call,hour,min,sec) {
parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
+"&value="+escape(value)+"&marker="+escape(marker)
+"&return="+escape(ret)
- +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms",
+ +"&call="+escape(call)+"&name="+escape(dis)
+ +"&defhour="+escape(hour)+"&defmin="+escape(min)
+ +"&defsec="+escape(sec),"LONCAPAparms",
"height=350,width=350,scrollbars=no,menubar=no");
}
END
@@ -536,8 +558,8 @@ sub javascript_nothing {
my $nothing = "''";
my $user_browser;
my $user_os;
- $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
- $user_os = $ENV{'browser.os'} if (exists($ENV{'browser.os'}));
+ $user_browser = $env{'browser.type'} if (exists($env{'browser.type'}));
+ $user_os = $env{'browser.os'} if (exists($env{'browser.os'}));
if (! defined($user_browser) || ! defined($user_os)) {
(undef,$user_browser,undef,undef,undef,$user_os) =
&Apache::loncommon::decode_user_agent();
@@ -555,8 +577,8 @@ sub javascript_docopen {
my $nothing = "''";
my $user_browser;
my $user_os;
- $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
- $user_os = $ENV{'browser.os'} if (exists($ENV{'browser.os'}));
+ $user_browser = $env{'browser.type'} if (exists($env{'browser.type'}));
+ $user_os = $env{'browser.os'} if (exists($env{'browser.os'}));
if (! defined($user_browser) || ! defined($user_os)) {
(undef,$user_browser,undef,undef,undef,$user_os) =
&Apache::loncommon::decode_user_agent();
@@ -583,7 +605,7 @@ enrollment status of students. The sele
Inputs:
$status: the currently selected status. If undefined the value of
-$ENV{'form.Status'} is taken. If that is undefined, a value of 'Active'
+$env{'form.Status'} is taken. If that is undefined, a value of 'Active'
is used.
$formname: The name of the form. If defined the onchange attribute of
@@ -605,7 +627,7 @@ sub StatusOptions {
$size = 1 if (!defined($size));
if (! defined($status)) {
$status = 'Active';
- $status = $ENV{'form.Status'} if (exists($ENV{'form.Status'}));
+ $status = $env{'form.Status'} if (exists($env{'form.Status'}));
}
my $OpSel1 = '';
@@ -759,13 +781,14 @@ sub Create_PrgWin {
$prog_state{'type'}=$type;
if ($type eq 'popup') {
$prog_state{'window'}='popwin';
+ my $html=&Apache::lonxml::xmlbegin();
#the whole function called through timeout is due to issues
#in mozilla Read BUG #2665 if you want to know the whole story
&r_print($r,'<script>'.
"var popwin;
function openpopwin () {
popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
- "popwin.document.writeln(\'<html><head><title>$title</title></head>".
+ "popwin.document.writeln(\'".$html."<head><title>$title</title></head>".
"<body bgcolor=\"#88DDFF\">".
"<h4>$heading</h4>".
"<form name=popremain>".
@@ -854,8 +877,8 @@ sub Increment_PrgWin {
$lasttime = '('.$lasttime.' '.&mt('seconds for').' '.$extraInfo.')';
}
#
- my $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
- my $user_os = $ENV{'browser.os'} if (exists($ENV{'browser.os'}));
+ my $user_browser = $env{'browser.type'} if (exists($env{'browser.type'}));
+ my $user_os = $env{'browser.os'} if (exists($env{'browser.os'}));
if (! defined($user_browser) || ! defined($user_os)) {
(undef,$user_browser,undef,undef,undef,$user_os) =
&Apache::loncommon::decode_user_agent();
@@ -906,7 +929,7 @@ sub crumbs {
my $output='';
unless ($noformat) { $output.='<br /><tt><b>'; }
$output.='<font size="'.$size.'">'.$prefix.'/';
- if ($ENV{'user.adv'}) {
+ if ($env{'user.adv'}) {
my $path=$prefix.'/';
foreach my $dir (split('/',$uri)) {
if (! $dir) { next; }
@@ -929,7 +952,8 @@ sub crumbs {
# --------------------- A function that generates a window for the spellchecker
sub spellheader {
- my $nothing = &javascript_nothing();
+ my $html=&Apache::lonxml::xmlbegin();
+ my $nothing=&javascript_nothing();
return (<<ENDCHECK);
<script type="text/javascript">
//<!-- BEGIN LON-CAPA Internal
@@ -937,7 +961,7 @@ var checkwin;
function spellcheckerwindow() {
checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
- checkwin.document.writeln('<html><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
+ checkwin.document.writeln('$html<head></head><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
checkwin.document.close();
}
// END LON-CAPA Internal -->
@@ -951,7 +975,7 @@ sub spelllink {
my ($form,$field)=@_;
my $linktext=&mt('Check Spelling');
return (<<ENDLINK);
-<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { document.$form.onsubmit();};spellcheckerwindow();checkwin.document.forms.spellcheckform.text.value=this.document.forms.$form.$field.value;checkwin.document.forms.spellcheckform.submit();">$linktext</a>
+<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { if (document.$form.onsubmit!=null) { document.$form.onsubmit();}};spellcheckerwindow();checkwin.document.forms.spellcheckform.text.value=this.document.forms.$form.$field.value;checkwin.document.forms.spellcheckform.submit();">$linktext</a>
ENDLINK
}
@@ -1034,7 +1058,7 @@ sub htmlareaselectactive {
# --------------------------------------------------------------------- Blocked
sub htmlareablocked {
- unless ($ENV{'environment.wysiwygeditor'} eq 'on') { return 1; }
+ unless ($env{'environment.wysiwygeditor'} eq 'on') { return 1; }
return 0;
}
@@ -1109,6 +1133,7 @@ returns: nothing
# Make the faq and bug data cascade
my $faq = '';
my $bug = '';
+ my $help='';
# The last breadcrumb does not have a link, so handle it separately.
my $last = pop(@Crumbs);
#
@@ -1116,10 +1141,10 @@ returns: nothing
if (!defined($menulink)) { $menulink=1; }
if ($menulink) {
my $description = 'Menu';
- if (exists($ENV{'request.course.id'}) &&
- $ENV{'request.course.id'} ne '') {
+ if (exists($env{'request.course.id'}) &&
+ $env{'request.course.id'} ne '') {
$description =
- $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ $env{'course.'.$env{'request.course.id'}.'.description'};
}
unshift(@Crumbs,{
href =>'/adm/menu',
@@ -1133,6 +1158,7 @@ returns: nothing
map {
$faq = $_->{'faq'} if (exists($_->{'faq'}));
$bug = $_->{'bug'} if (exists($_->{'bug'}));
+ $help = $_->{'help'} if (exists($_->{'help'}));
my $result = '<a href="'.$_->{'href'}.'" ';
if (defined($_->{'target'}) && $_->{'target'} ne '') {
$result .= 'target="'.$_->{'target'}.'" ';
@@ -1148,6 +1174,8 @@ returns: nothing
my $icons = '';
$faq = $last->{'faq'} if (exists($last->{'faq'}));
$bug = $last->{'bug'} if (exists($last->{'bug'}));
+ $help = $last->{'help'} if (exists($last->{'help'}));
+ $component_help=($component_help?$component_help:$help);
# if ($faq ne '') {
# $icons .= &Apache::loncommon::help_open_faq($faq);
# }
@@ -1189,6 +1217,264 @@ returns: nothing
############################################################
############################################################
+# Nested table routines.
+#
+# Routines to display form items in a multi-row table with 2 columns.
+# Uses nested tables to divide form elements into segments.
+# For examples of use see loncom/interface/lonnotify.pm
+#
+# Can be used in following order: ...
+# &start_pick_box()
+# row1
+# row2
+# row3 ... etc.
+# &submit_row(0
+# &end_pickbox()
+#
+# where row1, row 2 etc. are chosen from &role_select_row,&course_select_row,
+# &status_select_row and &email_default_row
+#
+# Can also be used in following order:
+#
+# &start_pick_box()
+# &row_title()
+# &row_closure()
+# &row_title()
+# &row_closure() ... etc.
+# &submit_row()
+# &end_pick_box()
+#
+# In general a &submit_row() call should proceed the call to &end_pick_box(),
+# as this routine adds a button for form submission.
+# &submit_row(0 does not require a &row_closure after it.
+#
+# &start_pick_box() creates a bounding table with 1-pixel wide black border.
+# rows should be placed between calls to &start_pick_box() and &end_pick_box.
+#
+# &row_title() adds a title in the left column for each segment.
+# &row_closure() closes a row with a 1-pixel wide black line.
+#
+# &role_select_row() provides a select box from which to choose 1 or more roles
+# &course_select_row provides ways of picking groups of courses
+# radio buttons: all, by category or by picking from a course picker pop-up
+# note: by category option is only displayed if a domain has implemented
+# selection by year, semester, department, number etc.
+#
+# &status_select_row() provides a select box from which to choose 1 or more
+# access types (current access, prior access, and future access)
+#
+# &email_default_row() provides text boxes for default e-mail suffixes for
+# different authentication types in a domain.
+#
+# &row_title() and &row_closure() are called internally by the &*_select_row
+# routines, but can also be called directly to start and end rows which have
+# needs that are not accommodated by the *_select_row() routines.
+
+sub start_pick_box {
+ my ($table_width) = @_;
+ my $output = <<"END";
+ <table width="$table_width" border="0" cellpadding="0" cellspacing="1" bgcolor="#000000">
+ <tr>
+ <td>
+ <table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#ffffff">
+ <tr>
+ <td>
+ <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">
+END
+ return $output;
+}
+
+sub end_pick_box {
+ my $output = <<"END";
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+END
+ return $output;
+}
+
+sub row_title {
+ my ($col_width,$tablecolor,$title) = @_;
+ my $output = <<"ENDONE";
+ <tr>
+ <td width="$col_width" bgcolor="$tablecolor">
+ <table width="$col_width" border="0" cellpadding="8" cellspacing="0">
+ <tr>
+ <td align="right"><b>$title:</b>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td width="100%" valign="top">
+ <table width="100%" border="0" cellpadding="8" cellspacing="0">
+ <tr>
+ENDONE
+ return $output;
+}
+
+sub row_closure {
+ my $output .= <<"ENDTWO";
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td width="100%" colspan="2" bgcolor="#000000">
+ <img src="/adm/lonMisc/blackdot.gif" /><br />
+ </td>
+ </tr>
+ENDTWO
+ return $output;
+}
+
+sub role_select_row {
+ my ($roles,$col_width,$tablecolor,$title) = @_;
+ my $output = &row_title($col_width,$tablecolor,$title);
+ $output .= qq| <td>
+ <select name="roles" multiple >\n|;
+ foreach (@$roles) {
+ my $plrole=&Apache::lonnet::plaintext($_);
+ $output .= ' <option value="'.$_.'">'.$plrole.'</option>';
+ }
+ $output .= qq| </select>
+ </td>\n|;
+ $output .= &row_closure();
+ return $output;
+}
+
+sub course_select_row {
+ my ($col_width,$tablecolor,$title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_;
+ my $output = &row_title($col_width,$tablecolor,$title);
+ $output .= " <td>\n";
+ $output .= qq|
+<script type="text/javascript" language="Javascript" >
+ function coursePick (formname) {
+ for (var i=0; i<formname.coursepick.length; i++) {
+ if (!formname.coursepick[i].checked) {
+ if (formname.coursepick[i].value == 'category') {
+ courseSet('');
+ }
+ if (formname.coursepick[i].value == 'specific') {
+ formname.coursetotal.value = 0;
+ formname.courselist = '';
+ }
+ }
+ }
+ }
+</script>
+ |;
+ my $courseform='<b>'.&Apache::loncommon::selectcourse_link
+ ($formname,'pickcourse','pickdomain','coursedesc').'</b>';
+ if ($totcodes > 0) {
+ $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses');
+ my $numtitles = @$codetitles;
+ if ($numtitles > 0) {
+ $output .= '<br /><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />';
+ $output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".
+ '<select name="'.$$codetitles[0].
+ '" onChange="courseSet('."'$$codetitles[0]'".')">'."\n".
+ ' <option value="-1" />Select'."\n";
+ my @items = ();
+ my @longitems = ();
+ if ($$idlist{$$codetitles[0]} =~ /","/) {
+ @items = split/","/,$$idlist{$$codetitles[0]};
+ } else {
+ $items[0] = $$idlist{$$codetitles[0]};
+ }
+ if (defined($$idlist_titles{$$codetitles[0]})) {
+ if ($$idlist_titles{$$codetitles[0]} =~ /","/) {
+ @longitems = split/","/,$$idlist_titles{$$codetitles[0]};
+ } else {
+ $longitems[0] = $$idlist_titles{$$codetitles[0]};
+ }
+ for (my $i=0; $i<@longitems; $i++) {
+ if ($longitems[$i] eq '') {
+ $longitems[$i] = $items[$i];
+ }
+ }
+ } else {
+ @longitems = @items;
+ }
+ for (my $i=0; $i<@items; $i++) {
+ $output .= ' <option value="'.$items[$i].'">'.$longitems[$i].'</option>';
+ }
+ $output .= '</select></td>';
+ for (my $i=1; $i<$numtitles; $i++) {
+ $output .= '<td>'.$$codetitles[$i].'<br />'."\n".
+ '<select name="'.$$codetitles[$i].
+ '" onChange="courseSet('."'$$codetitles[$i]'".')">'."\n".
+ '<option value="-1"><-Pick '.$$codetitles[$i-1].'</option>'."\n".
+ '</select>'."\n".
+ '</td>';
+ }
+ $output .= '</tr></table><br />';
+ }
+ }
+ $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".'rolefilter'."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."',''".')" />'.&mt('Pick specific course(s):').' '.$courseform.' <input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br /></td>'."\n";
+ $output .= &row_closure();
+ return $output;
+}
+
+sub status_select_row {
+ my ($types,$col_width,$tablecolor,$title) = @_;
+ my $output = &row_title($col_width,$tablecolor,$title);
+ $output .= qq| <td>
+ <select name="types" multiple>\n|;
+ foreach my $status_type (sort keys (%{$types})) {
+ $output .= ' <option value="'.$status_type.'">'.$$types{$status_type}.'</option>';
+ }
+ $output .= qq| </select>
+ </td>\n|;
+ $output .= &row_closure();
+ return $output;
+}
+
+sub email_default_row {
+ my ($authtypes,$col_width,$tablecolor,$title,$descrip) = @_;
+ my $output = &row_title($col_width,$tablecolor,$title);
+ my @rowcols = ('#eeeeee','#dddddd');
+ $output .= ' <td>'.$descrip.'
+ <table>
+ <tr>
+ <td><b>'.&mt('Authentication Method').'</b></td><td> </td><td> </td><td><b>'.&mt('Username -> e-mail conversion').'</b></td>
+ </tr>'."\n";
+ my $rownum = 0;
+ foreach my $auth (sort keys (%{$authtypes})) {
+ my ($userentry,$size);
+ my $rowiter = $rownum%2;
+ if ($auth =~ /^krb/) {
+ $userentry = '';
+ $size = 25;
+ } else {
+ $userentry = 'username@';
+ $size = 15;
+ }
+ $output .= '<tr rowcolor="'.$rowcols[$rowiter].'"><td> '.$$authtypes{$auth}.'</td><td> </td><td align="right">'.$userentry.'</td><td><input type="text" name="'.$auth.'" size="'.$size.'" /></td></tr>';
+ $rownum ++;
+ }
+ $output .= " </table>
+ </td>\n";
+ $output .= &row_closure();
+ return $output;
+}
+
+
+sub submit_row {
+ my ($col_width,$tablecolor,$title,$cmd,$submit_text) = @_;
+ my $output .= &row_title($col_width,$tablecolor,$title);
+ $output .= qq|
+ <td width="100%" valign="top" align="right">
+ <br />
+ <input type="hidden" name="command" value="$cmd" />
+ <input type="submit" value="$submit_text"/>
+ <br /><br />
+ </td>\n|;
+ return $output;
+}
1;