[LON-CAPA-cvs] cvs: loncom(GCI_3) /interface lonnavdisplay.pm
raeburn
raeburn@source.lon-capa.org
Mon, 04 Oct 2010 21:27:20 -0000
raeburn Mon Oct 4 21:27:20 2010 EDT
Modified files: (Branch: GCI_3)
/loncom/interface lonnavdisplay.pm
Log:
- Backport 1.17, 1.18.
Index: loncom/interface/lonnavdisplay.pm
diff -u loncom/interface/lonnavdisplay.pm:1.13 loncom/interface/lonnavdisplay.pm:1.13.6.1
--- loncom/interface/lonnavdisplay.pm:1.13 Tue Sep 8 20:56:47 2009
+++ loncom/interface/lonnavdisplay.pm Mon Oct 4 21:27:20 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavdisplay.pm,v 1.13 2009/09/08 20:56:47 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.13.6.1 2010/10/04 21:27:20 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -139,7 +139,7 @@
$r->send_http_header;
# ------------------------------------------------------------ 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
my $body_only='';
@@ -163,11 +163,19 @@
$title = 'Course Contents';
$breadcrumb_text = &mt('Course Contents');
}
- $r->print(&Apache::loncommon::start_page($title,
- $js,
- {'only_body' => $body_only,
- 'force_register' => $env{'form.register'},
- 'bread_crumbs' => [{text => $breadcrumb_text }],}));
+ 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('<script type="text/javascript">window.focus();</script>');
$r->rflush();
@@ -268,8 +276,12 @@
."</span>");
}
} else {
+ my $link = 'navmaps?jumpToFirstHomework';
+ if ($env{'form.register'}) {
+ $link .= '&register='.$env{'form.register'};
+ }
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
- 'location.href="navmaps?jumpToFirstHomework"',
+ 'location.href="'.$link.'"',
"Show my first due problem");
}
@@ -285,8 +297,12 @@
$filterFunc = sub { my $res = shift;
return $res->completable() || $res->is_map();
};
+ my $link = 'navmaps?sort='.$env{'form.sort'};
+ if ($env{'form.register'}) {
+ $link .= '&register='.$env{'form.register'};
+ }
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
- 'location.href="navmaps?sort='.$env{'form.sort'}.'"',
+ 'location.href="'.$link.'"',
"Show everything");
$r->print("<span class=\"LC_info\">".&mt("Uncompleted Problems")."</span>");
$env{'form.filter'} = '';
@@ -300,18 +316,19 @@
}
my %selected=($env{'form.sort'} => ' selected="selected"');
- my $sort_html=("<form name=\"sortForm\">
- <span class=\"LC_nobreak\">
- <input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$env{'form.showOnlyHomework'}."\" />
- ".&mt('Sort by:')."
- <select name=\"sort\" onChange=\"document.sortForm.submit()\">
- <option value=\"default\"$selected{'default'}>".&mt('Default')."</option>
- <option value=\"title\"$selected{'title'} >".&mt('Title')."</option>
- <option value=\"duedate\"$selected{'duedate'}>".&mt('Duedate')."</option>
- <option value=\"discussion\"$selected{'discussion'}>".&mt('Has New Discussion')."</option>
+ my $sort_html=('<form name="sortForm" action="">
+ <span class="LC_nobreak">
+ <input type="hidden" name="showOnlyHomework" value="'.$env{'form.showOnlyHomework'}.'" />
+ '.&mt('Sort by:').'
+ <select name="sort" onchange="document.sortForm.submit()">
+ <option value="default"'.$selected{'default'}>'.&mt('Default').'</option>
+ <option value="title"'.$selected{'title'} >".&mt('Title').'</option>
+ <option value="duedate"'.$selected{'duedate'}.'>'.&mt('Duedate').'</option>
+ <option value="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>
</select>
+ <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
</span>
- </form>");
+ </form>');
# renderer call
my $renderArgs = { 'cols' => [0,1,2,3],
'sort' => $env{'form.sort'},