version 1.160.6.7, 2012/09/25 23:20:42
|
version 1.160.6.11, 2012/12/20 13:53:22
|
Line 405 sub handler {
|
Line 405 sub handler {
|
} |
} |
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js); |
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js); |
} else { |
} else { |
|
# check if domconfig user exists for the domain. |
|
my $servadm = $r->dir_config('lonAdmEMail'); |
|
my ($configuserok,$author_ok,$switchserver) = |
|
&config_check($dom,$confname,$servadm); |
|
unless ($configuserok eq 'ok') { |
|
&Apache::lonconfigsettings::print_header($r,$phase,$context); |
|
$r->print(&mt('The domain configuration user "[_1]" has yet to be created.', |
|
$confname). |
|
'<br />' |
|
); |
|
if ($switchserver) { |
|
$r->print(&mt('Ordinarily, that domain configuration user is created when the ./UPDATE script is run to install LON-CAPA for the first time.'). |
|
'<br />'. |
|
&mt('However, that does not apply when new domains are added to a multi-domain server, and ./UPDATE has not been run recently.'). |
|
'<br />'. |
|
&mt('The "[_1]" user can be created automatically when a Domain Coordinator visits the web-based "Set domain configuration" screen, in a session hosted on the primary library server.',$confname). |
|
'<br />'. |
|
&mt('To do that now, use the following link: [_1]',$switchserver) |
|
); |
|
} else { |
|
$r->print(&mt('To create that user from the command line run the ./UPDATE script found in the top level directory of the extracted LON-CAPA tarball.'). |
|
'<br />'. |
|
&mt('Once that is done, you will be able to use the web-based "Set domain configuration" to configure the domain') |
|
); |
|
} |
|
$r->print(&Apache::loncommon::end_page()); |
|
return OK; |
|
} |
if (keys(%domconfig) == 0) { |
if (keys(%domconfig) == 0) { |
my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); |
my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); |
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
Line 1163 sub display_color_options {
|
Line 1191 sub display_color_options {
|
} else { |
} else { |
$datatable .= '<td> </td>'; |
$datatable .= '<td> </td>'; |
} |
} |
my $fontlink = &color_pick($phase,$role,'font',$choices->{'font'},$designs->{'font'}); |
my $current_color = $designs->{'font'} ? $designs->{'font'} : $defaults->{'font'}; |
|
|
$datatable .= '<td><span class="LC_nobreak">'. |
$datatable .= '<td><span class="LC_nobreak">'. |
'<input type="text" size="10" name="'.$role.'_font"'. |
'<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'. |
' value="'.$designs->{'font'}.'" /> '.$fontlink. |
' value="'.$current_color.'" /> '. |
' <span id="css_'.$role.'_font" style="background-color: '. |
' </td></tr>'; |
$designs->{'font'}.';"> </span>'. |
|
'</span></td></tr>'; |
|
unless ($role eq 'login') { |
unless ($role eq 'login') { |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td>'.$choices->{'fontmenu'}.'</td>'; |
'<td>'.$choices->{'fontmenu'}.'</td>'; |
Line 1178 sub display_color_options {
|
Line 1205 sub display_color_options {
|
} else { |
} else { |
$datatable .= '<td> </td>'; |
$datatable .= '<td> </td>'; |
} |
} |
$fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'}); |
$current_color = $designs->{'fontmenu'} ? |
|
$designs->{'fontmenu'} : $defaults->{'fontmenu'}; |
$datatable .= '<td><span class="LC_nobreak">'. |
$datatable .= '<td><span class="LC_nobreak">'. |
'<input type="text" size="10" name="'.$role.'_fontmenu"'. |
'<input class="colorchooser" type="text" size="10" name="' |
' value="'.$designs->{'fontmenu'}.'" /> '.$fontlink. |
.$role.'_fontmenu"'. |
' <span id="css_'.$role.'_fontmenu" style="background-color: '. |
' value="'.$current_color.'" /> '. |
$designs->{'fontmenu'}.';"> </span>'. |
' </td></tr>'; |
'</span></td></tr>'; |
|
} |
} |
my $switchserver = &check_switchserver($dom,$confname); |
my $switchserver = &check_switchserver($dom,$confname); |
foreach my $img (@{$images}) { |
foreach my $img (@{$images}) { |
Line 1312 sub display_color_options {
|
Line 1339 sub display_color_options {
|
$datatable .= '<td class="LC_right_item">'. |
$datatable .= '<td class="LC_right_item">'. |
'<table border="0"><tr>'; |
'<table border="0"><tr>'; |
foreach my $item (@{$bgs}) { |
foreach my $item (@{$bgs}) { |
my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item}); |
$datatable .= '<td align="center">'; |
$datatable .= '<td align="center">'.$link; |
my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item}; |
if ($designs->{'bgs'}{$item}) { |
if ($designs->{'bgs'}{$item}) { |
$datatable .= ' <span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'bgs'}{$item}.';"> </span>'; |
$datatable .= ' '; |
} |
} |
$datatable .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.$designs->{'bgs'}{$item}. |
$datatable .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color. |
'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>'; |
'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>'; |
} |
} |
$datatable .= '</tr></table></td></tr>'; |
$datatable .= '</tr></table></td></tr>'; |
Line 1339 sub display_color_options {
|
Line 1366 sub display_color_options {
|
$datatable .= '<td class="LC_right_item">'. |
$datatable .= '<td class="LC_right_item">'. |
'<table border="0"><tr>'; |
'<table border="0"><tr>'; |
foreach my $item (@{$links}) { |
foreach my $item (@{$links}) { |
$datatable .= '<td align="center">'."\n". |
my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item}; |
&color_pick($phase,$role,$item,$choices->{$item}, |
$datatable .= '<td align="center">'."\n"; |
$designs->{'links'}{$item}); |
|
if ($designs->{'links'}{$item}) { |
if ($designs->{'links'}{$item}) { |
$datatable.=' <span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'links'}{$item}.';"> </span>'; |
$datatable.=' '; |
} |
} |
$datatable .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.$designs->{'links'}{$item}. |
$datatable .= '<br /><input type="text" size="8" class="colorchooser" name="'.$role.'_'.$item.'" value="'.$color. |
'" /></td>'; |
'" /></td>'; |
|
|
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
return $datatable; |
return $datatable; |
Line 1686 sub print_quotas {
|
Line 1714 sub print_quotas {
|
} elsif ($context eq 'requestauthor') { |
} elsif ($context eq 'requestauthor') { |
my $curroption; |
my $curroption; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'requestauthor'}) eq 'HASH') { |
$curroption = $settings->{'default'}; |
$curroption = $settings->{'requestauthor'}; |
|
} |
|
} |
} |
if (!$curroption) { |
if (!$curroption) { |
$curroption = 'norequest'; |
$curroption = 'norequest'; |
Line 1833 sub print_quotas {
|
Line 1859 sub print_quotas {
|
$checked = ' checked="checked"'; |
$checked = ' checked="checked"'; |
} |
} |
$datatable .= '<span class="LC_nobreak"><label>'. |
$datatable .= '<span class="LC_nobreak"><label>'. |
'<input type="radio" name="crsreq_'.$item. |
'<input type="radio" name="authorreq__LC_adv"'. |
'__LC_adv" value="'.$val.'"'.$checked.' />'. |
' value="'.$val.'"'.$checked.' />'. |
$titles{$option}.'</label></span> '; |
$titles{$option}.'</label></span> '; |
} |
} |
} else { |
} else { |
Line 5636 sub check_switchserver {
|
Line 5662 sub check_switchserver {
|
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (!$allowed) { |
if (!$allowed) { |
$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>'; |
$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/&destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>'; |
} |
} |
return $switchserver; |
return $switchserver; |
} |
} |
Line 5906 sub modify_quotas {
|
Line 5932 sub modify_quotas {
|
$cond = $conditions{$inconf{$type}}; |
$cond = $conditions{$inconf{$type}}; |
} |
} |
$resulttext .= '<li>'.&mt('Set to be available to [_1].',$typetitle).' '.$cond.'</li>'; |
$resulttext .= '<li>'.&mt('Set to be available to [_1].',$typetitle).' '.$cond.'</li>'; |
|
} elsif ($context eq 'requestauthor') { |
|
$resulttext .= '<li>'.&mt('Set to "[_1]" for "[_2]".', |
|
$titles{$inconf{$type}},$typetitle); |
|
|
} else { |
} else { |
$resulttext .= '<li>'.&mt('Set to be available to [_1]',$typetitle).'</li>'; |
$resulttext .= '<li>'.&mt('Set to be available to [_1]',$typetitle).'</li>'; |
} |
} |
Line 7045 sub process_captcha {
|
Line 7075 sub process_captcha {
|
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
$currpub = $current->{'recaptchakeys'}{'public'}; |
$currpub = $current->{'recaptchakeys'}{'public'}; |
$currpriv = $current->{'recaptchakeys'}{'private'}; |
$currpriv = $current->{'recaptchakeys'}{'private'}; |
$newsettings->{'recaptchakeys'} = { |
unless ($newsettings->{'captcha'} eq 'recaptcha') { |
public => '', |
$newsettings->{'recaptchakeys'} = { |
private => '', |
public => '', |
} |
private => '', |
|
} |
|
} |
} |
} |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if ($container eq 'cancreate') { |
if ($container eq 'cancreate') { |