version 1.892, 2009/09/27 15:27:26
|
version 1.895, 2009/10/10 03:32:46
|
Line 493 sub coursebrowser_javascript {
|
Line 493 sub coursebrowser_javascript {
|
$output .= <<"ENDSTDBRW"; |
$output .= <<"ENDSTDBRW"; |
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) { |
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) { |
var url = '/adm/pickcourse?'; |
var url = '/adm/pickcourse?'; |
|
var formid = getFormIdByName(formname); |
var domainfilter = getDomainFromSelectbox(formname,udom); |
var domainfilter = getDomainFromSelectbox(formname,udom); |
if (domainfilter != null) { |
if (domainfilter != null) { |
if (domainfilter != '') { |
if (domainfilter != '') { |
Line 4046 sub determinedomain {
|
Line 4047 sub determinedomain {
|
my $domain=shift; |
my $domain=shift; |
if (! $domain) { |
if (! $domain) { |
# Determine domain if we have not been given one |
# 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{'user.domain'}) { $domain=$env{'user.domain'}; } |
if ($env{'request.role.domain'}) { |
if ($env{'request.role.domain'}) { |
$domain=$env{'request.role.domain'}; |
$domain=$env{'request.role.domain'}; |
Line 4440 sub bodytag {
|
Line 4441 sub bodytag {
|
|
|
if ($env{'environment.remote'} eq 'off') { |
if ($env{'environment.remote'} eq 'off') { |
# No Remote |
# No Remote |
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
$forcereg=1; |
$forcereg=1; |
} |
} |
|
|
# if ($env{'request.state'} eq 'construct') { |
# if ($env{'request.state'} eq 'construct') { |
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls |
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls |
# } |
# } |
|
|
my $titletable = '<table id="LC_title_bar">' |
my $titletable = '<table id="LC_title_bar">' |
."<tr><td> $titleinfo $dc_info</td>" |
."<tr><td> $titleinfo $dc_info</td>" |
.'</tr></table>'; |
.'</tr></table>'; |
|
|
if ($no_nav_bar) { |
if ($no_nav_bar) { |
$bodytag .= $titletable; |
$bodytag .= $titletable; |
} else { |
} else { |
$bodytag .= qq|<div id="LC_nav_bar">$name $role<br /> |
$bodytag .= qq|<div id="LC_nav_bar">$name $role<br /> |
<em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'}; |
<em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'}; |
|
|
if ($env{'request.state'} eq 'construct') { |
#SD $titletable is obsolete |
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$titletable); |
#SD if ($env{'request.state'} eq 'construct') { |
} else { |
#SD $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$titletable); |
$bodytag .= &Apache::lonmenu::menubuttons($forcereg).$titletable; |
#SD } else { |
} |
#SD $bodytag .= &Apache::lonmenu::menubuttons($forcereg).$titletable; |
|
#SD } |
|
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(); |
|
$bodytag .= Apache::lonmenu::secondary_menu(); |
|
#SD remove next line |
|
#$bodytag .= Apache::lonmenu::menubuttons($forcereg); |
|
$bodytag .= Apache::lonmenu::serverform(); |
|
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); |
|
$bodytag .= Apache::lonmenu::innerregister($forcereg) if $forcereg; |
} |
} |
return $bodytag; |
return $bodytag; |
} |
} |