[BACK]Return to lonnavdisplay.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnavdisplay.pm between versions 1.2 and 1.10

version 1.2, 2007/04/20 01:54:29 version 1.10, 2009/05/06 16:19:34
Line 71  sub real_handler { Line 71  sub real_handler {
       "Select Action");        "Select Action");
     if ($ENV{QUERY_STRING} eq 'collapseExternal') {      if ($ENV{QUERY_STRING} eq 'collapseExternal') {
  &Apache::lonnet::put('environment',{'remotenavmap' => 'off'});   &Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
  &Apache::lonnet::appenv('environment.remotenavmap' => 'off');   &Apache::lonnet::appenv({'environment.remotenavmap' => 'off'});
  my $menu=&Apache::lonmenu::reopenmenu();   my $menu=&Apache::lonmenu::reopenmenu();
  my $navstatus=&Apache::lonmenu::get_nav_status();   my $navstatus=&Apache::lonmenu::get_nav_status();
  if ($menu) {   if ($menu) {
Line 110  ENDSUBM Line 110  ENDSUBM
     }      }
     if ($ENV{QUERY_STRING} =~ /^launchExternal/) {      if ($ENV{QUERY_STRING} =~ /^launchExternal/) {
  &Apache::lonnet::put('environment',{'remotenavmap' => 'on'});   &Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
  &Apache::lonnet::appenv('environment.remotenavmap' => 'on');   &Apache::lonnet::appenv({'environment.remotenavmap' => 'on'});
   my $menu=&Apache::lonmenu::reopenmenu();    my $menu=&Apache::lonmenu::reopenmenu();
  my $navstatus=&Apache::lonmenu::get_nav_status();   my $navstatus=&Apache::lonmenu::get_nav_status();
  if ($menu) {   if ($menu) {
Line 133  MENU Line 133  MENU
     if (!defined($navmap)) {      if (!defined($navmap)) {
         my $requrl = $r->uri;          my $requrl = $r->uri;
         $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";          $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
           $env{'user.reinit'} = 1;
         return HTTP_NOT_ACCEPTABLE;          return HTTP_NOT_ACCEPTABLE;
     }      }
     $r->send_http_header;      $r->send_http_header;
Line 154  MENU Line 155  MENU
   
     # Header      # Header
     my $course_type = &Apache::loncommon::course_type();      my $course_type = &Apache::loncommon::course_type();
     $r->print(&Apache::loncommon::start_page('Navigate '.$course_type.      $r->print(&Apache::loncommon::start_page(#'Navigate '.$course_type.
      ' Contents',       'Course Contents',
      $js,       $js,
      {'only_body'       => $body_only,       {'only_body'       => $body_only,
       'force_register'  =>        'force_register'  =>
Line 255  MENU Line 256  MENU
   
         # If we found no problems, print a note to that effect.          # If we found no problems, print a note to that effect.
         if (!$foundDoableProblem) {          if (!$foundDoableProblem) {
             $r->print("<font size='+2'>All homework assignments have been completed.</font><br /><br />");              $r->print("<span class=\"LC_info\">"
                        .&mt("All homework assignments have been completed.")
                        ."</span>");
         }          }
     } else {      } else {
  &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',   &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
Line 278  MENU Line 281  MENU
  &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',   &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
   'location.href="navmaps?sort='.$env{'form.sort'}.'"',    'location.href="navmaps?sort='.$env{'form.sort'}.'"',
   "Show everything");    "Show everything");
         $r->print("<p><font size='+2'>".&mt("Uncompleted Problems")."</font></p>");          $r->print("<span class=\"LC_info\">".&mt("Uncompleted Problems")."</span>");
         $env{'form.filter'} = '';          $env{'form.filter'} = '';
         $env{'form.condition'} = 1;          $env{'form.condition'} = 1;
  $resource_no_folder_link = 1;   $resource_no_folder_link = 1;
Line 289  MENU Line 292  MENU
   "Show only uncompleted problems");    "Show only uncompleted problems");
     }      }
   
     my %selected=($env{'form.sort'} => 'selected=on');      my %selected=($env{'form.sort'} => ' selected="selected"');
     my $sort_html=("<form>      my $sort_html=("<form name=\"sortForm\">
                  <nobr>                   <span class=\"LC_nobreak\">
                     <input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$env{'form.showOnlyHomework'}."\" />                      <input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$env{'form.showOnlyHomework'}."\" />
                     <input type=\"submit\" value=\"".&mt('Sort by:')."\" />                      ".&mt('Sort by:')."
                     <select name=\"sort\">                      <select name=\"sort\" onChange=\"document.sortForm.submit()\">
                        <option value=\"default\" $selected{'default'}>".&mt('Default')."</option>                         <option value=\"default\"$selected{'default'}>".&mt('Default')."</option>
                        <option value=\"title\"   $selected{'title'}  >".&mt('Title')."</option>                         <option value=\"title\"$selected{'title'}  >".&mt('Title')."</option>
                        <option value=\"duedate\" $selected{'duedate'}>".&mt('Duedate')."</option>                         <option value=\"duedate\"$selected{'duedate'}>".&mt('Duedate')."</option>
                        <option value=\"discussion\" $selected{'discussion'}>".&mt('Has New Discussion')."</option>                         <option value=\"discussion\"$selected{'discussion'}>".&mt('Has New Discussion')."</option>
                     </select>                      </select>
                  </nobr>                   </span>
                </form>");                 </form>");
     # renderer call      # renderer call
     my $renderArgs = { 'cols' => [0,1,2,3],      my $renderArgs = { 'cols' => [0,1,2,3],
Line 321  MENU Line 324  MENU
     # user knows there was no error.      # user knows there was no error.
     if ($renderArgs->{'counter'} == 0) {      if ($renderArgs->{'counter'} == 0) {
         if ($showOnlyHomework) {          if ($showOnlyHomework) {
             $r->print("<p><font size='+1'>".&mt("All homework is currently completed").".</font></p>");              $r->print("<p><span class=\"LC_info\">".&mt("All homework is currently completed.")."</span></p>");
         } else { # both jumpToFirstHomework and normal use the same: course must be empty          } else { # both jumpToFirstHomework and normal use the same: course must be empty
             $r->print("<p><font size='+1'>This course is empty.</font></p>");              $r->print("<p><span class=\"LC_info\">".&mt("This course is empty.")."</span></p>");
         }          }
     }      }
     #my $td=&tv_interval($t0);      #my $td=&tv_interval($t0);
Removed from v.1.2  
changed lines
  Added in v.1.10

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