loncom/interface/lonhelper.pm - diff

Return to lonhelper.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhelper.pm between versions 1.44 and 1.199

-version 1.44, 2003/09/02 20:58:31
+version 1.199, 2018/01/14 22:02:06
  Line 25
  #
  # http://www.lon-capa.org/
  #
- # (Page Handler
- #
- # (.helper handler
- #
  =pod
- Line 68  messages, resource selections, or date q
+ Line 64  messages, resource selections, or date q
  The helper tag is required to have one attribute, "title", which is the name
  of the helper itself, such as "Parameter helper". The helper tag may optionally
- have a "requiredpriv" attribute, specifying the priviledge a user must have
+ have a "requiredpriv" attribute, specifying the privilege a user must have
  to use the helper, or get denied access. See loncom/auth/rolesplain.tab for
- useful privs. Default is full access, which is often wrong!
+ useful privs. You may add the modifier &S at the end of the three letter priv
+ if you want to grant access to users for whom the corresponding privilege is
+ section-specific. The default is full access, which is often wrong!
  =head2 State tags
- Line 85  State tags are also required to have an
+ Line 83  State tags are also required to have an
  human name of the state, and will be displayed as the header on top of
  the screen for the user.
+ State tags may also optionally have an attribute "help" which should be
+ the filename of a help file, this will add a blue ? to the title.
  =head2 Example Helper Skeleton
  An example of the tags so far:
   <helper title="Example Helper">
     <state name="START" title="Demonstrating the Example Helper">
-      <!-- notice this is the START state the wizard requires -->
+      <!-- notice this is the START state the helper requires -->
       </state>
     <state name="GET_NAME" title="Enter Student Name">
       </state>
     </helper>
- Of course this does nothing. In order for the wizard to do something, it is
+ Of course this does nothing. In order for the helper to do something, it is
- necessary to put actual elements into the wizard. Documentation for each
+ necessary to put actual elements into the helper. Documentation for each
  of these elements follows.
  =head1 Creating a Helper With Code, Not XML
- In some situations, such as the printing wizard (see lonprintout.pm),
+ In some situations, such as the printing helper (see lonprintout.pm),
  writing the helper in XML would be too complicated, because of scope
  issues or the fact that the code actually outweighs the XML. It is
  possible to create a helper via code, though it is a little odd.
- Line 172  before parsing XML fragments and B<Apach
+ Line 173  before parsing XML fragments and B<Apach
  when you are done. See lonprintout.pm for examples of this usage in the
  printHelper subroutine.
+ =head2 Localization
+ The helper framework tries to handle as much localization as
+ possible. The text is always run through
+ Apache::lonlocal::normalize_string, so be sure to run the keys through
+ that function for maximum usefulness and robustness.
  =cut
  package Apache::lonhelper;
  use Apache::Constants qw(:common);
  use Apache::File;
  use Apache::lonxml;
+ use Apache::lonlocal;
+ use Apache::lonnet;
+ use Apache::longroup;
+ use Apache::lonselstudent;
+ use LONCAPA;
  # Register all the tags with the helper, so the helper can
  # push and pop them
- Line 222  my $paramHash;
+ Line 237  my $paramHash;
  # In the debugger, this means that breakpoints are ignored until you step into
  # a function and get out of what must be a "faked up scope" in the Apache->
  # mod_perl connection. In this code, it was manifesting itself in the existence
- # of two seperate file-scoped $helper variables, one set to the value of the
+ # of two separate file-scoped $helper variables, one set to the value of the
  # helper in the helper constructor, and one referenced by the handler on the
  # "$helper->process()" line. Using the debugger, one could actually
  # see the two different $helper variables, as hashes at completely
- Line 247  sub real_handler {
+ Line 262  sub real_handler {
      my $r = shift;
      my $uri = shift;
      if (!defined($uri)) { $uri = $r->uri(); }
-     $ENV{'request.uri'} = $uri;
+     $env{'request.uri'} = $uri;
-     my $filename = '/home/httpd/html' . $uri;
+     my $filename = $r->dir_config('lonDocRoot').$uri;
      my $fh = Apache::File->new($filename);
      my $file;
      read $fh, $file, 100000000;
      # Send header, don't cache this page
-     if ($r->header_only) {
+     if ($env{'browser.mathml'}) {
-         if ($ENV{'browser.mathml'}) {
+ 	&Apache::loncommon::content_type($r,'text/xml');
-             $r->content_type('text/xml');
-         } else {
-             $r->content_type('text/html');
-         }
-         $r->send_http_header;
-         return OK;
-     }
-     if ($ENV{'browser.mathml'}) {
-         $r->content_type('text/xml');
      } else {
-         $r->content_type('text/html');
+ 	&Apache::loncommon::content_type($r,'text/html');
      }
      $r->send_http_header;
+     return OK if $r->header_only;
      $r->rflush();
      # Discard result, we just want the objects that get created by the
- Line 278  sub real_handler {
+ Line 285  sub real_handler {
      my $allowed = $helper->allowedCheck();
      if (!$allowed) {
-         $ENV{'user.error.msg'} = $ENV{'request.uri'}.':'.$helper->{REQUIRED_PRIV}.
+         my ($priv,$modifier) = split(/\&/,$helper->{REQUIRED_PRIV});
+         $env{'user.error.msg'} = $env{'request.uri'}.':'.$priv.
              ":0:0:Permission denied to access this helper.";
          return HTTP_NOT_ACCEPTABLE;
      }
- Line 334  sub start_state {
+ Line 342  sub start_state {
      }
      Apache::lonhelper::state->new($token->[2]{'name'},
-                                   $token->[2]{'title'});
+                                   $token->[2]{'title'},
+ 				  $token->[2]{'help'});
      return '';
  }
- Line 359  sub end_state {
+ Line 368  sub end_state {
  package Apache::lonhelper::helper;
  use Digest::MD5 qw(md5_hex);
- use HTML::Entities;
+ use HTML::Entities();
  use Apache::loncommon;
  use Apache::File;
+ use Apache::lonlocal;
+ use Apache::lonnet;
+ use LONCAPA;
  sub new {
      my $proto = shift;
- Line 373  sub new {
+ Line 385  sub new {
      # If there is a state from the previous form, use that. If there is no
      # state, use the start state parameter.
-     if (defined $ENV{"form.CURRENT_STATE"})
+     if (defined $env{"form.CURRENT_STATE"})
      {
- 	$self->{STATE} = $ENV{"form.CURRENT_STATE"};
+ 	$self->{STATE} = $env{"form.CURRENT_STATE"};
      }
      else
      {
  	$self->{STATE} = "START";
      }
-     $self->{TOKEN} = $ENV{'form.TOKEN'};
+     $self->{TOKEN} = $env{'form.TOKEN'};
      # If a token was passed, we load that in. Otherwise, we need to create a
      # new storage file
      # Tried to use standard Tie'd hashes, but you can't seem to take a
- Line 415  sub new {
+ Line 427  sub new {
              return undef;
          }
          # Must create the storage
-         $self->{TOKEN} = md5_hex($ENV{'user.name'} . $ENV{'user.domain'} .
+         $self->{TOKEN} = md5_hex($env{'user.name'} . $env{'user.domain'} .
                                   time() . rand());
          $self->{FILENAME} = $Apache::lonnet::tmpdir . md5_hex($self->{TOKEN});
      }
      # OK, we now have our persistent storage.
-     if (defined $ENV{"form.RETURN_PAGE"})
+     if (defined $env{"form.RETURN_PAGE"})
      {
- 	$self->{RETURN_PAGE} = $ENV{"form.RETURN_PAGE"};
+ 	$self->{RETURN_PAGE} = $env{"form.RETURN_PAGE"};
      }
      else
      {
- Line 453  sub _saveVars {
+ Line 465  sub _saveVars {
      my $self = shift;
      my $result = "";
      $result .= '<input type="hidden" name="CURRENT_STATE" value="' .
-         HTML::Entities::encode($self->{STATE}) . "\" />\n";
+         HTML::Entities::encode($self->{STATE},'<>&"') . "\" />\n";
      $result .= '<input type="hidden" name="TOKEN" value="' .
          $self->{TOKEN} . "\" />\n";
      $result .= '<input type="hidden" name="RETURN_PAGE" value="' .
-         HTML::Entities::encode($self->{RETURN_PAGE}) . "\" />\n";
+         HTML::Entities::encode($self->{RETURN_PAGE},'<>&"') . "\" />\n";
      return $result;
  }
- Line 467  sub _saveVars {
+ Line 479  sub _saveVars {
  sub _varsInFile {
      my $self = shift;
      my @vars = ();
-     for my $key (keys %{$self->{VARS}}) {
+     for my $key (keys(%{$self->{VARS}})) {
-         push @vars, &Apache::lonnet::escape($key) . '=' .
+         push(@vars, &escape($key) . '=' . &escape($self->{VARS}->{$key}));
-             &Apache::lonnet::escape($self->{VARS}->{$key});
      }
      return join ('&', @vars);
  }
- Line 484  sub declareVar {
+ Line 495  sub declareVar {
          $self->{VARS}->{$var} = '';
      }
-     my $envname = 'form.' . $var . '.forminput';
+     my $envname = 'form.' . $var . '_forminput';
-     if (defined($ENV{$envname})) {
+     if (defined($env{$envname})) {
-         if (ref($ENV{$envname})) {
+         if (ref($env{$envname})) {
-             $self->{VARS}->{$var} = join('|||', @{$ENV{$envname}});
+             $self->{VARS}->{$var} = join('|||', @{$env{$envname}});
          } else {
-             $self->{VARS}->{$var} = $ENV{$envname};
+             $self->{VARS}->{$var} = $env{$envname};
          }
      }
  }
- Line 500  sub allowedCheck {
+ Line 511  sub allowedCheck {
      if (!defined($self->{REQUIRED_PRIV})) {
          return 1;
      }
+     my ($priv,$modifier) = split(/\&/,$self->{REQUIRED_PRIV});
-     return Apache::lonnet::allowed($self->{REQUIRED_PRIV}, $ENV{'request.course.id'});
+     my $allowed = &Apache::lonnet::allowed($priv,$env{'request.course.id'});
+     if ((!$allowed) && ($modifier eq 'S') && ($env{'request.course.sec'} ne '')) {
+         $allowed = &Apache::lonnet::allowed($priv,$env{'request.course.id'}.'/'.
+                                                   $env{'request.course.sec'});
+     }
+     return $allowed;
  }
  sub changeState {
- Line 523  sub process {
+ Line 539  sub process {
      # Phase 1: Post processing for state of previous screen (which is actually
      # the "current state" in terms of the helper variables), if it wasn't the
      # beginning state.
-     if ($self->{STATE} ne "START" || $ENV{"form.SUBMIT"} eq "Next ->") {
+     if ($self->{STATE} ne "START" || $env{"form.SUBMIT"} eq &mt("Next")) {
  	my $prevState = $self->{STATES}{$self->{STATE}};
          $prevState->postprocess();
      }
- Line 563  sub process {
+ Line 579  sub process {
  # 4: Render the current state to the screen as an HTML page.
  sub display {
      my $self = shift;
+     my $footer = shift;
      my $state = $self->{STATES}{$self->{STATE}};
      my $result = "";
- Line 574  sub display {
+ Line 590  sub display {
      }
      # Phase 4: Display.
-     my $stateTitle = $state->title();
+     my $stateTitle=&mt($state->title());
-     my $bodytag = &Apache::loncommon::bodytag("$self->{TITLE}",'','');
+     my $stateHelp=     $state->help();
+     my $browser_searcher_js =
-     $result .= <<HEADER;
+ 	'<script type="text/javascript">'."\n".
- <html>
+ 	&Apache::loncommon::browser_and_searcher_javascript().
-     <head>
+ 	"\n".'</script>';
-         <title>LON-CAPA Helper: $self->{TITLE}</title>
-     </head>
+     # Breadcrumbs
-     $bodytag
+     my $brcrum = [{'href' => '',
- HEADER
+                    'text' => 'Helper'}];
-     if (!$state->overrideForm()) { $result.="<form name='helpform' method='POST'>"; }
+     # FIXME: Dynamically add context sensitive breadcrumbs
-     $result .= <<HEADER;
+     #        depending on the caller,
-         <table border="0" width='100%'><tr><td>
+     #        e.g. printing, parametrization, etc.
-         <h2><i>$stateTitle</i></h2>
+     # FIXME: Add breadcrumbs to reflect current helper state
- HEADER
+     $result .= &Apache::loncommon::start_page($self->{TITLE},
-     $result .= "<table cellpadding='10' width='100%'><tr><td rowspan='2' valign='top'>";
+                                               $browser_searcher_js,
+                                               {'bread_crumbs' => $brcrum,});
-     if (!$state->overrideForm()) {
-         $result .= $self->_saveVars();
+     my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
+     my $next = HTML::Entities::encode(&mt("Next"), '<>&"');
+     # FIXME: This should be parameterized, not concatenated - Jeremy
+     if (!$state->overrideForm()) { $result.='<form name="helpform" method="post" action="">'; }
+     if ($stateHelp) {
+         $stateHelp = &Apache::loncommon::help_open_topic($stateHelp);
      }
-     $result .= $state->render();
-     $result .= "</td><td valign='top' align='right'>";
+     # Prepare buttons
+     my $buttons;
-     # Warning: Copy and pasted from below, because it's too much trouble to
-     # turn this into a subroutine
      if (!$state->overrideForm()) {
          if ($self->{STATE} ne $self->{START_STATE}) {
              #$result .= '<input name="SUBMIT" type="submit" value="&lt;- Previous" />&nbsp;&nbsp;';
          }
+         $buttons = '<p>'; # '<fieldset>';
          if ($self->{DONE}) {
              my $returnPage = $self->{RETURN_PAGE};
-             $result .= "<a href=\"$returnPage\">End Helper</a>";
+             $buttons .= '<a href="'.$returnPage.'">'.&mt('End Helper').'</a>';
          }
          else {
-             $result .= '<nobr><input name="back" type="button" ';
+             $buttons .= '<span class="LC_nobreak">'
-             $result .= 'value="&lt;- Previous" onclick="history.go(-1)" /> ';
+                        .'<input name="back" type="button" '
-             $result .= '<input name="SUBMIT" type="submit" value="Next -&gt;" /></nobr>';
+                        .'value="'.$previous.'" onclick="history.go(-1)" /> '
+                        .'<input name="SUBMIT" type="submit" value="'.$next.'" />'
+                        .'</span>';
          }
+     $buttons .= '</p>'; # '</fieldset>';
      }
-     $result .= "</td></tr><tr><td valign='bottom' align='right'>";
-     # Warning: Copy and pasted from above, because it's too much trouble to
-     # turn this into a subroutine
+     $result .= '<h2>'.$stateTitle.$stateHelp.'</h2>';
+ #   $result .= '<div>';
+     # Top buttons
+     $result .= $buttons;
+     # Main content of current helper screen
      if (!$state->overrideForm()) {
-         if ($self->{STATE} ne $self->{START_STATE}) {
+         $result .= $self->_saveVars();
-             #$result .= '<input name="SUBMIT" type="submit" value="&lt;- Previous" />&nbsp;&nbsp;';
-         }
-         if ($self->{DONE}) {
-             my $returnPage = $self->{RETURN_PAGE};
-             $result .= "<a href=\"$returnPage\">End Helper</a>";
-         }
-         else {
-             $result .= '<nobr><input name="back" type="button" ';
-             $result .= 'value="&lt;- Previous" onclick="history.go(-1)" /> ';
-             $result .= '<input name="SUBMIT" type="submit" value="Next -&gt;" /></nobr>';
-         }
      }
+     $result .= $state->render();
+     # Bottom buttons
+     $result .= $buttons;
-     #foreach my $key (keys %{$self->{VARS}}) {
+     #foreach my $key (keys(%{$self->{VARS}})) {
      #    $result .= "|$key| -> " . $self->{VARS}->{$key} . "<br />";
      #}
-     $result .= "</td></tr></table>";
+ #   $result .= '</div>';
      $result .= <<FOOTER;
-               </td>
-             </tr>
-           </table>
          </form>
-     </body>
- </html>
  FOOTER
+     $result .= $footer.&Apache::loncommon::end_page();
      # Handle writing out the vars to the file
      my $file = Apache::File->new('>'.$self->{FILENAME});
      print $file $self->_varsInFile();
- Line 675  sub new {
+ Line 695  sub new {
      $self->{NAME} = shift;
      $self->{TITLE} = shift;
+     $self->{HELP} = shift;
      $self->{ELEMENTS} = [];
      bless($self, $class);
- Line 696  sub title {
+ Line 717  sub title {
      return $self->{TITLE};
  }
+ sub help {
+     my $self = shift;
+     return $self->{HELP};
+ }
  sub preprocess {
      my $self = shift;
      for my $element (@{$self->{ELEMENTS}}) {
- Line 787  the element. How this value is interpret
+ Line 813  the element. How this value is interpret
  the element itself, and possibly the settings the element has (such as
  multichoice vs. single choice for <choices> tags).
- This is also intended for things like the course initialization wizard, where the
+ This is also intended for things like the course initialization helper, where the
  user is setting various parameters. By correctly grabbing current settings
  and including them into the helper, it allows the user to come back to the
  helper later and re-execute it, without needing to worry about overwriting
- Line 883  sub start_defaultvalue {
+ Line 909  sub start_defaultvalue {
  sub end_defaultvalue { return ''; }
+ # Validators may need to take language specifications
  sub start_validator {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- Line 926  package Apache::lonhelper::message;
+ Line 953  package Apache::lonhelper::message;
  =pod
- =head1 Element: messageX<message, helper element>
+ =head1 Elements
+ =head2 Element: messageX<message, helper element>
  Message elements display their contents, and
  transition directly to the state in the <nextstate> attribute. Example:
- Line 950  within each other.)
+ Line 979  within each other.)
  This is also a good template for creating your own new states, as it has
  very little code beyond the state template.
+ =head3 Localization
+ The contents of the message tag will be run through the
+ normalize_string function and that will be used as a call to &mt.
  =cut
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::message',
- Line 974  sub start_message {
+ Line 1009  sub start_message {
          return '';
      }
-     $paramHash->{MESSAGE_TEXT} = &Apache::lonxml::get_all_text('/message',
+     $paramHash->{MESSAGE_TEXT} = &mtn(&Apache::lonxml::get_all_text('/message',
-                                                                $parser);
+                                                                $parser));
      if (defined($token->[2]{'nextstate'})) {
          $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
      }
+     if (defined($token->[2]{'type'})) {
+         $paramHash->{TYPE} = $token->[2]{'type'};
+     }
      return '';
  }
- Line 995  sub end_message {
+ Line 1033  sub end_message {
  sub render {
      my $self = shift;
+     if ($self->{TYPE} =~ /^\s*warning\s*$/i) {
+ 	 $self->{MESSAGE_TEXT} =
+ 	     '<span class="LC_warning">'. $self->{MESSAGE_TEXT}.'</span>';
+     }
+     if ($self->{TYPE} =~ /^\s*error\s*$/i) {
+ 	 $self->{MESSAGE_TEXT} =
+ 	     '<span class="LC_error">'. $self->{MESSAGE_TEXT}.'</span>';
+     }
      return $self->{MESSAGE_TEXT};
  }
  # If a NEXTSTATE was given, switch to it
- Line 1009  sub postprocess {
+ Line 1055  sub postprocess {
  }
 ;
+ package Apache::lonhelper::helpicon;
+ =pod
+ =head1 Elements
+ =head2 Element: helpiconX<helpicon, helper element>
+ Helpicon elements add a help icon at the current location.
+ Example:
+    <helpicon file="Help">
+      General Help
+    </helpicon>
+ In this example will generate a help icon to the Help.hlp url with a
+ description of 'General Help'. The description is not required and if
+ left out (Example: <helpicon file="Help" /> only the icon will be
+ added.)
+ =head3 Localization
+ The description text will be run through the normalize_string function
+ and that will be used as a call to &mt.
+ =cut
+ no strict;
+ @ISA = ("Apache::lonhelper::element");
+ use strict;
+ use Apache::lonlocal;
+ BEGIN {
+     &Apache::lonhelper::register('Apache::lonhelper::helpicon',
+ 				 ('helpicon'));
+ }
+ sub new {
+     my $ref = Apache::lonhelper::element->new();
+     bless($ref);
+ }
+ # CONSTRUCTION: Construct the message element from the XML
+ sub start_helpicon {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     $paramHash->{HELP_TEXT} = &mtn(&Apache::lonxml::get_all_text('/helpicon',
+ 								 $parser));
+     $paramHash->{HELP_TEXT} =~s/^\s+//;
+     $paramHash->{HELP_TEXT} =~s/\s+$//;
+     if (defined($token->[2]{'file'})) {
+         $paramHash->{HELP_FILE} = $token->[2]{'file'};
+     }
+     return '';
+ }
+ sub end_helpicon {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     Apache::lonhelper::helpicon->new();
+     return '';
+ }
+ sub render {
+     my $self = shift;
+     my $text;
+     if ( $self->{HELP_TEXT} ne '') {
+ 	$text=&mtn($self->{HELP_TEXT});
+     }
+     return &Apache::loncommon::help_open_topic($self->{HELP_FILE},
+ 					       $text);
+ }
+ sub postprocess {
+     my $self = shift;
+     if (defined($self->{NEXTSTATE})) {
+         $helper->changeState($self->{NEXTSTATE});
+     }
+     return 1;
+ }
+;
+ package Apache::lonhelper::skip;
+ =pod
+ =head1 Elements
+ =head2 Element: skipX<skip>
+ The <skip> tag allows you define conditions under which the current state
+ should be skipped over and define what state to skip to.
+   <state name="SKIP">
+     <skip>
+        <clause>
+          #some code that decides whether to skip the state or not
+        </clause>
+        <nextstate>FINISH</nextstate>
+     </skip>
+     <message nextstate="FINISH">A possibly skipped state</message>
+   </state>
+ =cut
+ no strict;
+ @ISA = ("Apache::lonhelper::element");
+ use strict;
+ BEGIN {
+     &Apache::lonhelper::register('Apache::lonhelper::skip',
+ 				 ('skip'));
+ }
+ sub new {
+     my $ref = Apache::lonhelper::element->new();
+     bless($ref);
+ }
+ sub start_skip {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     # let <cluase> know what text to skip to
+     $paramHash->{SKIPTAG}='/skip';
+     return '';
+ }
+ sub end_skip {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     Apache::lonhelper::skip->new();
+     return '';
+ }
+ sub render {
+     my $self = shift;
+     return '';
+ }
+ # If a NEXTSTATE is set, switch to it
+ sub preprocess {
+     my ($self) = @_;
+     if (defined($self->{NEXTSTATE})) {
+         $helper->changeState($self->{NEXTSTATE});
+     }
+     return 1;
+ }
+;
  package Apache::lonhelper::choices;
  =pod
- Line 1058  will be the state transistioned to if th
+ Line 1273  will be the state transistioned to if th
  the choice is not multichoice. This will override the nextstate
  passed to the parent C<choices> tag.
+ <choice> may optionally contain a 'relatedvalue' attribute, which
+ if present will cause a text entry to appear to the right of the
+ selection.  The value of the relatedvalue attribute is a variable
+ into which the text entry will be stored e.g.:
+ <choice computer='numberprovided" relatedvalue="num">Type the number in:</choice>
+ <choice> may contain a relatededefault atribute which, if the
+ relatedvalue attribute is present will be the initial value of the input
+ box.
  =back
  To create the choices programmatically, either wrap the choices in
- Line 1098  tag is stored in the {VARS} hash.
+ Line 1323  tag is stored in the {VARS} hash.
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::choices',
- Line 1144  sub start_choice {
+ Line 1371  sub start_choice {
      }
      my $computer = $token->[2]{'computer'};
-     my $human = &Apache::lonxml::get_all_text('/choice',
+     my $human = &mt(&Apache::lonxml::get_all_text('/choice',
-                                               $parser);
+                                               $parser));
-     my $nextstate = $token->[2]{'nextstate'};
+     my $nextstate  = $token->[2]{'nextstate'};
-     my $evalFlag = $token->[2]{'eval'};
+     my $evalFlag   = $token->[2]{'eval'};
-     push @{$paramHash->{CHOICES}}, [$human, $computer, $nextstate,
+     my $relatedVar = $token->[2]{'relatedvalue'};
-                                     $evalFlag];
+     my $relatedDefault = $token->[2]{'relateddefault'};
+     push @{$paramHash->{CHOICES}}, [&mtn($human), $computer, $nextstate,
+                                     $evalFlag, $relatedVar, $relatedDefault];
      return '';
  }
- Line 1157  sub end_choice {
+ Line 1386  sub end_choice {
      return '';
  }
+ {
+     # used to generate unique id attributes for <input> tags.
+     # internal use only.
+     my $id = 0;
+     sub new_id { return $id++; }
+ }
  sub render {
      my $self = shift;
      my $var = $self->{'variable'};
- Line 1165  sub render {
+ Line 1401  sub render {
      if ($self->{'multichoice'}) {
          $result .= <<SCRIPT;
- <script>
+ <script type="text/javascript">
+ // <!--
      function checkall(value, checkName) {
  	for (i=0; i<document.forms.helpform.elements.length; i++) {
              ele = document.forms.helpform.elements[i];
-             if (ele.name == checkName + '.forminput') {
+             if (ele.name == checkName + '_forminput') {
                  document.forms.helpform.elements[i].checked=value;
              }
          }
      }
+ // -->
  </script>
  SCRIPT
      }
- Line 1181  SCRIPT
+ Line 1419  SCRIPT
      # Only print "select all" and "unselect all" if there are five or
      # more choices; fewer then that and it looks silly.
      if ($self->{'multichoice'} && scalar(@{$self->{CHOICES}}) > 4) {
+         my %lt=&Apache::lonlocal::texthash(
+ 			'sa'  => "Select All",
+ 		        'ua'  => "Unselect All");
          $buttons = <<BUTTONS;
  <br />
- <input type="button" onclick="checkall(true, '$var')" value="Select All" />
+ <input type="button" onclick="checkall(true, '$var')" value="$lt{'sa'}" />
- <input type="button" onclick="checkall(false, '$var')" value="Unselect All" />
+ <input type="button" onclick="checkall(false, '$var')" value="$lt{'ua'}" />
  <br />&nbsp;
  BUTTONS
      }
- Line 1236  BUTTONS
+ Line 1477  BUTTONS
      my $type = "radio";
      if ($self->{'multichoice'}) { $type = 'checkbox'; }
      foreach my $choice (@{$self->{CHOICES}}) {
+         my $id = &new_id();
          $result .= "<tr>\n<td width='20'>&nbsp;</td>\n";
-         $result .= "<td valign='top'><input type='$type' name='$var.forminput'"
+         $result .= "<td valign='top'><input type='$type' name='${var}_forminput'"
-             . "' value='" .
+             . " value='" .
-             HTML::Entities::encode($choice->[1])
+             HTML::Entities::encode($choice->[1],"<>&\"'")
              . "'";
          if ($checkedChoices{$choice->[1]}) {
-             $result .= " checked ";
+             $result .= " checked='checked'";
          }
+         $result .= qq{ id="id$id"};
          my $choiceLabel = $choice->[0];
-         if ($choice->[4]) {  # if we need to evaluate this choice
+         if ($choice->[3]) {  # if we need to evaluate this choice
              $choiceLabel = "sub { my $helper = shift; my $state = shift;" .
                  $choiceLabel . "}";
              $choiceLabel = eval($choiceLabel);
              $choiceLabel = &$choiceLabel($helper, $self);
          }
-         $result .= "/></td><td> " . $choiceLabel . "</td></tr>\n";
+         $result .= " /></td><td> ".qq{<label for="id$id">}.
+ 	    $choiceLabel. "</label></td>";
+ 	if ($choice->[4]) {
+ 	    $result .='<td><input type="text" size="5" name="'
+ 		.$choice->[4].'_forminput" value="'
+                 .$choice->[5].'" /></td>';
+ 	}
+ 	$result .= "</tr>\n";
      }
      $result .= "</table>\n\n\n";
      $result .= $buttons;
- Line 1263  BUTTONS
+ Line 1513  BUTTONS
  # given, switch to it
  sub postprocess {
      my $self = shift;
-     my $chosenValue = $ENV{'form.' . $self->{'variable'} . '.forminput'};
+     my $chosenValue = $env{'form.' . $self->{'variable'} . '_forminput'};
      if (!defined($chosenValue) && !$self->{'allowempty'}) {
-         $self->{ERROR_MSG} = "You must choose one or more choices to" .
+         $self->{ERROR_MSG} =
-             " continue.";
+ 	    &mt("You must choose one or more choices to continue.");
          return 0;
      }
      if (ref($chosenValue)) {
          $helper->{VARS}->{$self->{'variable'}} = join('|||', @$chosenValue);
      }
- Line 1285  sub postprocess {
+ Line 1538  sub postprocess {
                  $helper->changeState($choice->[2]);
              }
          }
+ 	if ($choice->[4]) {
+ 	    my $varname = $choice->[4];
+ 	    $helper->{'VARS'}->{$varname} = $env{'form.'."${varname}_forminput"};
+ 	}
      }
      return 1;
  }
- Line 1310  the result is stored in.
+ Line 1567  the result is stored in.
  =cut
+ # This really ought to be a sibling class to "choice" which is itself
+ # a child of some abstract class.... *shrug*
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::dropdown',
- Line 1387  sub render {
+ Line 1649  sub render {
  	$checkedChoices{$self->{CHOICES}->[0]->[1]} = 1;
      }
-     $result .= "<select name='${var}.forminput'>\n";
+     $result .= "<select name='${var}_forminput'>\n";
      foreach my $choice (@{$self->{CHOICES}}) {
          $result .= "<option value='" .
-             HTML::Entities::encode($choice->[1])
+             HTML::Entities::encode($choice->[1],"<>&\"'")
              . "'";
          if ($checkedChoices{$choice->[1]}) {
-             $result .= " selected";
+             $result .= " selected='selected' ";
          }
          my $choiceLabel = $choice->[0];
          if ($choice->[4]) {  # if we need to evaluate this choice
- Line 1402  sub render {
+ Line 1664  sub render {
              $choiceLabel = eval($choiceLabel);
              $choiceLabel = &$choiceLabel($helper, $self);
          }
-         $result .= ">" . $choiceLabel . "\n";
+         $result .= ">" . &mtn($choiceLabel) . "</option>\n";
      }
      $result .= "</select>\n";
- Line 1413  sub render {
+ Line 1675  sub render {
  # given, switch to it
  sub postprocess {
      my $self = shift;
-     my $chosenValue = $ENV{'form.' . $self->{'variable'} . '.forminput'};
+     my $chosenValue = $env{'form.' . $self->{'variable'} . '_forminput'};
      if (!defined($chosenValue) && !$self->{'allowempty'}) {
          $self->{ERROR_MSG} = "You must choose one or more choices to" .
- Line 1471  Example:
+ Line 1733  Example:
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal; # A localization nightmare
- use Time::localtime;
+ use Apache::lonnet;
+ use DateTime;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::date',
- Line 1499  sub start_date {
+ Line 1762  sub start_date {
      $paramHash->{'variable'} = $token->[2]{'variable'};
      $helper->declareVar($paramHash->{'variable'});
      $paramHash->{'hoursminutes'} = $token->[2]{'hoursminutes'};
+     $paramHash->{'anytime'} = $token->[2]{'anytime'};
  }
  sub end_date {
- Line 1517  sub render {
+ Line 1781  sub render {
      my $var = $self->{'variable'};
      my $date;
+     my $time=time;
+     my ($anytime,$onclick);
+     # first check VARS for a valid new value from the user
+     # then check DEFAULT_VALUE for a valid default time value
+     # otherwise pick now as reasonably good time
+     if (defined($helper->{VARS}{$var})
+ 	&&  $helper->{VARS}{$var} > 0) {
+         $date = &get_date_object($helper->{VARS}{$var});
+     } elsif (defined($self->{DEFAULT_VALUE})) {
+         my $valueFunc = eval($self->{DEFAULT_VALUE});
+         die('Error in default value code for variable ' .
+             $self->{'variable'} . ', Perl said: ' . $@) if $@;
+         $time = &$valueFunc($helper, $self);
+ 	if (lc($time) eq 'anytime') {
+ 	    $anytime=1;
+ 	    $date = &get_date_object(time);
+ 	    $date->min(0);
+ 	} elsif (defined($time) && $time ne 0) {
+ 	    $date = &get_date_object($time);
+ 	} else {
+ 	    # leave date undefined so it'll default to now
+ 	}
+     }
+     if (!defined($date)) {
+ 	$date = &get_date_object(time);
+ 	$date->min(0);
+     }
+     if ($anytime) {
+ 	$onclick = "onclick=\"javascript:updateCheck(this.form,'${var}anytime',false)\"";
+     }
      # Default date: The current hour.
-     $date = localtime();
-     $date->min(0);
      if (defined $self->{ERROR_MSG}) {
          $result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
- Line 1528  sub render {
+ Line 1824  sub render {
      # Month
      my $i;
-     $result .= "<select name='${var}month'>\n";
+     $result .= "<select $onclick name='${var}month'>\n";
      for ($i = 0; $i < 12; $i++) {
-         if ($i == $date->mon) {
+         if (($i + 1) == $date->mon) {
-             $result .= "<option value='$i' selected>";
+             $result .= "<option value='$i' selected='selected'>";
          } else {
              $result .= "<option value='$i'>";
          }
-         $result .= $months[$i] . "</option>\n";
+         $result .= &mt($months[$i])."</option>\n";
      }
      $result .= "</select>\n";
      # Day
-     $result .= "<select name='${var}day'>\n";
+     $result .= "<select $onclick name='${var}day'>\n";
      for ($i = 1; $i < 32; $i++) {
          if ($i == $date->mday) {
-             $result .= '<option selected>';
+             $result .= '<option selected="selected">';
          } else {
              $result .= '<option>';
          }
- Line 1552  sub render {
+ Line 1848  sub render {
      $result .= "</select>,\n";
      # Year
-     $result .= "<select name='${var}year'>\n";
+     $result .= "<select $onclick name='${var}year'>\n";
      for ($i = 2000; $i < 2030; $i++) { # update this after 64-bit dates
-         if ($date->year + 1900 == $i) {
+         if ($date->year == $i) {
-             $result .= "<option selected>";
+             $result .= "<option selected='selected'>";
          } else {
              $result .= "<option>";
          }
- Line 1565  sub render {
+ Line 1861  sub render {
      # Display Hours and Minutes if they are called for
      if ($self->{'hoursminutes'}) {
+ 	# This needs parameterization for times.
+ 	my $am = &mt('a.m.');
+ 	my $pm = &mt('p.m.');
          # Build hour
-         $result .= "<select name='${var}hour'>\n";
+         $result .= "<select $onclick name='${var}hour'>\n";
-         $result .= "<option " . ($date->hour == 0 ? 'selected ':'') .
+         $result .= "<option " . ($date->hour == 0 ? 'selected="selected" ':'') .
-             " value='0'>midnight</option>\n";
+             " value='0'>" . &mt('midnight') . "</option>\n";
          for ($i = 1; $i < 12; $i++) {
              if ($date->hour == $i) {
-                 $result .= "<option selected value='$i'>$i a.m.</option>\n";
+                 $result .= "<option selected='selected' value='$i'>$i $am</option>\n";
              } else {
-                 $result .= "<option value='$i'>$i a.m</option>\n";
+                 $result .= "<option value='$i'>$i $am</option>\n";
              }
          }
-         $result .= "<option " . ($date->hour == 12 ? 'selected ':'') .
+         $result .= "<option " . ($date->hour == 12 ? 'selected="selected" ':'') .
-             " value='12'>noon</option>\n";
+             " value='12'>" . &mt('noon') . "</option>\n";
          for ($i = 13; $i < 24; $i++) {
              my $printedHour = $i - 12;
              if ($date->hour == $i) {
-                 $result .= "<option selected value='$i'>$printedHour p.m.</option>\n";
+                 $result .= "<option selected='selected' value='$i'>$printedHour $pm</option>\n";
              } else {
-                 $result .= "<option value='$i'>$printedHour p.m.</option>\n";
+                 $result .= "<option value='$i'>$printedHour $pm</option>\n";
              }
          }
          $result .= "</select> :\n";
-         $result .= "<select name='${var}minute'>\n";
+         $result .= "<select $onclick name='${var}minute'>\n";
-         for ($i = 0; $i < 60; $i++) {
+ 	my $selected=0;
+         for my $i ((0,15,30,45,59,undef,0..59)) {
              my $printedMinute = $i;
-             if ($i < 10) {
+             if (defined($i) && $i < 10) {
                  $printedMinute = "0" . $printedMinute;
              }
-             if ($date->min == $i) {
+             if (!$selected && $date->min == $i) {
-                 $result .= "<option selected>";
+                 $result .= "<option selected='selected'>";
+ 		$selected=1;
              } else {
                  $result .= "<option>";
              }
- Line 1604  sub render {
+ Line 1905  sub render {
          }
          $result .= "</select>\n";
      }
+     $result  .= ' '.$date->time_zone_short_name().' ';
+     if ($self->{'anytime'}) {
+ 	$result.=(<<CHECK);
+ <script type="text/javascript">
+ // <!--
+     function updateCheck(form,name,value) {
+ 	var checkbox=form[name];
+ 	checkbox.checked = value;
+     }
+ // -->
+ </script>
+ CHECK
+ 	$result.="&nbsp;or&nbsp;<label><input type='checkbox' ";
+ 	if ($anytime) {
+ 	    $result.=' checked="checked" '
+ 	}
+         my $anytimetext = &mt('Any time');
+         if (($var eq 'startreserve') || ($var eq 'endreserve')) {
+             $anytimetext = &mt('Any time before slot starts');
+         } elsif (($var eq 'startunique') || ($var eq 'endunique')) {
+             $anytimetext = &mt('No restriction on uniqueness');
+         }
+ 	$result.="name='${var}anytime'/>".$anytimetext.'</label>'
+     }
      return $result;
  }
- Line 1612  sub render {
+ Line 1936  sub render {
  sub postprocess {
      my $self = shift;
      my $var = $self->{'variable'};
-     my $month = $ENV{'form.' . $var . 'month'};
+     if ($env{'form.' . $var . 'anytime'}) {
-     my $day = $ENV{'form.' . $var . 'day'};
+ 	$helper->{VARS}->{$var} = undef;
-     my $year = $ENV{'form.' . $var . 'year'};
+     } else {
-     my $min = 0;
+ 	my $month = $env{'form.' . $var . 'month'};
-     my $hour = 0;
+         $month ++;
-     if ($self->{'hoursminutes'}) {
+ 	my $day = $env{'form.' . $var . 'day'};
-         $min = $ENV{'form.' . $var . 'minute'};
+ 	my $year = $env{'form.' . $var . 'year'};
-         $hour = $ENV{'form.' . $var . 'hour'};
+ 	my $min = 0;
-     }
+ 	my $hour = 0;
+ 	if ($self->{'hoursminutes'}) {
+ 	    $min = $env{'form.' . $var . 'minute'};
+ 	    $hour = $env{'form.' . $var . 'hour'};
+ 	}
-     my $chosenDate = Time::Local::timelocal(0, $min, $hour, $day, $month, $year);
+ 	my ($chosenDate,$checkDate);
-     # Check to make sure that the date was not automatically co-erced into a
+         my $timezone = &Apache::lonlocal::gettimezone();
-     # valid date, as we want to flag that as an error
+         my $dt;
-     # This happens for "Feb. 31", for instance, which is coerced to March 2 or
+ 	eval {
-     # 3, depending on if it's a leapyear
+                $dt = DateTime->new( year   => $year,
-     my $checkDate = localtime($chosenDate);
+                                     month  => $month,
+                                     day    => $day,
-     if ($checkDate->mon != $month || $checkDate->mday != $day ||
+                                     hour   => $hour,
-         $checkDate->year + 1900 != $year) {
+                                     minute => $min,
-         $self->{ERROR_MSG} = "Can't use " . $months[$month] . " $day, $year as a "
+                                     second => 0,
-             . "date because it doesn't exist. Please enter a valid date.";
+                                     time_zone => $timezone,
-         return 0;
+                              );
+         };
+ 	my $error = $@;
+         if (!$error) {
+             $chosenDate  = $dt->epoch;
+             $checkDate = &get_date_object($chosenDate);
+         }
+ 	# Check to make sure that the date was not automatically co-erced into a
+ 	# valid date, as we want to flag that as an error
+ 	# This happens for "Feb. 31", for instance, which is coerced to March 2 or
+ 	# 3, depending on if it's a leap year
+ 	if ($error || $checkDate->mon != $month || $checkDate->mday != $day ||
+ 	    $checkDate->year != $year) {
+ 	    unless (Apache::lonlocal::current_language()== ~/^en/) {
+ 		$self->{ERROR_MSG} = &mt("Invalid date entry");
+ 		return 0;
+ 	    }
+ 	    # LOCALIZATION FIXME: Needs to be parameterized
+ 	    $self->{ERROR_MSG} = "Can't use ".$months[$env{'form.'.$var.'month'}].                                 " $day, $year as a ".
+ 		                 "date because it doesn't exist. Please enter a valid date.";
+ 	    return 0;
+ 	}
+ 	$helper->{VARS}->{$var} = $chosenDate;
      }
-     $helper->{VARS}->{$var} = $chosenDate;
+     if (defined($self->{VALIDATOR})) {
+ 	my $validator = eval($self->{VALIDATOR});
+ 	die 'Died during evaluation of validator code; Perl said: ' . $@ if $@;
+ 	my $invalid = &$validator($helper, $state, $self, $self->getValue());
+ 	if ($invalid) {
+ 	    $self->{ERROR_MSG} = $invalid;
+ 	    return 0;
+ 	}
+     }
      if (defined($self->{NEXTSTATE})) {
          $helper->changeState($self->{NEXTSTATE});
- Line 1644  sub postprocess {
+ Line 2006  sub postprocess {
      return 1;
  }
+ sub get_date_object {
+     my ($epoch) = @_;
+     my $dt = DateTime->from_epoch(epoch => $epoch)
+                      ->set_time_zone(&Apache::lonlocal::gettimezone());
+     my $lang = Apache::lonlocal::current_language();
+     if ($lang ne '') {
+         eval {
+             $dt->set_locale($lang);
+         };
+     }
+     return $dt;
+ }
 ;
  package Apache::lonhelper::resource;
- Line 1667  resources in that sequence, or recurses
+ Line 2043  resources in that sequence, or recurses
  to false. The "suppressEmptySequences" attribute reflects the
  suppressEmptySequences argument to the render routine, which will cause
  folders that have all of their contained resources filtered out to also
- be filtered out.
+ be filtered out. The 'addstatus' attribute, if true, will add the icon
+ and long status display columns to the display. The 'addparts'
+ attribute will add in a part selector beside problems that have more
+ than 1 part. The 'includecourse' attribute if true, will include
+ the toplevel default.sequence in the results.
  =head3 SUB-TAGS
- Line 1695  be filtered out.
+ Line 2075  be filtered out.
    default, the value will be the resource ID of the object ($res->{ID}).
  =item * <mapurl>X<mapurl>: If the URL of a map is given here, only that map
-   will be displayed, instead of the whole course.
+   will be displayed, instead of the whole course. If the attribute
+   "evaluate" is given and is true, the contents of the mapurl will be
+   evaluated with "sub { my $helper = shift; my $state = shift;" and
+   "}", with the return value used as the mapurl.
+ =item * <option />: Allows you to add optional elements to the
+   resource chooser currently these can be a checkbox, or a text entry
+   or hidden (see the 'type' attribute below).
+   the following attributes are supported by this tag:
+ =over 4
+ =item * type=control-type : determines the type of control displayed.
+   This can be one of the following types: 'checkbox' provides a true/false
+   checkbox.  'text' provides a text entry control. 'hidden' provides a
+   hidden form element that returns the name of the resource for each
+   element of the text box.
+ =item * text=header-text : provides column header text for the option.
+ =item * variable=helpervar : provides a helper variable to contain the
+   value of the input control for each resource.  In general, the result
+   will be a set of values separated by |||  for the checkbox the value between
+   the |||'s will either be empty, if the box is not checked, or the resource
+   name if checked.  For the text entry, the values will be the text in the
+   text box.  This could be empty.  Hidden elements unconditionally provide
+   the resource name for each row of the chooser and allow you to therefore
+   correlate text entries to their resources.
+   The helper variable can be initialized by the user code to pre-load values
+   into the controls:
+ =over 4
+ =item * Preloading checkboxes : Set the helper variable to the value you
+    would have gotten from the control if it had been manually set as desired.
+ =item * Preloading text entries : Set the helper variable to triple pipe
+    separated values where each value is of the form resource-name=value
+ =item * Preloading hidden fields : These cannot be pre-loaded and will always
+   be pipe separated resource names.
+ =back
+ =back
  =back
- Line 1704  be filtered out.
+ Line 2130  be filtered out.
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::resource',
                                ('resource', 'filterfunc',
                                 'choicefunc', 'valuefunc',
-                                'mapurl'));
+                                'mapurl','option'));
  }
  sub new {
- Line 1730  sub start_resource {
+ Line 2157  sub start_resource {
      $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
      $paramHash->{'suppressEmptySequences'} = $token->[2]{'suppressEmptySequences'};
      $paramHash->{'toponly'} = $token->[2]{'toponly'};
+     $paramHash->{'addstatus'} = $token->[2]{'addstatus'};
+     $paramHash->{'addparts'} = $token->[2]{'addparts'};
+     if ($paramHash->{'addparts'}) {
+ 	$helper->declareVar($paramHash->{'variable'}.'_part');
+     }
+     $paramHash->{'closeallpages'} = $token->[2]{'closeallpages'};
+     $paramHash->{'include_top_level_map'} = $token->[2]{'includecourse'};
      return '';
  }
- Line 1806  sub start_mapurl {
+ Line 2240  sub start_mapurl {
      my $contents = Apache::lonxml::get_all_text('/mapurl',
                                                  $parser);
+     $paramHash->{EVAL_MAP_URL} = $token->[2]{'evaluate'};
      $paramHash->{MAP_URL} = $contents;
  }
  sub end_mapurl { return ''; }
+ sub start_option {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if (!defined($paramHash->{OPTION_TEXTS})) {
+ 	$paramHash->{OPTION_TEXTS} = [ ];
+ 	$paramHash->{OPTION_VARS}  = [ ];
+ 	$paramHash->{OPTION_TYPES} = [ ];
+     }
+     #  We can have an attribute: type which can have the
+     #  values: "checkbox" or "text" which defaults to
+     #           checkbox allowing us to change the type of input
+     #           for the option:
+     #
+     my $input_widget_type = 'checkbox';
+     if(defined($token->[2]{'type'})) {
+ 	my $widget_type  = $token->[2]{'type'};
+ 	if ($widget_type eq 'text') {          # only accept legal alternatives
+ 	    $input_widget_type = $widget_type; # Illegals are checks.
+ 	} elsif ($widget_type eq 'hidden') {
+ 	    $input_widget_type = $widget_type;
+ 	}
+     }
+     # OPTION_TEXTS is a list of the text attribute
+     #               values used to create column headings.
+     # OPTION_VARS is a list of the variable names, used to create the checkbox
+     #             inputs.
+     # OPTION_TYPES is a list of the option types:
+     #
+     #  We're ok with empty elements. as place holders
+     # Although the 'variable' element should really exist.
+     #
+     my $option_texts  = $paramHash->{OPTION_TEXTS};
+     my $option_vars   = $paramHash->{OPTION_VARS};
+     my $option_types   = $paramHash->{OPTION_TYPES};
+     push(@$option_texts,  $token->[2]{'text'});
+     push(@$option_vars,   $token->[2]{'variable'});
+     push(@$option_types,   $input_widget_type);
+     #  Need to create and declare the option variables as well to make them
+     # persistent.
+     #
+     my $varname = $token->[2]{'variable'};
+     $helper->declareVar($varname);
+     return '';
+ }
+ sub end_option {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     return '';
+ }
  # A note, in case I don't get to this before I leave.
  # If someone complains about the "Back" button returning them
  # to the previous folder state, instead of returning them to
- Line 1833  sub render {
+ Line 2326  sub render {
      if ($self->{'multichoice'}) {
          $result = <<SCRIPT;
- <script>
+ <script type="text/javascript">
+ // <!--
      function checkall(value, checkName) {
  	for (i=0; i<document.forms.helpform.elements.length; i++) {
              ele = document.forms.helpform.elements[i];
-             if (ele.name == checkName + '.forminput') {
+             if (ele.name == checkName + '_forminput') {
                  document.forms.helpform.elements[i].checked=value;
              }
          }
      }
+ // -->
  </script>
  SCRIPT
+         my %lt=&Apache::lonlocal::texthash(
+ 			'sar'  => "Select All Resources",
+ 		        'uar'  => "Unselect All Resources");
          $buttons = <<BUTTONS;
  <br /> &nbsp;
- <input type="button" onclick="checkall(true, '$var')" value="Select All Resources" />
+ <input type="button" onclick="checkall(true, '$var')" value="$lt{'sar'}" />
- <input type="button" onclick="checkall(false, '$var')" value="Unselect All Resources" />
+ <input type="button" onclick="checkall(false, '$var')" value="$lt{'uar'}" />
  <br /> &nbsp;
  BUTTONS
      }
- Line 1858  BUTTONS
+ Line 2357  BUTTONS
      $result .= $buttons;
-     my $filterFunc = $self->{FILTER_FUNC};
+     my $filterFunc     = $self->{FILTER_FUNC};
-     my $choiceFunc = $self->{CHOICE_FUNC};
+     my $choiceFunc     = $self->{CHOICE_FUNC};
-     my $valueFunc = $self->{VALUE_FUNC};
+     my $valueFunc      = $self->{VALUE_FUNC};
-     my $mapUrl = $self->{MAP_URL};
+     my $multichoice    = $self->{'multichoice'};
-     my $multichoice = $self->{'multichoice'};
+     my $option_vars    = $self->{OPTION_VARS};
+     my $option_texts   = $self->{OPTION_TEXTS};
+     my $option_types   = $self->{OPTION_TYPES};
+     my $addparts       = $self->{'addparts'};
+     my $headings_done  = 0;
+     # Evaluate the map url as needed
+     my $mapUrl;
+     if ($self->{EVAL_MAP_URL}) {
+ 	my $mapUrlFunc = eval('sub { my $helper = shift; my $state = shift; ' .
+ 	    $self->{MAP_URL} . '}');
+ 	$mapUrl = &$mapUrlFunc($helper, $self);
+     } else {
+ 	$mapUrl = $self->{MAP_URL};
+     }
+     my %defaultSymbs;
+     if (defined($self->{DEFAULT_VALUE})) {
+         my $valueFunc = eval($self->{DEFAULT_VALUE});
+         die 'Error in default value code for variable ' .
+             $self->{'variable'} . ', Perl said: ' . $@ if $@;
+         my @defaultSymbs = &$valueFunc($helper, $self);
+ 	if (!$multichoice && @defaultSymbs) { # only allowed 1
+ 	    @defaultSymbs = ($defaultSymbs[0]);
+ 	}
+ 	%defaultSymbs = map { if ($_) {($_,1) } } @defaultSymbs;
+ 	delete($defaultSymbs{''});
+     }
      # Create the composite function that renders the column on the nav map
      # have to admit any language that lets me do this can't be all bad
- Line 1870  BUTTONS
+ Line 2396  BUTTONS
      my $checked = 0;
      my $renderColFunc = sub {
          my ($resource, $part, $params) = @_;
+ 	my $result = "";
+ 	if(!$headings_done) {
+ 	    if ($option_texts) {
+ 		foreach my $text (@$option_texts) {
+ 		    $result .= "<th>$text</th>";
+ 		}
+ 	    }
+ 	    $result .= '<th>'.&Apache::lonlocal::mt('Select').'</th>';
+ 	    $result .= "</tr><tr>"; # Close off the extra row and start a new one.
+ 	    $headings_done = 1;
+ 	}
          my $inputType;
          if ($multichoice) { $inputType = 'checkbox'; }
          else {$inputType = 'radio'; }
          if (!&$choiceFunc($resource)) {
-             return '<td>&nbsp;</td>';
+ 	    $result .= '<td>&nbsp;</td>';
+             return $result;
          } else {
-             my $col = "<td><input type='$inputType' name='${var}.forminput' ";
+ 	    my $col = "";
-             if (!$checked && !$multichoice) {
+ 	    my $raw_name = &$valueFunc($resource);
-                 $col .= "checked ";
+ 	    my $resource_name =
-                 $checked = 1;
+                    HTML::Entities::encode($raw_name,"<>&\"'");
-             }
+ 	    if($option_vars) {
- 	    if ($multichoice) { # all resources start checked; see bug 1174
+ 		my $option_num = 0;
- 		$col .= "checked ";
+ 		foreach my $option_var (@$option_vars) {
- 		$checked = 1;
+ 		    my $option_type = $option_types->[$option_num];
+ 		    $option_num++;
+ 		    my $var_value = "\|\|\|" . $helper->{VARS}->{$option_var} .
+ 			"\|\|\|";
+ 		    my $checked ="";
+ 		    if($var_value =~ /\Q|||$raw_name|||\E/) {
+ 			$checked = "checked='checked'";
+ 		    }
+ 		    if ($option_type eq 'text') {
+ 			#
+ 			# For text's the variable value is a ||| separated set of
+ 			# resource_name=value
+ 			#
+ 			my @values = split(/\|\|\|/, $helper->{VARS}->{$option_var});
+ 			# Normal practice would be to toss this in a hash but
+ 			# the only thing that saves is the compare in the loop
+ 			# below and for all but one case we'll break out of the loop
+ 			# before it completes.
+ 			my $text_value = '';    # In case there's no match.
+ 			foreach my $value (@values) {
+ 			    my ($res, $skip) = split(/=/, $value);
+ 			    if($res eq $resource_name) {
+ 				$text_value = $skip;
+ 				last;
+ 			    }
+ 			}
+ 			# TODO: add an attribute to <option> that allows the
+ 			#       programmer to set the width of the tex entry box.
+ 			$col .=
+ 			    "<td align='center'><input type='text' name ='$option_var".
+ 			    "_forminput' value='".$text_value."' size='5' /> </td>";
+ 		    } elsif ($option_type eq 'hidden') {
+  			$col .= "<td align='center'><input type='hidden' name ='$option_var".
+ 			    "_forminput' value='".
+ 			    $resource_name . "'/> </td>";
+ 		    } else {
+ 			$col .=
+ 			    "<td align='center'><input type='$option_type' name ='$option_var".
+ 			    "_forminput' value='".
+ 			    $resource_name . "' $checked /> </td>";
+ 		    }
+ 		}
+ 	    }
+             $col .= "<td align='center'><input type='$inputType' name='${var}_forminput' ";
+ 	    if (%defaultSymbs) {
+ 		my $symb=$resource->symb();
+ 		if (exists($defaultSymbs{$symb})) {
+ 		    $col .= "checked='checked' ";
+ 		    $checked = 1;
+ 		}
+ 	    } else {
+ 		if (!$checked && !$multichoice) {
+ 		    $col .= "checked='checked' ";
+ 		    $checked = 1;
+ 		}
+ 		if ($multichoice) { # all resources start checked; see bug 1174
+ 		    $col .= "checked='checked' ";
+ 		    $checked = 1;
+ 		}
  	    }
-             $col .= "value='" .
+             $col .= "value='" . $resource_name  . "' /></td>";
-                 HTML::Entities::encode(&$valueFunc($resource))
-                 . "' /></td>";
+             return $result.$col;
-             return $col;
          }
      };
+     my $renderPartsFunc = sub {
+         my ($resource, $part, $params) = @_;
+ 	my $col= "<td>";
+ 	my $id=$resource->{ID};
+ 	my $resource_name =
+ 	    &HTML::Entities::encode(&$valueFunc($resource),"<>&\"'");
+ 	if ($addparts && (scalar(@{$resource->parts}) > 1)) {
+ 	    $col .= "<select onclick=\"javascript:updateRadio(this.form,'${var}_forminput','$resource_name');updateHidden(this.form,'$id','${var}');\" name='part_${id}_forminput'>\n";
+ 	    $col .= "<option value=\"$part\">".&Apache::lonlocal::mt('All Parts')."</option>\n";
+ 	    foreach my $part (@{$resource->parts}) {
+ 		$col .= "<option value=\"$part\">".&Apache::lonlocal::mt('Part: [_1]',$part)."</option>\n";
+ 	    }
+ 	    $col .= "</select>";
+ 	}
+ 	$col .= "</td>";
+     };
+     $result.=(<<RADIO);
+ <script type="text/javascript">
+ // <!--
+     function updateRadio(form,name,value) {
+ 	var radiobutton=form[name];
+ 	for (var i=0; i<radiobutton.length; i++) {
+ 	    if (radiobutton[i].value == value) {
+ 		radiobutton[i].checked = true;
+ 		break;
+ 	    }
+ 	}
+     }
+     function updateHidden(form,id,name) {
+ 	var select=form['part_'+id+'_forminput'];
+ 	var hidden=form[name+'_part_forminput'];
+ 	var which=select.selectedIndex;
+ 	hidden.value=select.options[which].value;
+     }
+ // -->
+ </script>
+ <input type="hidden" name="${var}_part_forminput" />
-     $ENV{'form.condition'} = !$self->{'toponly'};
+ RADIO
+     $env{'form.condition'} = !$self->{'toponly'};
+     my $cols = [$renderColFunc];
+     if ($self->{'addparts'}) { push(@$cols, $renderPartsFunc); }
+     push(@$cols, Apache::lonnavmaps::resource());
+     if ($self->{'addstatus'}) {
+ 	push @$cols, (Apache::lonnavmaps::part_status_summary());
+     }
      $result .=
-         &Apache::lonnavmaps::render( { 'cols' => [$renderColFunc,
+         &Apache::lonnavmaps::render( { 'cols' => $cols,
-                                                   Apache::lonnavmaps::resource()],
                                         'showParts' => 0,
                                         'filterFunc' => $filterFunc,
                                         'resource_no_folder_link' => 1,
+ 				       'closeAllPages' => $self->{'closeallpages'},
                                         'suppressEmptySequences' => $self->{'suppressEmptySequences'},
-                                        'iterator_map' => $mapUrl }
+ 				       'include_top_level_map' => $self->{'include_top_level_map'},
+                                        'iterator_map' => $mapUrl,
+                                        'map_no_edit_link' => 1, }
                                         );
      $result .= $buttons;
- Line 1917  sub postprocess {
+ Line 2564  sub postprocess {
          $self->{ERROR_MSG} = 'You must choose at least one resource to continue.';
          return 0;
      }
+     # For each of the attached options.  If it's env var is undefined, set it to
+     # an empty string instead.. an undef'd env var means no choices selected.
+     #
+     my $option_vars = $self->{OPTION_VARS};
+     if ($option_vars) {
+ 	foreach my $var (@$option_vars) {
+ 	    my $env_name = "form.".$var."_forminput";
+ 	    if (!defined($env{$env_name})) {
+ 		$env{$env_name} = '';
+ 		$helper->{VARS}->{$var} = '';
+ 	    }
+ 	}
+     }
      if (defined($self->{NEXTSTATE})) {
          $helper->changeState($self->{NEXTSTATE});
- Line 1936  package Apache::lonhelper::student;
+ Line 2598  package Apache::lonhelper::student;
  Student elements display a choice of students enrolled in the current
  course. Currently it is primitive; this is expected to evolve later.
- Student elements take three attributes: "variable", which means what
+ Student elements take the following attributes:
- it usually does, "multichoice", which if true allows the user
- to select multiple students, and "coursepersonnel" which if true
+ =over 4
- adds the course personnel to the top of the student selection.
+ =item * B<variable>:
+ Does what it usually does: declare which helper variable to put the
+ result in.
+ =item * B<multichoice>:
+ If true allows the user to select multiple students. Defaults to false.
+ =item * B<coursepersonnel>:
+ If true adds the course personnel to the top of the student
+ selection. Defaults to false.
+ =item * B<activeonly>:
+ If true, only active students and course personnel will be
+ shown. Defaults to false.
+ =item * B<sectiononly>:
+ If true, and user's role is in a specific section, only course personnel
+ will be shown if they also have a section-specific role in the same section.
+ Defaults to false.
+ =item * B<emptyallowed>:
+ If true, the selection of no users is allowed. Defaults to false.
+ =back
  =cut
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::student',
- Line 1970  sub start_student {
+ Line 2662  sub start_student {
      $helper->declareVar($paramHash->{'variable'});
      $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
      $paramHash->{'coursepersonnel'} = $token->[2]{'coursepersonnel'};
+     $paramHash->{'sectiononly'} = $token->[2]{'sectiononly'};
+     $paramHash->{'activeonly'} = $token->[2]{'activeonly'};
      if (defined($token->[2]{'nextstate'})) {
          $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
      }
+     $paramHash->{'emptyallowed'} = $token->[2]{'emptyallowed'};
  }
- Line 1991  sub render {
+ Line 2686  sub render {
      my $buttons = '';
      my $var = $self->{'variable'};
-     if ($self->{'multichoice'}) {
-         $result = <<SCRIPT;
- <script>
-     function checkall(value, checkName) {
- 	for (i=0; i<document.forms.helpform.elements.length; i++) {
-             ele = document.forms.helpform.elements[i];
-             if (ele.name == checkName + '.forminput') {
-                 document.forms.helpform.elements[i].checked=value;
-             }
-         }
-     }
- </script>
- SCRIPT
-         $buttons = <<BUTTONS;
- <br />
- <input type="button" onclick="checkall(true, '$var')" value="Select All Students" />
- <input type="button" onclick="checkall(false, '$var')" value="Unselect All Students" />
- <br />
- BUTTONS
-     }
      if (defined $self->{ERROR_MSG}) {
          $result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
      }
-     my $choices = [];
+     my %defaultUsers;
+     if (defined($self->{DEFAULT_VALUE})) {
+         my $valueFunc = eval($self->{DEFAULT_VALUE});
+         die 'Error in default value code for variable ' .
+             $self->{'variable'} . ', Perl said: ' . $@ if $@;
+         my @defaultUsers = &$valueFunc($helper, $self);
+ 	if (!$self->{'multichoice'} && @defaultUsers) { # only allowed 1
+ 	    @defaultUsers = ($defaultUsers[0]);
+ 	}
+ 	%defaultUsers = map { if ($_) {($_,1) } } @defaultUsers;
+ 	delete($defaultUsers{''});
+     }
+     my $personnel_section;
+     if ($self->{'sectiononly'}) {
+         $personnel_section = $env{'request.course.sec'};
+     }
+     my ($course_personnel,
+ 	$current_members,
+ 	$expired_members,
+ 	$future_members) =
+ 	    &Apache::lonselstudent::get_people_in_class($env{'request.course.sec'},
+ 	                                                $personnel_section);
      # Load up the non-students, if necessary
      if ($self->{'coursepersonnel'}) {
- 	my %coursepersonnel = Apache::lonnet::get_course_adv_roles();
+ 	unshift @$current_members, (@$course_personnel);
- 	for (sort keys %coursepersonnel) {
- 	    for my $role (split /,/, $coursepersonnel{$_}) {
- 		# extract the names so we can sort them
- 		my @people;
- 		for (split /,/, $role) {
- 		    push @people, [split /:/, $role];
- 		}
- 		@people = sort { $a->[0] cmp $b->[0] } @people;
- 		for my $person (@people) {
- 		    push @$choices, [join(':', @$person), $person->[0], '', $_];
- 		}
- 	    }
- 	}
      }
-     # Constants
+     my %titles = &Apache::lonlocal::texthash(
-     my $section = Apache::loncoursedata::CL_SECTION();
+                    'active'  => 'Select Currently Enrolled Students and Active Course Personnel',
-     my $fullname = Apache::loncoursedata::CL_FULLNAME();
+                    'future'  => 'Select Future Enrolled Students',
+                    'expired' => 'Select Previously Enrolled Students',
-     # Load up the students
+                  );
-     my $classlist = &Apache::loncoursedata::get_classlist();
-     my @keys = keys %{$classlist};
+     if ($env{'request.course.sec'}) {
-     # Sort by: Section, name
+         if ($self->{'sectiononly'}) {
-     @keys = sort {
+             $titles{'active'} = &mt('Select Currently Enrolled Students and Active Course Personnel in Section: [_1]',
-         if ($classlist->{$a}->[$section] ne $classlist->{$b}->[$section]) {
+                                 $env{'request.course.sec'});
-             return $classlist->{$a}->[$section] cmp $classlist->{$b}->[$section];
+         } else {
-         }
+             $titles{'active'} = &mt('Select Currently Enrolled Students in Section: [_1], and Active Course Personnel',
-         return $classlist->{$a}->[$fullname] cmp $classlist->{$b}->[$fullname];
+                                     $env{'request.course.sec'});
-     } @keys;
+         }
+         $titles{'future'} = &mt('Select Future Enrolled Students in Section: [_1]',
-     # username, fullname, section, type
+                                 $env{'request.course.sec'});
-     for (@keys) {
+         $titles{'expired'} = &mt('Select Previously Enrolled Students in Section: [_1]',
- 	push @$choices, [$_, $classlist->{$_}->[$fullname],
+                                  $env{'request.course.sec'});
- 			 $classlist->{$_}->[$section], 'Student'];
+     }
+     #   Current personnel
+     $result .= '<h4>'.$titles{'active'}.'</h4>';
+     $result .= &Apache::lonselstudent::render_student_list( $current_members,
+ 							    "helpform",
+ 							    "current",
+ 							    \%defaultUsers,
+ 							    $self->{'multichoice'},
+ 							    $self->{'variable'},
+);
+     # If activeonly is not set then we can also give the expired students:
+     #
+     if (!$self->{'activeonly'} && ((scalar(@$future_members)) > 0)) {
+ 	# And future.
+ 	$result .= '<h4>'.$titles{'future'}.'</h4>';
+ 	$result .= &Apache::lonselstudent::render_student_list( $future_members,
+ 								"helpform",
+ 								"future",
+ 								\%defaultUsers,
+ 								$self->{'multichoice'},
+ 								$self->{'variable'},
+);
+     }
+     if (!$self->{'activeonly'} && ((scalar(@$expired_members)) > 0)) {
+ 	# Past
+ 	$result .= '<h4>'.$titles{'expired'}.'</h4>';
+ 	$result .= &Apache::lonselstudent::render_student_list($expired_members,
+ 							       "helpform",
+ 							       "past",
+ 							       \%defaultUsers,
+ 							       $self->{'multichoice'},
+ 							       $self->{'variable'},
+);
      }
-     my $name = $self->{'coursepersonnel'} ? 'Name' : 'Student Name';
-     my $type = 'radio';
-     if ($self->{'multichoice'}) { $type = 'checkbox'; }
-     $result .= "<table cellspacing='2' cellpadding='2' border='0'>\n";
-     $result .= "<tr><td></td><td align='center'><b>$name</b></td>".
-         "<td align='center'><b>Section</b></td>" .
- 	"<td align='center'><b>Role</b></td></tr>";
-     my $checked = 0;
-     for my $choice (@$choices) {
-         $result .= "<tr><td><input type='$type' name='" .
-             $self->{'variable'} . '.forminput' . "'";
-         if (!$self->{'multichoice'} && !$checked) {
-             $result .= " checked ";
-             $checked = 1;
-         }
-         $result .=
-             " value='" . HTML::Entities::encode($choice->[0] . ':' . $choice->[2])
-             . "' /></td><td>"
-             . HTML::Entities::encode($choice->[1])
-             . "</td><td align='center'>"
-             . HTML::Entities::encode($choice->[2])
-             . "</td>\n<td>"
- 	    . HTML::Entities::encode($choice->[3]) . "</td></tr>\n";
-     }
-     $result .= "</table>\n\n";
-     $result .= $buttons;
      return $result;
  }
  sub postprocess {
      my $self = shift;
-     my $result = $ENV{'form.' . $self->{'variable'} . '.forminput'};
+     my $result = $env{'form.' . $self->{'variable'} . '_forminput'};
-     if (!$result) {
+     if (!$result && !$self->{'emptyallowed'}) {
-         $self->{ERROR_MSG} = 'You must choose at least one student '.
+ 	if ($self->{'coursepersonnel'}) {
-             'to continue.';
+ 	    $self->{ERROR_MSG} =
+ 		&mt('You must choose at least one user to continue.');
+ 	} else {
+ 	    $self->{ERROR_MSG} =
+ 		&mt('You must choose at least one student to continue.');
+ 	}
          return 0;
      }
- Line 2165  viewing the files.
+ Line 2864  viewing the files.
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
  use Apache::lonpubdir; # for getTitleString
  BEGIN {
- Line 2240  sub start_filefilter {
+ Line 2940  sub start_filefilter {
  sub end_filefilter { return ''; }
+ {
+     # used to generate unique id attributes for <input> tags.
+     # internal use only.
+     my $id=0;
+     sub new_id { return $id++;}
+ }
  sub render {
      my $self = shift;
      my $result = '';
- Line 2263  sub render {
+ Line 2970  sub render {
      if ($self->{'multichoice'}) {
          $result = <<SCRIPT;
- <script>
+ <script type="text/javascript">
+ // <!--
      function checkall(value, checkName) {
  	for (i=0; i<document.forms.helpform.elements.length; i++) {
              ele = document.forms.helpform.elements[i];
-             if (ele.name == checkName + '.forminput') {
+             if (ele.name == checkName + '_forminput') {
                  document.forms.helpform.elements[i].checked=value;
              }
          }
- Line 2281  sub render {
+ Line 2989  sub render {
              }
          }
      }
+ // -->
  </script>
  SCRIPT
-         $buttons = <<BUTTONS;
+        my %lt=&Apache::lonlocal::texthash(
+ 			'saf'  => "Select All Files",
+ 		        'uaf'  => "Unselect All Files");
+        $buttons = <<BUTTONS;
  <br /> &nbsp;
- <input type="button" onclick="checkall(true, '$var')" value="Select All Files" />
+ <input type="button" onclick="checkall(true, '$var')" value="$lt{'saf'}" />
- <input type="button" onclick="checkall(false, '$var')" value="Unselect All Files" />
+ <input type="button" onclick="checkall(false, '$var')" value="$lt{'uaf'}" />
  BUTTONS
+        %lt=&Apache::lonlocal::texthash(
+ 			'sap'  => "Select All Published",
+ 		        'uap'  => "Unselect All Published");
          if ($helper->{VARS}->{'construction'}) {
-             $buttons .= <<BUTTONS;
+        $buttons .= <<BUTTONS;
- <input type="button" onclick="checkallclass(true, 'Published')" value="Select All Published" />
+ <input type="button" onclick="checkallclass(true, 'Published')" value="$lt{'sap'}" />
- <input type="button" onclick="checkallclass(false, 'Published')" value="Unselect All Published" />
+ <input type="button" onclick="checkallclass(false, 'Published')" value="$lt{'uap'}" />
  <br /> &nbsp;
  BUTTONS
         }
      }
      # Get the list of files in this directory.
-     my @fileList;
+     my (@fileList,$listref,$listerror);
      # If the subdirectory is in local CSTR space
-     if ($subdir =~ m|/home/([^/]+)/public_html|) {
+     my $metadir;
-         my $user = $1;
+     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
-         my $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+     if ($subdir =~ m{^(?:\Q$londocroot\E)*/priv/[^/]+/[^/]+/(.*)$}) {
-         @fileList = &Apache::lonnet::dirlist($subdir, $domain, $user, '');
+         my $innerpath=$1;
+         unless ($subdir=~m{^\Q$londocroot\E}) {
+            $subdir=$londocroot.$subdir;
+         }
+ 	my ($user,$domain)=
+ 	    &Apache::lonnet::constructaccess($subdir);
+ 	$metadir='/res/'.$domain.'/'.$user.'/'.$innerpath;
+         ($listref,$listerror) =
+             &Apache::lonnet::dirlist($subdir,$domain,$user,undef,undef,'/');
      } else {
          # local library server resource space
-         @fileList = &Apache::lonnet::dirlist($subdir, $ENV{'user.domain'}, $ENV{'user.name'}, '');
+         ($listref,$listerror) =
+             &Apache::lonnet::dirlist($subdir,$env{'user.domain'},$env{'user.name'},undef,undef,'/');
      }
      # Sort the fileList into order
-     @fileList = sort @fileList;
+     if (ref($listref) eq 'ARRAY') {
+         @fileList = sort {lc($a) cmp lc($b)} @{$listref};
+     }
      $result .= $buttons;
- Line 2343  BUTTONS
+ Line 3069  BUTTONS
  	    }
              # Get the title
-             my $title = Apache::lonpubdir::getTitleString($fileName);
+             my $title = Apache::lonpubdir::getTitleString(($metadir?$metadir:$subdir) .'/'. $file);
              # Netscape 4 is stupid and there's nowhere to put the
              # information on the input tag that the file is Published,
- Line 2364  BUTTONS
+ Line 3090  BUTTONS
              if ($status eq 'Published' && $helper->{VARS}->{'construction'}) {
                  $onclick = 'onclick="a=1" ';
              }
+             my $id = &new_id();
              $result .= '<tr><td align="right"' . " bgcolor='$color'>" .
                  "<input $onclick type='$type' name='" . $var
-             . ".forminput' value='" . HTML::Entities::encode($fileName) .
+             . "_forminput' ".qq{id="$id"}." value='" . HTML::Entities::encode($fileName,"<>&\"'").
                  "'";
              if (!$self->{'multichoice'} && $choices == 0) {
-                 $result .= ' checked';
+                 $result .= ' checked="checked"';
              }
-             $result .= "/></td><td bgcolor='$color'>" . $file . "</td>" .
+             $result .= "/></td><td bgcolor='$color'>".
+                 qq{<label for="$id">}. $file . "</label></td>" .
                  "<td bgcolor='$color'>$title</td>" .
                  "<td bgcolor='$color'>$status</td>" . "</tr>\n";
              $choices++;
- Line 2381  BUTTONS
+ Line 3109  BUTTONS
      $result .= "</table>\n";
      if (!$choices) {
-         $result .= '<font color="#FF0000">There are no files available to select in this directory. Please go back and select another option.</font><br /><br />';
+         $result .= '<font color="#FF0000">There are no files available to select in this directory ('.$subdir.'). Please go back and select another option.</font><br /><br />';
      }
      $result .= $buttons;
- Line 2399  sub fileState {
+ Line 3127  sub fileState {
      my $constructionSpaceDir = shift;
      my $file = shift;
+     my ($uname,$udom)=($env{'user.name'},$env{'user.domain'});
+     if ($env{'request.role'}=~/^ca\./) {
+ 	(undef,$udom,$uname)=split(/\//,$env{'request.role'});
+     }
      my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
      my $subdirpart = $constructionSpaceDir;
-     $subdirpart =~ s/^\/home\/$ENV{'user.name'}\/public_html//;
+     $subdirpart =~ s{^\Q$docroot/priv/$udom/$uname\E}{};
-     my $resdir = $docroot . '/res/' . $ENV{'user.domain'} . '/' . $ENV{'user.name'} .
+     my $resdir = $docroot . '/res/' . $udom . '/' . $uname .
          $subdirpart;
      my @constructionSpaceFileStat = stat($constructionSpaceDir . '/' . $file);
- Line 2422  sub fileState {
+ Line 3154  sub fileState {
  sub postprocess {
      my $self = shift;
-     my $result = $ENV{'form.' . $self->{'variable'} . '.forminput'};
+     my $result = $env{'form.' . $self->{'variable'} . '_forminput'};
      if (!$result) {
          $self->{ERROR_MSG} = 'You must choose at least one file '.
              'to continue.';
- Line 2447  package Apache::lonhelper::section;
+ Line 3179  package Apache::lonhelper::section;
  <section> allows the user to choose one or more sections from the current
  course.
- It takes the standard attributes "variable", "multichoice", and
+ It takes the standard attributes "variable", "multichoice",
- "nextstate", meaning what they do for most other elements.
+ "allowempty" and "nextstate", meaning what they do for most other
+ elements.
+ also takes a boolean 'onlysections' which will restrict this to only
+ have sections and not include groups
  =cut
- Line 2478  sub start_section {
+ Line 3214  sub start_section {
      $paramHash->{'variable'} = $token->[2]{'variable'};
      $helper->declareVar($paramHash->{'variable'});
      $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
+     $paramHash->{'allowempty'} = $token->[2]{'allowempty'};
      if (defined($token->[2]{'nextstate'})) {
          $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
      }
      # Populate the CHOICES element
      my %choices;
+     my $usersec = $Apache::lonnet::env{'request.course.sec'};
-     my $section = Apache::loncoursedata::CL_SECTION();
+     if ($usersec ne '') {
-     my $classlist = Apache::loncoursedata::get_classlist();
+         $choices{$usersec} = $usersec;
-     foreach (keys %$classlist) {
+     } else {
-         my $sectionName = $classlist->{$_}->[$section];
+         my $section = Apache::loncoursedata::CL_SECTION();
-         if (!$sectionName) {
+         my $classlist = Apache::loncoursedata::get_classlist();
-             $choices{"No section assigned"} = "";
+         foreach my $user (keys(%$classlist)) {
-         } else {
+             my $section_name = $classlist->{$user}[$section];
-             $choices{$sectionName} = $sectionName;
+             if (!$section_name) {
+                 $choices{"No section assigned"} = "";
+             } else {
+                 $choices{$section_name} = $section_name;
+             }
+         }
+         if (exists($choices{"No section assigned"})) {
+ 	    push(@{$paramHash->{CHOICES}},
+ 	         ['No section assigned','No section assigned']);
+ 	    delete($choices{"No section assigned"});
          }
      }
+     for my $section_name (sort {lc($a) cmp lc($b) } (keys(%choices))) {
-     for my $sectionName (sort(keys(%choices))) {
+ 	push @{$paramHash->{CHOICES}}, [$section_name, $section_name];
+     }
-         push @{$paramHash->{CHOICES}}, [$sectionName, $sectionName];
+     return if ($token->[2]{'onlysections'});
+     # add in groups to the end of the list
+     my %curr_groups = &Apache::longroup::coursegroups();
+     foreach my $group_name (sort(keys(%curr_groups))) {
+ 	push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
      }
  }
- Line 2512  sub end_section {
+ Line 3265  sub end_section {
  }
 ;
+ package Apache::lonhelper::group;
+ =pod
+ =head2 Element: groupX<group, helper element>
+ <group> allows the user to choose one or more groups from the current course.
+ It takes the standard attributes "variable", "multichoice",
+  "allowempty" and "nextstate", meaning what they do for most other
+  elements.
+ also takes a boolean grouponly, which if true, will restrict choice to
+ groups in which user is a member, unless user has the mdg priv in the course,
+ in which case all groups will be possible choices. Defaults to false.
+ =cut
+ no strict;
+ @ISA = ("Apache::lonhelper::choices");
+ use strict;
+ BEGIN {
+     &Apache::lonhelper::register('Apache::lonhelper::group',
+                                  ('group'));
+ }
+ sub new {
+     my $ref = Apache::lonhelper::choices->new();
+     bless($ref);
+ }
+ sub start_group {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     $paramHash->{CHOICES} = [];
+     $paramHash->{'variable'} = $token->[2]{'variable'};
+     $helper->declareVar($paramHash->{'variable'});
+     $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
+     $paramHash->{'allowempty'} = $token->[2]{'allowempty'};
+     $paramHash->{'grouponly'} = $token->[2]{'grouponly'};
+     if (defined($token->[2]{'nextstate'})) {
+         $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
+     }
+     # Populate the CHOICES element
+     my %choices;
+     my %curr_groups;
+     if ((!$paramHash->{'grouponly'}) || (&Apache::lonnet::allowed('mdg',$Apache::lonnet::env{'request.course.id'}))) {
+         %curr_groups = &Apache::longroup::coursegroups();
+     } elsif ($Apache::lonnet::env{'request.course.groups'} ne '') {
+         map { $curr_groups{$_} = 1; } split(/,/,$Apache::lonnet::env{'request.course.groups'});
+     }
+     foreach my $group_name (sort {lc($a) cmp lc($b)} (keys(%curr_groups))) {
+ 	push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
+     }
+ }
+ sub end_group {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     Apache::lonhelper::group->new();
+ }
+;
  package Apache::lonhelper::string;
  =pod
- Line 2521  package Apache::lonhelper::string;
+ Line 3348  package Apache::lonhelper::string;
  string elements provide a string entry field for the user. string elements
  take the usual 'variable' and 'nextstate' parameters. string elements
  also pass through 'maxlength' and 'size' attributes to the input tag.
+ Since you could have multiple strings in a helper state, each with its own
+ validator, all but the last string should have
+ noproceed='1' so that _all_ validators are evaluated before the next
+ state can be reached.
  string honors the defaultvalue tag, if given.
- Line 2531  string honors the validation function, i
+ Line 3362  string honors the validation function, i
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::string',
- Line 2539  BEGIN {
+ Line 3371  BEGIN {
  sub new {
      my $ref = Apache::lonhelper::element->new();
+     $ref->{'PROCEED'} = 1;      # By default postprocess goes to next state.
      bless($ref);
  }
- Line 2555  sub start_string {
+ Line 3388  sub start_string {
      $paramHash->{'nextstate'} = $token->[2]{'nextstate'};
      $paramHash->{'maxlength'} = $token->[2]{'maxlength'};
      $paramHash->{'size'} = $token->[2]{'size'};
      return '';
  }
  sub end_string {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      if ($target ne 'helper') {
          return '';
      }
-     Apache::lonhelper::string->new();
+     my $state = Apache::lonhelper::string->new();
+     if(&Apache::lonxml::get_param('noproceed', $parstack, $safeeval, undef, 1)) {
+ 	$state->noproceed();
+     }
      return '';
  }
+ sub noproceed() {
+     my $self = shift;
+     $self->{PROCEED}  = 0;
+ }
  sub render {
      my $self = shift;
      my $result = '';
      if (defined $self->{ERROR_MSG}) {
-         $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
+         $result .= '<p><font color="#FF0000">' . $self->{ERROR_MSG} . '</font></p>';
      }
-     $result .= '<input type="string" name="' . $self->{'variable'} . '.forminput"';
+     $result .= '<input type="text" name="' . $self->{'variable'} . '_forminput"';
      if (defined($self->{'size'})) {
          $result .= ' size="' . $self->{'size'} . '"';
- Line 2604  sub postprocess {
+ Line 3450  sub postprocess {
      if (defined($self->{VALIDATOR})) {
  	my $validator = eval($self->{VALIDATOR});
- 	die 'Died during evaluation of evaulation code; Perl said: ' . $@ if $@;
+ 	die 'Died during evaluation of validator code; Perl said: ' . $@ if $@;
  	my $invalid = &$validator($helper, $state, $self, $self->getValue());
  	if ($invalid) {
  	    $self->{ERROR_MSG} = $invalid;
- Line 2612  sub postprocess {
+ Line 3458  sub postprocess {
  	}
      }
-     if (defined($self->{'nextstate'})) {
+     if (defined($self->{'nextstate'}) && $self->{PROCEED}) {
          $helper->changeState($self->{'nextstate'});
      }
- Line 2628  package Apache::lonhelper::general;
+ Line 3474  package Apache::lonhelper::general;
  =head2 General-purpose tag: <exec>X<exec, helper tag>
  The contents of the exec tag are executed as Perl code, B<not> inside a
- safe space, so the full range of $ENV and such is available. The code
+ safe space, so the full range of $env and such is available. The code
  will be executed as a subroutine wrapped with the following code:
  "sub { my $helper = shift; my $state = shift;" and
- Line 2649  be able to call methods on it.
+ Line 3495  be able to call methods on it.
  =cut
+ use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::general',
                                   'exec', 'condition', 'clause',
- Line 2707  sub start_clause {
+ Line 3556  sub start_clause {
      die 'Error in clause of condition, Perl said: ' . $@ if $@;
      if (!&$clause($helper, $paramHash)) {
          # Discard all text until the /condition.
-         &Apache::lonxml::get_all_text('/condition', $parser);
+ 	my $end_tag = $paramHash->{SKIPTAG} || '/condition';
+         &Apache::lonxml::get_all_text($end_tag, $parser);
      }
  }
- Line 2766  snippets and collecting the results. Fin
+ Line 3616  snippets and collecting the results. Fin
  helper, going to a provided page.
  If the parameter "restartCourse" is true, this will override the buttons and
- will make a "Finish Helper" button that will re-initialize the course for them,
+ will make a Save button (Finish Helper) that will re-initialize the course for them,
  which is useful for the Course Initialization helper so the users never see
  the old values taking effect.
+ If the parameter "restartCourse" is not true a 'Finish' Button will be
+ presented that takes the user back to whatever was defined as <exitpage>
  =cut
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::final',
                                   ('final', 'exitpage'));
- Line 2831  sub render {
+ Line 3685  sub render {
      my @results;
      # Collect all the results
-     for my $stateName (keys %{$helper->{STATES}}) {
+     for my $stateName (keys(%{$helper->{STATES}})) {
          my $state = $helper->{STATES}->{$stateName};
          for my $element (@{$state->{ELEMENTS}}) {
- Line 2860  sub render {
+ Line 3714  sub render {
  	}
  	if (!@results) {
- 	    $result .= '    <li>No changes were made to current settings.</li>';
+ 	    $result .= '    <li>' .
+ 		&mt('No changes were made to current settings.') . '</li>';
  	}
  	$result .= '</ul>';
      }
+     my $actionURL = $self->{EXIT_PAGE};
+     my $targetURL = '';
+ 	my $finish=&mt('Save');
      if ($self->{'restartCourse'}) {
-         $result .= "<center>\n" .
+ 	$actionURL = '/adm/roles';
-             "<form action='/adm/roles' method='post' target='loncapaclient'>\n" .
+ 	$targetURL = '/adm/menu';
-             "<input type='button' onclick='history.go(-1)' value='&lt;- Previous' />" .
+ 	if ($env{'course.'.$env{'request.course.id'}.'.url'}=~/^uploaded/) {
-             "<input type='hidden' name='orgurl' value='/adm/menu' />" .
+ 	    $targetURL = '/adm/coursedocs';
-             "<input type='hidden' name='selectrole' value='1' />\n" .
+ 	} else {
-             "<input type='hidden' name='" . $ENV{'request.role'} .
+ 	    $targetURL = '/adm/navmaps';
-             "' value='1' />\n<input type='submit' value='Finish Course Initialization' />\n" .
+ 	}
-             "</form></center>";
+ 	if ($env{'course.'.$env{'request.course.id'}.'.clonedfrom'}) {
+ 	    $targetURL = '/adm/parmset?overview=1';
+ 	}
      }
+     my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
+     my $next = HTML::Entities::encode(&mt("Next"), '<>&"');
+     $result .= "<p>\n" .
+ 	"<form action='".$actionURL."' method='post' >\n" .
+ 	"<input type='button' onclick='history.go(-1)' value='$previous' />" .
+ 	"<input type='hidden' name='orgurl' value='$targetURL' />" .
+ 	"<input type='hidden' name='selectrole' value='1' />\n" .
+ 	"<input type='hidden' name='" . $env{'request.role'} .
+ 	"' value='1' />\n<input type='submit' value='" . $finish . "' />\n" .
+ 	"</form></p>\n";
      return $result;
  }
  sub overrideForm {
-     my $self = shift;
+     return 1;
-     return $self->{'restartCourse'};
  }
 ;
  package Apache::lonhelper::parmwizfinal;
- # This is the final state for the parmwizard. It is not generally useful,
+ # This is the final state for the parm helper. It is not generally useful,
  # so it is not perldoc'ed. It does its own processing.
  # It is represented with <parmwizfinal />, and
  # should later be moved to lonparmset.pm .
- Line 2897  package Apache::lonhelper::parmwizfinal;
+ Line 3766  package Apache::lonhelper::parmwizfinal;
  no strict;
  @ISA = ('Apache::lonhelper::element');
  use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::parmwizfinal',
- Line 2927  sub render {
+ Line 3798  sub render {
      my $vars = $helper->{VARS};
      # FIXME: Unify my designators with the standard ones
-     my %dateTypeHash = ('open_date' => "Opening Date",
+     my %dateTypeHash = ('open_date' => "opening date",
-                         'due_date' => "Due Date",
+                         'due_date' => "due date",
-                         'answer_date' => "Answer Date",
+                         'answer_date' => "answer date",
- 			'tries' => 'Number of Tries'
+ 			'tries' => 'number of tries',
+ 			'weight' => 'problem weight'
  			);
      my %parmTypeHash = ('open_date' => "0_opendate",
                          'due_date' => "0_duedate",
                          'answer_date' => "0_answerdate",
- 			'tries' => '0_maxtries' );
+ 			'tries' => '0_maxtries',
+ 			'weight' => '0_weight' );
+     my %realParmName = ('open_date' => "opendate",
+                         'due_date' => "duedate",
+                         'answer_date' => "answerdate",
+ 			'tries' => 'maxtries',
+ 			'weight' => 'weight' );
      my $affectedResourceId = "";
      my $parm_name = $parmTypeHash{$vars->{ACTION_TYPE}};
- Line 2943  sub render {
+ Line 3821  sub render {
      my $resourceString;
      my $symb;
      my $paramlevel;
      # Print the granularity, depending on the action
      if ($vars->{GRANULARITY} eq 'whole_course') {
-         $resourceString .= '<li>for <b>all resources in the course</b></li>';
+         $resourceString .= '<li>'.&mt('for [_1]all resources in the course[_2]','<b>','</b>').'</li>';
-         $level = 9; # general course, see lonparmset.pm perldoc
+ 	if ($vars->{TARGETS} eq 'course') {
+ 	    $level = 18; # general course, see lonparmset.pm perldoc
+ 	} elsif ($vars->{TARGETS} eq 'section') {
+ 	    $level = 12;
+ 	} elsif ($vars->{TARGETS} eq 'group') {
+ 	    $level = 8;
+ 	} else {
+ 	    $level = 4;
+ 	}
          $affectedResourceId = "0.0";
          $symb = 'a';
          $paramlevel = 'general';
-     } elsif ($vars->{GRANULARITY} eq 'map') {
+     } elsif (($vars->{GRANULARITY} eq 'map') || ($vars->{GRANULARITY} eq 'maprecurse')) {
          my $navmap = Apache::lonnavmaps::navmap->new();
-         my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
+         if (defined($navmap)) {
-         my $title = $res->compTitle();
+              my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
-         $symb = $res->symb();
+              my $title = $res->compTitle();
-         $navmap->untieHashes();
+              $symb = $res->symb();
-         $resourceString .= "<li>for the map named <b>$title</b></li>";
+              if ($vars->{GRANULARITY} eq 'map') {
-         $level = 8;
+                  $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
+              } else {
+                  $resourceString .= '<li>'.&mt('for the map named [_1] (applies recursively to sub-folders)',"<b>$title</b>").'</li>';
+              }
+         } else {
+             $resourceString .= '<li>'.&mt('for the map ID [_1] (name unavailable)','<b>'.$vars->{RESOURCE_ID}.'</b>').'</li>';
+             &Apache::lonnet::logthis('Retrieval of map title failed in lonhelper.pm - could not create navmap object for course.');
+         }
+         if ($vars->{GRANULARITY} eq 'maprecurse') {
+             if ($vars->{TARGETS} eq 'course') {
+                 $level = 17; # general course, see lonparmset.pm perldoc
+             } elsif ($vars->{TARGETS} eq 'section') {
+                 $level = 11;
+             } elsif ($vars->{TARGETS} eq 'group') {
+                 $level = 7;
+             } else {
+                 $level = 3;
+             }
+         } else {
+ 	    if ($vars->{TARGETS} eq 'course') {
+ 	        $level = 16; # general course, see lonparmset.pm perldoc
+ 	    } elsif ($vars->{TARGETS} eq 'section') {
+ 	        $level = 10;
+ 	    } elsif ($vars->{TARGETS} eq 'group') {
+ 	        $level = 6;
+ 	    } else {
+ 	        $level = 2;
+ 	    }
+         }
          $affectedResourceId = $vars->{RESOURCE_ID};
          $paramlevel = 'map';
      } else {
+         my $part = $vars->{RESOURCE_ID_part};
+ 	if ($part ne 'All Parts' && $part) { $parm_name=~s/^0/$part/; } else { $part=&mt('All Parts'); }
          my $navmap = Apache::lonnavmaps::navmap->new();
-         my $res = $navmap->getById($vars->{RESOURCE_ID});
+         if (defined($navmap)) {
-         $symb = $res->symb();
+             my $res = $navmap->getById($vars->{RESOURCE_ID});
-         my $title = $res->compTitle();
+             $symb = $res->symb();
-         $navmap->untieHashes();
+             my $title = $res->compTitle();
-         $resourceString .= "<li>for the resource named <b>$title</b></li>";
+             $resourceString .= '<li>'.&mt('for the resource named [_1], part [_2]',"<b>$title</b>","<b>$part</b>").'</li>';
-         $level = 7;
+         } else {
+             $resourceString .= '<li>'.&mt('for the resource ID [_1] (name unavailable), part [_2]','<b>'.$vars->{RESOURCE_ID}.'</b>',"<b>$part</b>").'</li>';
+             &Apache::lonnet::logthis('Retrieval of resource title failed in lonhelper.pm - could not create navmap object for course.');
+         }
+ 	if ($vars->{TARGETS} eq 'course') {
+ 	    $level = 13; # general course, see lonparmset.pm perldoc
+ 	} elsif ($vars->{TARGETS} eq 'section') {
+ 	    $level = 9;
+ 	} elsif ($vars->{TARGETS} eq 'group') {
+ 	    $level = 5;
+ 	} else {
+ 	    $level = 1;
+ 	}
          $affectedResourceId = $vars->{RESOURCE_ID};
          $paramlevel = 'full';
      }
-     my $result = "<form name='helpform' method='get' action='/adm/parmset#$affectedResourceId&$parm_name&$level'>\n";
+     my $result = "<form name='helpform' method='post' action='/adm/parmset#$affectedResourceId&$parm_name&$level'>\n";
-     $result .= '<p>Confirm that this information is correct, then click &quot;Finish Wizard&quot; to complete setting the parameter.<ul>';
+     $result .= "<input type='hidden' name='action' value='settable' />\n";
+     $result .= "<input type='hidden' name='dis' value='helper' />\n";
+     $result .= "<input type='hidden' name='pscat' value='".
+ 	$realParmName{$vars->{ACTION_TYPE}}."' />\n";
+     if ($vars->{GRANULARITY} eq 'resource') {
+ 	$result .= "<input type='hidden' name='symb' value='".
+ 	    HTML::Entities::encode($symb,"'<>&\"") . "' />\n";
+     } elsif (($vars->{GRANULARITY} eq 'map') || ($vars->{GRANULARITY} eq 'maprecurse')) {
+ 	$result .= "<input type='hidden' name='pschp' value='".
+ 	    $affectedResourceId."' />\n";
+     }
+     my $part = $vars->{RESOURCE_ID_part};
+     if ($part eq 'All Parts' || !$part) { $part=0; }
+     $result .= "<input type='hidden' name='psprt' value='".
+ 	HTML::Entities::encode($part,"'<>&\"") . "' />\n";
+     $result .= '<p class="LC_info">'
+               .&mt('Confirm that this information is correct, then click &quot;Save&quot; to complete setting the parameter.')
+               .'</p>'
+               .'<ul>';
      # Print the type of manipulation:
-     $result .= '<li>Setting the <b>' . $dateTypeHash{$vars->{ACTION_TYPE}} . '</b>';
+     my $extra;
      if ($vars->{ACTION_TYPE} eq 'tries') {
- 	$result .= ' to <b>' . $vars->{TRIES} . '</b>';
+ 	$extra =  $vars->{TRIES};
+     }
+     if ($vars->{ACTION_TYPE} eq 'weight') {
+ 	$extra =  $vars->{WEIGHT};
+     }
+     $result .= "<li>";
+     my $what = &mt($dateTypeHash{$vars->{ACTION_TYPE}});
+     if ($extra) {
+ 	$result .= &mt('Setting the [_1] to [_2]',"<b>$what</b>",$extra);
+     } else {
+ 	$result .= &mt('Setting the [_1]',"<b>$what</b>");
      }
      $result .= "</li>\n";
      if ($vars->{ACTION_TYPE} eq 'due_date' ||
- Line 3001  sub render {
+ Line 3959  sub render {
      } elsif ($vars->{ACTION_TYPE} eq 'tries') {
  	$result .= "<input type='hidden' name='pres_value' " .
  	    "value='" . $vars->{TRIES} . "' />\n";
+         $result .= "<input type='hidden' name='pres_type' " .
+             "value='int_pos' />\n";
+     } elsif ($vars->{ACTION_TYPE} eq 'weight') {
+ 	$result .= "<input type='hidden' name='pres_value' " .
+ 	    "value='" . $vars->{WEIGHT} . "' />\n";
      }
      $result .= $resourceString;
      # Print targets
      if ($vars->{TARGETS} eq 'course') {
-         $result .= '<li>for <b>all students in course</b></li>';
+         $result .= '<li>'.&mt('for [_1]all students in course[_2]','<b>','</b>').'</li>';
      } elsif ($vars->{TARGETS} eq 'section') {
          my $section = $vars->{SECTION_NAME};
-         $result .= "<li>for section <b>$section</b></li>";
+         $result .= '<li>'.&mt('for section [_1]',"<b>$section</b>").'</li>';
-         $level -= 3;
+ 	$result .= "<input type='hidden' name='csec' value='" .
-         $result .= "<input type='hidden' name='csec' value='" .
+             HTML::Entities::encode($section,"'<>&\"") . "' />\n";
-             HTML::Entities::encode($section) . "' />\n";
+     } elsif ($vars->{TARGETS} eq 'group') {
+         my $group = $vars->{GROUP_NAME};
+         $result .= '<li>'.&mt('for group [_1]',"<b>$group</b>").'</li>';
+         $result .= "<input type='hidden' name='cgroup' value='" .
+             HTML::Entities::encode($group,"'<>&\"") . "' />\n";
      } else {
          # FIXME: This is probably wasteful! Store the name!
          my $classlist = Apache::loncoursedata::get_classlist();
-         my $username = $vars->{USER_NAME};
+ 	my ($uname,$udom)=split(':',$vars->{USER_NAME});
-         # Chop off everything after the last colon (section)
+         my $name = $classlist->{$uname.':'.$udom}->[6];
-         $username = substr($username, 0, rindex($username, ':'));
+         $result .= '<li>'.&mt('for [_1]',"<b>$name</b>").'</li>';
-         my $name = $classlist->{$username}->[6];
-         $result .= "<li>for <b>$name</b></li>";
-         $level -= 6;
-         my ($uname, $udom) = split /:/, $vars->{USER_NAME};
          $result .= "<input type='hidden' name='uname' value='".
-             HTML::Entities::encode($uname) . "' />\n";
+             HTML::Entities::encode($uname,"'<>&\"") . "' />\n";
          $result .= "<input type='hidden' name='udom' value='".
-             HTML::Entities::encode($udom) . "' />\n";
+             HTML::Entities::encode($udom,"'<>&\"") . "' />\n";
      }
      # Print value
-     if ($vars->{ACTION_TYPE} ne 'tries') {
+     if ($vars->{ACTION_TYPE} ne 'tries' && $vars->{ACTION_TYPE} ne 'weight') {
- 	$result .= "<li>to <b>" . ctime($vars->{PARM_DATE}) . "</b> (" .
+         my $showdate = &Apache::lonlocal::locallocaltime($vars->{PARM_DATE});
- 	    Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE})
+ 	$result .= '<li>'.&mt('to [_1] ([_2])',"<b>".$showdate."</b>",Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE}))."</li>\n";
- 	    . ")</li>\n";
      }
+ 	$result .= '</ul>';
+ # FIXME: Make previous button working
+ #        Found to be dysfunctional when used to change the selected student
+ #   my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
+     my $buttons .= '<p><span class="LC_nobreak">'
+ #                 .'<input name="back" type="button"'
+ #                 .' value="'.$previous.'" onclick="history.go(-1)" />'
+                   .' <input type="submit" value="'.&mt('Save').'" />' # Finish Helper
+                   .'</span></p>'."\n";
      # print pres_marker
      $result .= "\n<input type='hidden' name='pres_marker'" .
          " value='$affectedResourceId&$parm_name&$level' />\n";
      # Make the table appear
      $result .= "\n<input type='hidden' value='true' name='prevvisit' />";
-     $result .= "\n<input type='hidden' value='all' name='pschp' />";
      $result .= "\n<input type='hidden' value='$symb' name='pssymb' />";
      $result .= "\n<input type='hidden' value='$paramlevel' name='parmlev' />";
-     $result .= "<br /><br /><center><input type='submit' value='Finish Helper' /></center></form>\n";
+     $result .= $buttons;
      return $result;
  }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.44
changed lines
	Added in v.1.199