loncom/interface/lonnavdisplay.pm - diff

Return to lonnavdisplay.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnavdisplay.pm between versions 1.15 and 1.17

version 1.15, 2010/03/16 19:55:49	version 1.17, 2010/03/29 14:50:46
Line 67 sub real_handler {	Line 67 sub real_handler {
&Apache::loncommon::no_cache($r);	&Apache::loncommon::no_cache($r);

my %toplinkitems=();	my %toplinkitems=();
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'blank','',
"Select Action");

# Create the nav map	# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
Line 82 sub real_handler {	Line 80 sub real_handler {
$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
# Header	# Header
my $course_type = &Apache::loncommon::course_type();	my $course_type = &Apache::loncommon::course_type();
my $title = $course_type . ' Contents';	my $title = $course_type . ' Contents';
my $breadcrumb_text = mt($course_type . ' Contents');	my ($start_page,$args);
$r->print(&Apache::loncommon::start_page($title, '',	if ($env{'form.register'}) {
{ 'force_register' => $env{'form.register'},	$args = {'force_register' => $env{'form.register'}};
'bread_crumbs' => [{text => $breadcrumb_text }],}));	$start_page = &Apache::loncommon::start_page($title,undef,$args);
#SD	} else {
$r->print('<script type="text/javascript">window.focus();</script>');	my $brcrum = [{href => '/adm/navmaps',
	text => &mt($course_type . ' Contents'),
	no_mt => 1},
	];
	$args = {'bread_crumbs' => $brcrum};
	$start_page = &Apache::loncommon::start_page($title,undef,$args);
	}
	$r->print($start_page.
	'<script type="text/javascript">window.focus();</script>');
$r->rflush();	$r->rflush();

# Check that it's defined	# Check that it's defined
Line 172 sub real_handler {	Line 177 sub real_handler {
."</span>");	."</span>");
}	}
} else {	} else {
	my $link = 'navmaps?jumpToFirstHomework';
	if ($env{'form.register'}) {
	$link .= '&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 189 sub real_handler {	Line 198 sub real_handler {
$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 .= '&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'}.'&showOnlyHomework=1';
	if ($env{'form.register'}) {
	$link .= '&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">
<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'},

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

Removed from v.1.15
changed lines
	Added in v.1.17