--- loncom/interface/lonwhatsnew.pm 2010/08/09 23:39:43 1.98.2.2
+++ loncom/interface/lonwhatsnew.pm 2010/01/27 14:35:46 1.99.2.1
@@ -1,5 +1,5 @@
#
-# $Id: lonwhatsnew.pm,v 1.98.2.2 2010/08/09 23:39:43 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.99.2.1 2010/01/27 14:35:46 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -72,7 +72,6 @@ sub handler {
['mdc','versionchanges',0],
['vcl','newroles',1],
['vcl','oldroles',1],
- ['whn','crslogin',1],
) {
my ($perm,$key,$check_section) = @{ $perm_check };
my $scope = $env{'request.course.id'};
@@ -144,13 +143,6 @@ sub handler {
$r->print(&Apache::lonhtmlcommon::breadcrumbs
("What's New?",#'Course_Action_Items_Intervals'
));
- } elsif ($command eq 'chgcrslogininterval' && $checkallowed{'crslogin'}) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/whatsnew?command=chgcrslogininterval&refpage='.$refpage,
- text=>"Change interval"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs
- ("What's New?",#'Course_Action_Items_Intervals'
- ));
} else {
$r->print(&Apache::lonhtmlcommon::breadcrumbs
("What's New?",#'Course_Action_Items_Display'
@@ -196,17 +188,10 @@ sub display_main_box {
604800 => 'roles which expired since last week',
86400 => 'roles which expired since yesterday',
);
- my %crslogins = (
- -1 => 'last login for anyone who has ever logged in',
- 2592000 => 'last login for users in last 30 days',
- 604800 => 'last login for users in last 7 days',
- 86400 => 'last login for users in last 24 hours',
- );
my %interval_titles = (
versions => \%versions,
newroles => \%newroles,
oldroles => \%oldroles,
- crslogin => \%crslogins,
);
my %initpage = &Apache::lonlocal::texthash (
firstres => "first resource in the $lctype",
@@ -235,9 +220,6 @@ sub display_main_box {
} elsif (($command eq 'chgoldroleinterval')
&& $checkallowed->{'oldroles'}) {
&display_interval_config($r,$refpage,\%interval_titles,'oldroles');
- } elsif (($command eq 'chgcrslogininterval')
- && $checkallowed->{'crslogin'}) {
- &display_interval_config($r,$refpage,\%interval_titles,'crslogin');
} else {
&display_actions_box($r,$command,$refpage,\%threshold_titles,
\%interval_titles,\%initpage,$cdom,$crs,$checkallowed);
@@ -263,8 +245,7 @@ sub display_header {
my $scripttag;
unless ($command eq 'chgthreshold' || $command eq 'chginterval' ||
- $command eq 'chgoldroleinterval' ||
- $command eq 'chgnewroleinterval' || $command eq 'chgcrslogininterval') {
+ $command eq 'chgoldroleinterval' || $command eq 'chgnewroleinterval') {
$scripttag = <<"END";
';
}
@@ -346,7 +282,6 @@ function togglelogins() {
sub display_actions_box {
my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage,
$cdom,$crs,$checkallowed) = @_;
- my $custommenu = &Apache::loncommon::needs_gci_custom();
my $udom = $env{'user.domain'};
my $uname = $env{'user.name'};
my $cid = $env{'request.course.id'};
@@ -380,8 +315,6 @@ sub display_actions_box {
my %expired;
my $activecount;
my %activated;
- my %loggedin;
- my $logincount;
my %res_title = ();
my %show = ();
my $needitems = 0;
@@ -410,17 +343,16 @@ sub display_actions_box {
}
my $header = '';
- if (($refpage eq 'start') && (!$custommenu)) {
+ if ($refpage eq 'start') {
if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
&GDBM_READER(),0640)) {
my $furl=&HTML::Entities::encode($bighash{'first_url'},'"<>&');
untie(%bighash);
- $header .= ''.$lt{'gtfr'}.
- '
';
+ $r->print(''.$lt{'gtfr'}.
+ '
');
}
}
- unless ($custommenu) {
- $header .= &mt('Page set to be displayed after you have selected a role in this '.$lctype).'.'
+ $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).'.'
.' '
.&mt('Currently: [_1].',''.$currinit.'')
.' '
@@ -431,10 +363,9 @@ sub display_actions_box {
,''
,''
,'')
- .' ';
+ .'