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

Diff for /loncom/interface/lonnavdisplay.pm between versions 1.13.4.2 and 1.13.6.1

version 1.13.4.2, 2010/05/31 00:31:28 version 1.13.6.1, 2010/10/04 21:27:20
Line 139  MENU Line 139  MENU
     $r->send_http_header;      $r->send_http_header;
   
 # ------------------------------------------------------------ Get query string  # ------------------------------------------------------------ Get query string
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']);
           
 # ----------------------------------------------------- Force menu registration  # ----------------------------------------------------- Force menu registration
     my $body_only='';      my $body_only='';
Line 155  MENU Line 155  MENU
   
     # Header      # Header
     my $course_type = &Apache::loncommon::course_type();      my $course_type = &Apache::loncommon::course_type();
     my ($title,$breadcrumb_text,$start_page,$args);      my ($title,$breadcrumb_text);
     if ($course_type eq 'Community') {      if ($course_type eq 'Community') {
         $title = 'Community Contents';          $title = 'Community Contents';
         $breadcrumb_text = &mt('Community Contents');          $breadcrumb_text = &mt('Community Contents');
Line 164  MENU Line 164  MENU
         $breadcrumb_text = &mt('Course Contents');          $breadcrumb_text = &mt('Course Contents');
     }      }
     if ($env{'form.register'}) {      if ($env{'form.register'}) {
         $args = {'force_register' => $env{'form.register'}};          $args = {'force_register' => $env{'form.register'},
                    'only_body'      => $body_only};
         $start_page = &Apache::loncommon::start_page($title,$js,$args);          $start_page = &Apache::loncommon::start_page($title,$js,$args);
     } else {      } else {
         my $brcrum = [{href => '/adm/navmaps',          my $brcrum = [{href => '/adm/navmaps',
                        text => $breadcrumb_text,                         text => $breadcrumb_text,
                        no_mt => 1},                         no_mt => 1},
                      ];                       ];
         $args = {'bread_crumbs' => $brcrum};          $args = {'bread_crumbs' => $brcrum,
                    'only_body'    => $body_only};
         $start_page = &Apache::loncommon::start_page($title,$js,$args);          $start_page = &Apache::loncommon::start_page($title,$js,$args);
     }      }
     $r->print($start_page.      $r->print('<script type="text/javascript">window.focus();</script>');
               '<script type="text/javascript">window.focus();</script>');       
     $r->rflush();      $r->rflush();
   
     # Check that it's defined      # Check that it's defined
Line 276  MENU Line 278  MENU
     } else {      } else {
         my $link = 'navmaps?jumpToFirstHomework';          my $link = 'navmaps?jumpToFirstHomework';
         if ($env{'form.register'}) {          if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};               $link .= '&amp;register='.$env{'form.register'};
         }          }
  &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',   &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
   'location.href="'.$link.'"',    'location.href="'.$link.'"',
Line 307  MENU Line 309  MENU
         $env{'form.condition'} = 1;          $env{'form.condition'} = 1;
  $resource_no_folder_link = 1;   $resource_no_folder_link = 1;
     } else {      } else {
         my $link = 'navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';  
         if ($env{'form.register'}) {  
             $link .= '&amp;register='.$env{'form.register'};  
         }  
  &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',   &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
   'location.href="'.$link.'"',    'location.href="navmaps?sort='.$env{'form.sort'}.
     '&showOnlyHomework=1"',
   "Show only uncompleted problems");    "Show only uncompleted problems");
     }      }
   
     my %selected=($env{'form.sort'} => ' selected="selected"');      my %selected=($env{'form.sort'} => ' selected="selected"');
     my $sort_html=('<form name="sortForm">      my $sort_html=('<form name="sortForm" action="">
                  <span class="LC_nobreak">                   <span class="LC_nobreak">
                     <input type="hidden" name="showOnlyHomework" value="'.$env{'form.showOnlyHomework'}.'" />                      <input type="hidden" name="showOnlyHomework" value="'.$env{'form.showOnlyHomework'}.'" />
                     '.&mt('Sort by:').'                      '.&mt('Sort by:').'
                     <select name="sort" onChange="document.sortForm.submit()">                      <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>
                     <input type="hidden" name="register" value="'.$env{'form.register'}.'" />                      <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
                  </span>                   </span>
                </form>');                 </form>');
Removed from v.1.13.4.2  
changed lines
  Added in v.1.13.6.1

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