--- loncom/interface/loncommon.pm 2009/07/31 03:14:20 1.873
+++ loncom/interface/loncommon.pm 2009/10/28 08:47:56 1.904
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.873 2009/07/31 03:14:20 raeburn Exp $
+# $Id: loncommon.pm,v 1.904 2009/10/28 08:47:56 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -483,27 +483,18 @@ ENDAUTHORBRW
sub coursebrowser_javascript {
my ($domainfilter,$sec_element,$formname)=@_;
- my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Community - for which you wish to add/modify a user role');
- my $output = '
+ my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Community - for which you wish to add/modify a user role.');
+ my $id_functions = &javascript_index_functions();
+ my $output = '
ENDTEMPLATE
return $template;
@@ -1815,7 +1900,7 @@ The optional $onchange argumnet specifie
sub select_dom_form {
my ($defdom,$name,$includeempty,$showdomdesc,$onchange) = @_;
if ($onchange) {
- ' onchange="'.$onchange.'"';
+ $onchange = ' onchange="'.$onchange.'"';
}
my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
if ($includeempty) { @domains=('',@domains); }
@@ -2870,7 +2955,7 @@ sub messagewrapper {
sub noteswrapper {
my ($link,$un,$do)=@_;
return
-"$link";
+"$link";
}
# ------------------------------------------------------------- Aboutme Wrapper
@@ -2880,7 +2965,7 @@ sub aboutmewrapper {
if (!defined($username) && !defined($domain)) {
return;
}
- return ''.$link.'';
}
@@ -2894,7 +2979,7 @@ sub syllabuswrapper {
# -----------------------------------------------------------------------------
sub track_student_link {
- my ($linktext,$sname,$sdom,$target,$start) = @_;
+ my ($linktext,$sname,$sdom,$target,$start,$only_body) = @_;
my $link ="/adm/trackstudent?";
my $title = 'View recent activity';
if (defined($sname) && $sname !~ /^\s*$/ &&
@@ -2908,6 +2993,7 @@ sub track_student_link {
$target = '';
}
if ($start) { $link.='&start='.$start; }
+ if ($only_body) { $link .= '&only_body=1'; }
$title = &mt($title);
$linktext = &mt($linktext);
return qq{$linktext}.
@@ -3840,23 +3926,24 @@ sub parse_block_record {
}
sub blocking_status {
- my $blocked;
my ($activity,$uname,$udom) = @_;
my %setters;
+
+ # check for active blocking
my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
- if ($startblock && $endblock) {
- $blocked = 1;
- }
- if(!wantarray) {
- return $blocked;
- }
- my $output;
- my $querystring;
- $querystring = "?activity=$activity";
- $output .= <<"END_MYBLOCK";
-
END_MYBLOCK
+
+ $output = Apache::lonhtmlcommon::scripttag($output);
+
my $popupUrl = "/adm/blockingstatus/$querystring";
+ my $text = mt('Communication Blocked');
+
$output .= <<"END_BLOCK";
END_BLOCK
@@ -3958,7 +4047,7 @@ sub determinedomain {
my $domain=shift;
if (! $domain) {
# Determine domain if we have not been given one
- $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+ $domain = &Apache::lonnet::default_login_domain();
if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
if ($env{'request.role.domain'}) {
$domain=$env{'request.role.domain'};
@@ -4308,6 +4397,9 @@ sub bodytag {
if ($env{'request.role'} !~ /^cr/) {
$role = &Apache::lonnet::plaintext($role,&course_type());
}
+ if ($env{'request.course.sec'}) {
+ $role .= (' 'x2).'- '.&mt('section:').' '.$env{'request.course.sec'};
+ }
$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
} else {
$role = &Apache::lonnet::plaintext($role);
@@ -4347,35 +4439,49 @@ sub bodytag {
$dc_info = '('.$dc_info.')';
}
- $role = "($role)" if $role;
+ $role = '('.$role.')' if $role;
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
if ($env{'environment.remote'} eq 'off') {
# No Remote
- if ($env{'request.state'} eq 'construct') {
- $forcereg=1;
- }
+ if ($no_nav_bar) { return $bodytag; }
-# if ($env{'request.state'} eq 'construct') {
-# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
-# }
-
- my $titletable = ''
- ."| $titleinfo $dc_info | "
- .'
';
+ if ($env{'request.state'} eq 'construct') { $forcereg=1; }
+
+ # if ($env{'request.state'} eq 'construct') {
+ # $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
+ # }
- if ($no_nav_bar) {
- $bodytag .= $titletable;
- } else {
$bodytag .= qq|$name $role
$realm $dc_info
| unless $env{'form.inhibitmenu'};
- if ($env{'request.state'} eq 'construct') {
- $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$titletable);
- } else {
- $bodytag .= &Apache::lonmenu::menubuttons($forcereg).$titletable;
- }
+ if ( $env{'form.inhibitmenu'} eq 'yes'
+ || $ENV{'REQUEST_URI'} eq '/adm/logout'
+ || $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
+
+ return $bodytag;
}
+
+ $bodytag .= Apache::lonhtmlcommon::scripttag(
+ Apache::lonmenu::utilityfunctions(), 'start');
+
+ $bodytag .= Apache::lonmenu::primary_menu();
+
+ #don't show menus for public users
+ if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
+ $bodytag .= Apache::lonmenu::secondary_menu();
+ $bodytag .= Apache::lonmenu::serverform();
+ $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
+ $bodytag .= Apache::lonmenu::innerregister($forcereg) if $forcereg;
+ }else{
+ # this is to seperate menu from content when there's no secondary
+ # menu. Especially needed for public accessible ressources.
+ $bodytag .= '
';
+ $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
+ }
+
+ #SD testing
+ #$bodytag .= Apache::lonmenu::menubuttons($forcereg);
return $bodytag;
}
@@ -4391,10 +4497,10 @@ sub bodytag {
# Explicit link to get inline menu
my $menu= ($no_inline_link?''
- :''.&mt('Switch to Inline Menu Mode').'');
+ :''.&mt('Switch to Inline Menu Mode').'');
$bodytag .= qq|$name $role
$realm $dc_info
- 
+ title='$text'>
+