'
+ '
'
.$content
.'
'
}
@@ -4769,10 +4823,13 @@ sub bodytag {
$dc_info = qq|
($dc_info) |;
}
- $bodytag .= qq|
$name $role
-
$realm $dc_info
| unless $env{'form.inhibitmenu'};
+ unless ($env{'form.inhibitmenu'}) {
+ $bodytag .= qq|
$name $role
+
$realm $dc_info
|;
+ }
+
return(<
@@ -5157,6 +5214,7 @@ td.LC_table_cell_checkbox {
overflow: hidden;
margin: 0;
padding: 0;
+ text-align: left;
}
/* Preliminary fix to hide breadcrumbs inside remote control window */
@@ -5164,12 +5222,13 @@ td.LC_table_cell_checkbox {
display:none;
}
-#LC_head_subbox {
+.LC_head_subbox {
clear:both;
background: #F8F8F8; /* $sidebg; */
border: 1px solid $sidebg;
margin: 0 0 10px 0;
padding: 3px;
+ text-align: left;
}
.LC_fontsize_medium {
@@ -5192,6 +5251,7 @@ td.LC_table_cell_checkbox {
li.LC_menubuttons_inline_text img,a {
cursor:pointer;
+ text-decoration: none;
}
.LC_menubuttons_link {
@@ -6147,6 +6207,7 @@ fieldset > legend {
#LC_nav_bar {
float: left;
+ background-color: $pgbg_or_bgcolor;
margin: 0 0 2px 0;
}
@@ -6155,6 +6216,7 @@ fieldset > legend {
padding: 0;
font-weight: bold;
text-align: center;
+ background-color: $pgbg_or_bgcolor;
}
#LC_nav_bar em {
@@ -6170,9 +6232,10 @@ fieldset > legend {
ol.LC_primary_menu {
float: right;
margin: 0;
+ background-color: $pgbg_or_bgcolor;
}
-span.LC_new_message{
+ol.LC_primary_menu a.LC_new_message {
font-weight:bold;
color: darkred;
}
@@ -6229,6 +6292,7 @@ ul#LC_secondary_menu {
padding: 0;
margin: 0;
width: 100%;
+ text-align: left;
}
ul#LC_secondary_menu li {
@@ -7072,7 +7136,7 @@ sub simple_error_page {
sub continue_data_table_row {
my ($add_class) = @_;
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
- $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');;
+ $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
return ''."\n";;
}
@@ -7820,7 +7884,7 @@ sub get_secgrprole_info {
}
sub user_picker {
- my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype) = @_;
+ my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context) = @_;
my $currdom = $dom;
my %curr_selected = (
srchin => 'dom',
@@ -7911,10 +7975,15 @@ sub user_picker {
$srchtypesel .= "\n \n";
my ($newuserscript,$new_user_create);
-
+ my $context_dom = $env{'request.role.domain'};
+ if ($context eq 'requestcrs') {
+ if ($env{'form.coursedom'} ne '') {
+ $context_dom = $env{'form.coursedom'};
+ }
+ }
if ($forcenewuser) {
if (ref($srch) eq 'HASH') {
- if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $env{'request.role.domain'}) {
+ if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $context_dom) {
if ($cancreate) {
$new_user_create = ' &"').'" onclick="javascript:setSearch(\'1\','.$caller.');" />
';
} else {
@@ -7953,7 +8022,7 @@ function setSearch(createnew,callingForm
}
}
for (var i=0; i'.$fname.'',
$filesize).' '.
- &mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').' ';
+ &mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').' '.
'';
return ('zero_bytes',$msg);
}
@@ -11352,7 +11421,10 @@ sub init_user_environment {
$env{'browser.interface'}=$form->{'interface'};
}
my %is_adv = ( is_adv => $env{'user.adv'} );
- my %domdef = &Apache::lonnet::get_domain_defaults($domain);
+ my %domdef;
+ unless ($domain eq 'public') {
+ %domdef = &Apache::lonnet::get_domain_defaults($domain);
+ }
foreach my $tool ('aboutme','blog','portfolio') {
$userenv{'availabletools.'.$tool} =