--- loncom/interface/lonhtmlcommon.pm 2005/10/04 19:59:15 1.112 +++ loncom/interface/lonhtmlcommon.pm 2006/03/21 18:39:02 1.122 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.112 2005/10/04 19:59:15 raeburn Exp $ +# $Id: lonhtmlcommon.pm,v 1.122 2006/03/21 18:39:02 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -207,6 +207,28 @@ sub checkbox { return $Str; } + +=pod + +=item radiobutton + +=cut + +############################################## +############################################## +sub radio { + my ($name,$checked,$value) = @_; + my $Str = ' 1, + 'bgcolor' => '#88DDFF', + 'js_ready' => 1}); + my $end_page = &Apache::loncommon::end_page({'js_ready' => 1}); + #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,'"); $prog_state{'formname'}='popremain'; @@ -1246,7 +1273,7 @@ returns: nothing # # 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. +# &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. @@ -1317,7 +1344,7 @@ ENDONE } sub row_closure { - my $output .= <<"ENDTWO"; + my $output = <<"ENDTWO"; @@ -1333,16 +1360,26 @@ ENDTWO sub role_select_row { my ($roles,$col_width,$tablecolor,$title) = @_; - my $output = &row_title($col_width,$tablecolor,$title); - $output .= qq| + my $output; + if (defined($title)) { + $output = &row_title($col_width,$tablecolor,$title); + } + $output .= qq| \n|; - $output .= &row_closure(); + if (defined($title)) { + $output .= &row_closure(); + } return $output; } @@ -1354,10 +1391,10 @@ sub course_select_row { |; my $courseform=''.&Apache::loncommon::selectcourse_link - ($formname,'pickcourse','pickdomain','coursedesc').''; + ($formname,'pickcourse','pickdomain','coursedesc','',1).''; if ($totcodes > 0) { $output .= ''.&mt('All courses'); my $numtitles = @$codetitles; @@ -1376,18 +1422,18 @@ sub course_select_row { $output .= '
'.&mt('Pick courses by category:').'
'; $output .= '
'.$$codetitles[0].'
'."\n". '

'; } } - $output .= ''.&mt('Pick specific course(s):').' '.$courseform.'  selected.
'."\n"; + $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 = &row_title($col_width,$tablecolor,$title); - $output .= qq| + my $output; + if (defined($title)) { + $output = &row_title($col_width,$tablecolor,$title); + } + $output .= qq| \n|; - $output .= &row_closure(); + if (defined($title)) { + $output .= &row_closure(); + } return $output; } @@ -1437,13 +1488,13 @@ 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 .= ' + '."\n"; my $rownum = 0; - foreach my $auth (sort keys (%{$authtypes})) { + foreach my $auth (sort(keys(%{$authtypes}))) { my ($userentry,$size); my $rowiter = $rownum%2; if ($auth =~ /^krb/) { @@ -1453,11 +1504,11 @@ sub email_default_row { $userentry = 'username@'; $size = 15; } - $output .= ''; + $output .= ''; $rownum ++; } - $output .= "
'.&mt('Authentication Method').'      '.&mt('Username -> e-mail conversion').''.$descrip; + $output .= &start_pick_box(''); + $output .= '
'.&mt('Authentication Method').''.&mt('Username -> e-mail conversion').'
'.$$authtypes{$auth}.'   '.$userentry.'
'.$$authtypes{$auth}.''.$userentry.'
- \n"; + $output .= &end_pick_box(); + $output .= "
\n"; $output .= &row_closure(); return $output; } @@ -1465,7 +1516,7 @@ sub email_default_row { sub submit_row { my ($col_width,$tablecolor,$title,$cmd,$submit_text) = @_; - my $output .= &row_title($col_width,$tablecolor,$title); + my $output = &row_title($col_width,$tablecolor,$title); $output .= qq|
@@ -1476,6 +1527,218 @@ sub submit_row { 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. +# +# Inputs: +# (a) 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). +# +# (b) Optional reference to hash of stored elements to be set. +# +# If the page being displayed is a page which permits modification of +# previously stored data, e.g., the first page in a multi-page submission, +# then if stored is supplied, form elements will be set to the last stored +# values. If user supplied values are also available for the same elements +# these will replace the stored values. +# +# 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,$stored) = @_; + my %values; + my $output .= 'function setFormElements(courseForm) { +'; + if (defined($stored)) { + foreach my $name (keys(%{$stored})) { + if (exists($$elements{$name})) { + if (ref($$stored{$name}) eq 'ARRAY') { + $values{$name} = $$stored{$name}; + } else { + @{$values{$name}} = ($$stored{$name}); + } + } + } + } + + foreach my $key (keys(%env)) { + if ($key =~ /^form\.(.+)$/) { + my $name = $1; + if (exists($$elements{$name})) { + @{$values{$name}} = &Apache::loncommon::get_env_multiple($key); + } + } + } + + foreach my $name (keys(%values)) { + for (my $i=0; $i<@{$values{$name}}; $i++) { + $values{$name}[$i] = &HTML::Entities::decode($values{$name}[$i],'<>&"'); + $values{$name}[$i] =~ s/([\r\n\f]+)/\\n/g; + $values{$name}[$i] =~ s/"/\\"/g; + } + if ($$elements{$name} eq 'text') { + my $numvalues = @{$values{$name}}; + if ($numvalues > 1) { + my $valuestring = join('","',@{$values{$name}}); + $output .= qq| + var textvalues = new Array ("$valuestring"); + var total = courseForm.$name.length; + if (total > $numvalues) { + total = $numvalues; + } + for (var i=0; i