version 1.948.2.23, 2011/01/05 19:57:17
|
version 1.948.2.30, 2011/09/28 15:44:16
|
Line 3570 sub format_previous_attempt_value {
|
Line 3570 sub format_previous_attempt_value {
|
my @anskeys = sort(keys(%answers)); |
my @anskeys = sort(keys(%answers)); |
if (@anskeys == 1) { |
if (@anskeys == 1) { |
my $answer = $answers{$anskeys[0]}; |
my $answer = $answers{$anskeys[0]}; |
if ($answer =~ m{\Q\0\E}) { |
if ($answer =~ m{\0}) { |
$answer =~ s{\Q\0\E}{, }g; |
$answer =~ s{\0}{,}g; |
} |
} |
my $tag_internal_answer_name = 'INTERNAL'; |
my $tag_internal_answer_name = 'INTERNAL'; |
if ($anskeys[0] eq $tag_internal_answer_name) { |
if ($anskeys[0] eq $tag_internal_answer_name) { |
Line 3582 sub format_previous_attempt_value {
|
Line 3582 sub format_previous_attempt_value {
|
} else { |
} else { |
foreach my $ans (@anskeys) { |
foreach my $ans (@anskeys) { |
my $answer = $answers{$ans}; |
my $answer = $answers{$ans}; |
if ($answer =~ m{\Q\0\E}) { |
if ($answer =~ m{\0}) { |
$answer =~ s{\Q\0\E}{, }g; |
$answer =~ s{\0}{,}g; |
} |
} |
$value .= $ans.'='.$answer.'<br />';; |
$value .= $ans.'='.$answer.'<br />';; |
} |
} |
Line 4282 sub get_domainconf {
|
Line 4282 sub get_domainconf {
|
if (ref($domconfig{'login'}{$key}) eq 'HASH') { |
if (ref($domconfig{'login'}{$key}) eq 'HASH') { |
if ($key eq 'loginvia') { |
if ($key eq 'loginvia') { |
if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') { |
if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') { |
my @ids = &Apache::lonnet::current_machine_ids(); |
foreach my $hostname (keys(%{$domconfig{'login'}{'loginvia'}})) { |
foreach my $hostname (@ids) { |
|
if (ref($domconfig{'login'}{'loginvia'}{$hostname}) eq 'HASH') { |
if (ref($domconfig{'login'}{'loginvia'}{$hostname}) eq 'HASH') { |
if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) { |
if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) { |
my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'}; |
my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'}; |
Line 4292 sub get_domainconf {
|
Line 4291 sub get_domainconf {
|
|
|
$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'}; |
$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'}; |
} else { |
} else { |
$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'}; |
$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'}; |
} |
} |
if ($domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}) { |
if ($domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}) { |
$designhash{$udom.'.login.loginvia_exempt_'.$hostname} = $domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}; |
$designhash{$udom.'.login.loginvia_exempt_'.$hostname} = $domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}; |
Line 4769 sub bodytag {
|
Line 4768 sub bodytag {
|
$dc_info = qq|<span class="LC_cusr_subheading">($dc_info)</span>|; |
$dc_info = qq|<span class="LC_cusr_subheading">($dc_info)</span>|; |
} |
} |
|
|
$bodytag .= qq|<div id="LC_nav_bar">$name $role</div> |
unless ($env{'form.inhibitmenu'}) { |
<ol class="LC_primary_menu LC_right"> |
$bodytag .= qq|<div id="LC_nav_bar">$name $role</div> |
<li>$menu</li> |
<ol class="LC_primary_menu LC_right"> |
</ol><div id="LC_realm"> $realm $dc_info</div>| unless $env{'form.inhibitmenu'}; |
<li>$menu</li> |
|
</ol><div id="LC_realm"> $realm $dc_info</div>|; |
|
} |
|
|
return(<<ENDBODY); |
return(<<ENDBODY); |
$bodytag |
$bodytag |
<table id="LC_title_bar" class="LC_with_remote"> |
<table id="LC_title_bar" class="LC_with_remote"> |
Line 5157 td.LC_table_cell_checkbox {
|
Line 5159 td.LC_table_cell_checkbox {
|
overflow: hidden; |
overflow: hidden; |
margin: 0; |
margin: 0; |
padding: 0; |
padding: 0; |
|
text-align: left; |
} |
} |
|
|
/* Preliminary fix to hide breadcrumbs inside remote control window */ |
/* Preliminary fix to hide breadcrumbs inside remote control window */ |
Line 5170 td.LC_table_cell_checkbox {
|
Line 5173 td.LC_table_cell_checkbox {
|
border: 1px solid $sidebg; |
border: 1px solid $sidebg; |
margin: 0 0 10px 0; |
margin: 0 0 10px 0; |
padding: 3px; |
padding: 3px; |
|
text-align: left; |
} |
} |
|
|
.LC_fontsize_medium { |
.LC_fontsize_medium { |
Line 5192 td.LC_table_cell_checkbox {
|
Line 5196 td.LC_table_cell_checkbox {
|
|
|
li.LC_menubuttons_inline_text img,a { |
li.LC_menubuttons_inline_text img,a { |
cursor:pointer; |
cursor:pointer; |
|
text-decoration: none; |
} |
} |
|
|
.LC_menubuttons_link { |
.LC_menubuttons_link { |
Line 6147 fieldset > legend {
|
Line 6152 fieldset > legend {
|
|
|
#LC_nav_bar { |
#LC_nav_bar { |
float: left; |
float: left; |
|
background-color: $pgbg_or_bgcolor; |
margin: 0 0 2px 0; |
margin: 0 0 2px 0; |
} |
} |
|
|
Line 6155 fieldset > legend {
|
Line 6161 fieldset > legend {
|
padding: 0; |
padding: 0; |
font-weight: bold; |
font-weight: bold; |
text-align: center; |
text-align: center; |
|
background-color: $pgbg_or_bgcolor; |
} |
} |
|
|
#LC_nav_bar em { |
#LC_nav_bar em { |
Line 6170 fieldset > legend {
|
Line 6177 fieldset > legend {
|
ol.LC_primary_menu { |
ol.LC_primary_menu { |
float: right; |
float: right; |
margin: 0; |
margin: 0; |
|
background-color: $pgbg_or_bgcolor; |
} |
} |
|
|
span.LC_new_message{ |
ol.LC_primary_menu a.LC_new_message { |
font-weight:bold; |
font-weight:bold; |
color: darkred; |
color: darkred; |
} |
} |
Line 6229 ul#LC_secondary_menu {
|
Line 6237 ul#LC_secondary_menu {
|
padding: 0; |
padding: 0; |
margin: 0; |
margin: 0; |
width: 100%; |
width: 100%; |
|
text-align: left; |
} |
} |
|
|
ul#LC_secondary_menu li { |
ul#LC_secondary_menu li { |
Line 9018 sub modify_html_refs {
|
Line 9027 sub modify_html_refs {
|
if ($allfiles{$ref}) { |
if ($allfiles{$ref}) { |
my $newname = $orig; |
my $newname = $orig; |
my ($attrib_regexp,$codebase); |
my ($attrib_regexp,$codebase); |
my $attrib_regexp = &unescape($env{'form.embedded_attrib_'.$i}); |
$attrib_regexp = &unescape($env{'form.embedded_attrib_'.$i}); |
if ($attrib_regexp =~ /:/) { |
if ($attrib_regexp =~ /:/) { |
$attrib_regexp =~ s/\:/|/g; |
$attrib_regexp =~ s/\:/|/g; |
} |
} |
Line 9027 sub modify_html_refs {
|
Line 9036 sub modify_html_refs {
|
$count += $numchg; |
$count += $numchg; |
} |
} |
if ($env{'form.embedded_codebase_'.$i} ne '') { |
if ($env{'form.embedded_codebase_'.$i} ne '') { |
my $codebase = &unescape($env{'form.embedded_codebase_'.$i}); |
$codebase = &unescape($env{'form.embedded_codebase_'.$i}); |
my $numchg = ($content =~ s/(codebase\s*=\s*["']?)\Q$codebase\E(["']?)/$1.$2/i); #' stupid emacs |
my $numchg = ($content =~ s/(codebase\s*=\s*["']?)\Q$codebase\E(["']?)/$1.$2/i); #' stupid emacs |
$codebasecount ++; |
$codebasecount ++; |
} |
} |
Line 9096 sub check_for_upload {
|
Line 9105 sub check_for_upload {
|
&mt('Unable to upload [_1]. (size = [_2] bytes)', |
&mt('Unable to upload [_1]. (size = [_2] bytes)', |
'<span class="LC_filename">'.$fname.'</span>', |
'<span class="LC_filename">'.$fname.'</span>', |
$filesize).'<br />'. |
$filesize).'<br />'. |
&mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').'<br />'; |
&mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').'<br />'. |
'</span>'; |
'</span>'; |
return ('zero_bytes',$msg); |
return ('zero_bytes',$msg); |
} |
} |