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

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

version 1.10, 2009/05/06 16:19:34 version 1.13.6.2, 2010/10/04 21:46:32
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();
     $r->print(&Apache::loncommon::start_page(#'Navigate '.$course_type.      my ($title,$breadcrumb_text,$start_page,$args);
      'Course Contents',      if ($course_type eq 'Community') {
      $js,          $title = 'Community Contents';
      {'only_body'       => $body_only,          $breadcrumb_text = &mt('Community Contents');
       'force_register'  =>      } else {
   $env{'form.register'},}));          $title = 'Course Contents';
     $r->print('<script type="text/javascript">window.focus();</script>');          $breadcrumb_text = &mt('Course Contents');
       }
       if ($env{'form.register'}) {
           $args = {'force_register' => $env{'form.register'},
                    'only_body'      => $body_only};
           $start_page = &Apache::loncommon::start_page($title,$js,$args);
       } else {
           my $brcrum = [{href => '/adm/navmaps',
                          text => $breadcrumb_text,
                          no_mt => 1},
                        ];
           $args = {'bread_crumbs' => $brcrum,
                    'only_body'    => $body_only};
           $start_page = &Apache::loncommon::start_page($title,$js,$args);
       }
       $r->print($start_page.
                 '<script type="text/javascript">window.focus();</script>');
             
     $r->rflush();      $r->rflush();
   
Line 261  MENU Line 277  MENU
                      ."</span>");                       ."</span>");
         }          }
     } else {      } else {
           my $link = 'navmaps?jumpToFirstHomework';
           if ($env{'form.register'}) {
               $link .= '&amp;register='.$env{'form.register'};
           }
  &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',   &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
   'location.href="navmaps?jumpToFirstHomework"',    'location.href="'.$link.'"',
   "Show my first due problem");    "Show my first due problem");
     }      }
   
Line 278  MENU Line 298  MENU
         $filterFunc = sub { my $res = shift;           $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();                              return $res->completable() || $res->is_map();
                         };                          };
           my $link = 'navmaps?sort='.$env{'form.sort'};
           if ($env{'form.register'}) {
               $link .= '&amp;register='.$env{'form.register'};
           }
  &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',   &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
   'location.href="navmaps?sort='.$env{'form.sort'}.'"',    'location.href="'.$link.'"',
   "Show everything");    "Show everything");
         $r->print("<span class=\"LC_info\">".&mt("Uncompleted Problems")."</span>");          $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;
     } 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="navmaps?sort='.$env{'form.sort'}.    'location.href="'.$link.'"',
   '&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'}.'" />
                  </span>                   </span>
                </form>");                 </form>');
     # renderer call      # renderer call
     my $renderArgs = { 'cols' => [0,1,2,3],      my $renderArgs = { 'cols' => [0,1,2,3],
        'sort' => $env{'form.sort'},         'sort' => $env{'form.sort'},
Removed from v.1.10  
changed lines
  Added in v.1.13.6.2

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