$linktext
+$linktext
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 = '{'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,476 @@ 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() 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";
+
+
+
+
+
+
+
+END
+ return $output;
+}
+
+sub end_pick_box {
+ my $output = <<"END";
+
+ |
+
+
+ |
+
+
+END
+ return $output;
+}
+
+sub row_title {
+ my ($col_width,$tablecolor,$title) = @_;
+ my $output = <<"ENDONE";
+
+ |
+
+ |
+
+
+
+ENDONE
+ return $output;
+}
+
+sub row_closure {
+ my $output = <<"ENDTWO";
+
+
+ |
+
+
+
+ 
+ |
+
+ENDTWO
+ return $output;
+}
+
+sub role_select_row {
+ my ($roles,$col_width,$tablecolor,$title) = @_;
+ my $output;
+ if (defined($title)) {
+ $output = &row_title($col_width,$tablecolor,$title);
+ }
+ $output .= qq|
+
+ | \n|;
+ if (defined($title)) {
+ $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 .= " \n";
+ $output .= qq|
+
+ |;
+ my $courseform=''.&Apache::loncommon::selectcourse_link
+ ($formname,'pickcourse','pickdomain','coursedesc','',1).'';
+ if ($totcodes > 0) {
+ $output .= ''.&mt('All courses');
+ my $numtitles = @$codetitles;
+ if ($numtitles > 0) {
+ $output .= '
'.&mt('Pick courses by category:').'
';
+ $output .= ''.$$codetitles[0].'
'."\n".
+ ' | ';
+ for (my $i=1; $i<$numtitles; $i++) {
+ $output .= ''.$$codetitles[$i].'
'."\n".
+ ''."\n".
+ ' | ';
+ }
+ $output .= '
';
+ }
+ }
+ $output .= ''.&mt('Pick specific course(s):').' '.$courseform.' selected.
| '."\n";
+ $output .= &row_closure();
+ return $output;
+}
+
+sub status_select_row {
+ my ($types,$col_width,$tablecolor,$title) = @_;
+ my $output;
+ if (defined($title)) {
+ $output = &row_title($col_width,$tablecolor,$title);
+ }
+ $output .= qq|
+
+ | \n|;
+ if (defined($title)) {
+ $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 .= ' '.$descrip;
+ $output .= &start_pick_box('');
+ $output .= ' |
+ | '.&mt('Authentication Method').' | '.&mt('Username -> e-mail conversion').' |
+
'."\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 .= '| '.$$authtypes{$auth}.' | '.$userentry.' |
';
+ $rownum ++;
+ }
+ $output .= &end_pick_box();
+ $output .= "
\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|
+
+
+
+
+
+ | \n|;
+ return $output;
+}
+
+##############################################
+##############################################
+
+# echo_form_input
+#
+# Generates html markup to add form elements from the referrer page
+# as hidden form elements (values encoded) in the new page.
+#
+# Intended to support two types of use
+# (a) to allow backing up to earlier pages in a multi-page
+# form submission process using a breadcrumb trail.
+#
+# (b) to allow the current page to be reloaded with form elements
+# set on previous page to remain unchanged. An example would
+# be where the a page containing a dynamically-built table of data is
+# is to be redisplayed, with only the sort order of the data changed.
+#
+# Inputs:
+# 1. Reference to array of form elements in the submitted form on
+# the referrer page which are to be excluded from the echoed elements.
+#
+# 2. Reference to array of regular expressions, which if matched in the
+# name of the form element n the referrer page will be omitted from echo.
+#
+# Outputs: A scalar containing the html markup for the echoed form
+# elements (all as hidden elements, with values encoded).
+
+
+sub echo_form_input {
+ my ($excluded,$regexps) = @_;
+ my $output = '';
+ foreach my $key (keys(%env)) {
+ if ($key =~ /^form\.(.+)$/) {
+ my $name = $1;
+ my $match = 0;
+ if ((!@{$excluded}) || (!grep/^$name$/,@{$excluded})) {
+ if (defined($regexps)) {
+ if (@{$regexps} > 0) {
+ foreach my $regexp (@{$regexps}) {
+ if ($name =~ /\Q$regexp\E/) {
+ $match = 1;
+ last;
+ }
+ }
+ }
+ }
+ if (!$match) {
+ if (ref($env{$key})) {
+ foreach my $value (@{$env{$key}}) {
+ $value = &HTML::Entities::encode($value,'<>&"');
+ $output .= ''."\n";
+ }
+ } else {
+ my $value = &HTML::Entities::encode($env{$key},'<>&"');
+ $output .= ''."\n";
+ }
+ }
+ }
+ }
+ }
+ return $output;
+}
+
+##############################################
+##############################################
+
+# set_form_elements
+#
+# Generates javascript to set form elements to values based on
+# corresponding values for the same form elements when the page was
+# previously submitted.
+#
+# Last submission values are read from hidden form elements in referring
+# page which have the same name, i.e., generated by &echo_form_input().
+#
+# Intended to be called by onload event.
+#
+# Input:
+# Reference to hash of echoed form elements to be set.
+#
+# In the hash, keys are the form element names, and the values are the
+# element type (selectbox, radio, checkbox or text -for textbox, textarea or
+# hidden).
+#
+# Output:
+#
+# javascript function - set_form_elements() which sets form elements,
+# expects an argument: formname - the name of the form according to
+# the DOM, e.g., document.compose
+
+sub set_form_elements {
+ my ($elements) = @_;
+ my $output .= 'function setFormElements(courseForm) {
+';
+ foreach my $key (keys(%env)) {
+ if ($key =~ /^form\.(.+)$/) {
+ my $name = $1;
+ if (exists($$elements{$name})) {
+ my @values = &Apache::loncommon::get_env_multiple($key);
+ for (my $i=0; $i<@values; $i++) {
+ $values[$i] = &HTML::Entities::decode($values[$i],'<>&"');
+ $values[$i] =~ s/([\r\n\f]+)/\\n/g;
+ $values[$i] =~ s/"/\\"/g;
+ }
+ if ($$elements{$name} eq 'text') {
+ my $numvalues = @values;
+ if ($numvalues > 1) {
+ my $valuestring = join('","',@values);
+ $output .= qq|
+ var textvalues = new Array ("$valuestring");
+ var total = courseForm.$name.length;
+ if (total > $numvalues) {
+ total = $numvalues;
+ }
+ for (var i=0; i
.')
'.
&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\n";
$result .= <