version 1.816, 2009/05/15 14:48:42
|
version 1.820, 2009/05/18 16:08:07
|
Line 4144 Returns: value of designparamter $which
|
Line 4144 Returns: value of designparamter $which
|
############################################## |
############################################## |
sub designparm { |
sub designparm { |
my ($which,$domain)=@_; |
my ($which,$domain)=@_; |
if ($env{'browser.blackwhite'} eq 'on') { |
|
if ($which=~/\.(font|alink|vlink|link|textcol)$/) { |
|
return '#000000'; |
|
} |
|
if ($which=~/\.(pgbg|sidebg|bgcol)$/) { |
|
return '#FFFFFF'; |
|
} |
|
if ($which=~/\.tabbg$/) { |
|
return '#CCCCCC'; |
|
} |
|
} |
|
if (exists($env{'environment.color.'.$which})) { |
if (exists($env{'environment.color.'.$which})) { |
return $env{'environment.color.'.$which}; |
return $env{'environment.color.'.$which}; |
} |
} |
$domain=&determinedomain($domain); |
$domain=&determinedomain($domain); |
my %domdesign = &get_domainconf($domain); |
my %domdesign = &get_domainconf($domain); |
my $output; |
my $output; |
if ($domdesign{$domain.'.'.$which} ne '') { |
if ($domdesign{$domain.'.'.$which} ne '') { |
$output = $domdesign{$domain.'.'.$which}; |
$output = $domdesign{$domain.'.'.$which}; |
} else { |
} else { |
$output = $defaultdesign{$which}; |
$output = $defaultdesign{$which}; |
} |
} |
if (($which =~ /^(student|coordinator|author|admin)\.img$/) || |
if (($which =~ /^(student|coordinator|author|admin)\.img$/) || |
($which =~ /login\.(img|logo|domlogo|login)/)) { |
($which =~ /login\.(img|logo|domlogo|login)/)) { |
if ($output =~ m{^/(adm|res)/}) { |
if ($output =~ m{^/(adm|res)/}) { |
if ($output =~ m{^/res/}) { |
if ($output =~ m{^/res/}) { |
my $local_name = &Apache::lonnet::filelocation('',$output); |
my $local_name = &Apache::lonnet::filelocation('',$output); |
&Apache::lonnet::repcopy($local_name); |
&Apache::lonnet::repcopy($local_name); |
} |
} |
$output = &lonhttpdurl($output); |
$output = &lonhttpdurl($output); |
} |
} |
} |
} |
Line 4444 sub make_attr_string {
|
Line 4433 sub make_attr_string {
|
$attr_ref->{'style'}=$style.'; font-size: x-large;'; |
$attr_ref->{'style'}=$style.'; font-size: x-large;'; |
} |
} |
|
|
if ($env{'browser.blackwhite'} eq 'on') { |
|
delete($attr_ref->{'font'}); |
|
delete($attr_ref->{'link'}); |
|
delete($attr_ref->{'alink'}); |
|
delete($attr_ref->{'vlink'}); |
|
delete($attr_ref->{'bgcolor'}); |
|
delete($attr_ref->{'background'}); |
|
} |
|
|
|
my $attr_string; |
my $attr_string; |
foreach my $attr (keys(%$attr_ref)) { |
foreach my $attr (keys(%$attr_ref)) { |
$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" '; |
$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" '; |
Line 4694 table#LC_title_bar a {
|
Line 4674 table#LC_title_bar a {
|
} |
} |
|
|
table#LC_title_bar { |
table#LC_title_bar { |
|
clear: both; |
/*display: none;*/ |
/*display: none;*/ |
} |
} |
|
|
Line 4709 table#LC_title_bar.LC_with_remote {
|
Line 4690 table#LC_title_bar.LC_with_remote {
|
font-family: $sans; |
font-family: $sans; |
border-collapse: collapse; |
border-collapse: collapse; |
padding: 0; |
padding: 0; |
|
margin: 0; |
} |
} |
|
|
table.LC_docs_path { |
table.LC_docs_path { |
Line 4732 table#LC_title_bar .LC_title_bar_who {
|
Line 4714 table#LC_title_bar .LC_title_bar_who {
|
margin: 0; |
margin: 0; |
} |
} |
|
|
table#LC_title_bar .LC_title_bar_name { |
table#LC_title_bar div.LC_title_bar_name { |
margin: 0; |
margin: 0; |
} |
} |
|
|
table#LC_title_bar .LC_title_bar_role { |
table#LC_title_bar div.LC_title_bar_role { |
margin: 0; |
margin: 0; |
} |
} |
|
|
table#LC_title_bar .LC_title_bar_realm { |
table#LC_title_bar div.LC_title_bar_realm { |
margin: 0; |
margin: 0; |
} |
} |
|
|
Line 4817 table#LC_mainmenu td.LC_mainmenu_column
|
Line 4799 table#LC_mainmenu td.LC_mainmenu_column
|
font-size: 70%; |
font-size: 70%; |
} |
} |
|
|
|
#LC_head_subbox { |
|
clear:both; |
|
background: $sidebg; |
|
border-bottom: 1px solid #999999; |
|
height: 32px; |
|
line-height: 32px; |
|
margin: 0 0 10px; |
|
padding: 0; |
|
} |
|
|
.LC_fontsize_medium { |
.LC_fontsize_medium { |
font-size: 85%; |
font-size: 85%; |
} |
} |
Line 5961 ul.LC_TabContentBigger li a {
|
Line 5953 ul.LC_TabContentBigger li a {
|
ol#LC_MenuBreadcrumbs, |
ol#LC_MenuBreadcrumbs, |
ol#LC_PathBreadcrumbs, |
ol#LC_PathBreadcrumbs, |
ul.LC_CourseBreadcrumbs { |
ul.LC_CourseBreadcrumbs { |
border-top: solid 1px RGB(255, 255, 255); |
|
height: 20px; |
|
line-height: 20px; |
|
vertical-align: bottom; |
|
margin: 0 0 30px 0; |
|
padding-left: 10px; |
padding-left: 10px; |
|
margin: 0; |
list-style-position: inside; |
list-style-position: inside; |
background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; |
|
} |
} |
|
|
ol#LC_MenuBreadcrumbs li, |
ol#LC_MenuBreadcrumbs li, |
ol#LC_PathBreadcrumbs li, |
ol#LC_PathBreadcrumbs li, |
ul.LC_CourseBreadcrumbs li { |
ul.LC_CourseBreadcrumbs li { |
/* |
|
background: url(/adm/lonIcons/arrow_white.png) no-repeat left center; |
|
*/ |
|
display: inline; |
display: inline; |
padding: 0 0 0 10px; |
padding: 0 0 0 10px; |
/* vertical-align: bottom; */ |
|
overflow:hidden; |
overflow:hidden; |
} |
} |
|
|
Line 6791 Returns either 'student','coordinator','
|
Line 6774 Returns either 'student','coordinator','
|
############################################### |
############################################### |
sub get_users_function { |
sub get_users_function { |
my $function = 'norole'; |
my $function = 'norole'; |
|
if ($env{'request.role'}=~/^(st)/) { |
|
$function='student'; |
|
} |
if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { |
if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { |
$function='coordinator'; |
$function='coordinator'; |
} |
} |
Line 10226 sub escape_url {
|
Line 10212 sub escape_url {
|
return join('/',@urlslices).'/'.$lastitem; |
return join('/',@urlslices).'/'.$lastitem; |
} |
} |
|
|
# -------------------------------------------------------- Initliaze user login |
sub compare_arrays { |
|
my ($arrayref1,$arrayref2) = @_; |
|
my (@difference,%count); |
|
@difference = (); |
|
%count = (); |
|
if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) { |
|
foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; } |
|
foreach my $element (keys(%count)) { |
|
if ($count{$element} == 1) { |
|
push(@difference,$element); |
|
} |
|
} |
|
} |
|
return @difference; |
|
} |
|
|
|
# -------------------------------------------------------- Initialize user login |
sub init_user_environment { |
sub init_user_environment { |
my ($r, $username, $domain, $authhost, $form, $args) = @_; |
my ($r, $username, $domain, $authhost, $form, $args) = @_; |
my $lonids=$Apache::lonnet::perlvar{'lonIDsDir'}; |
my $lonids=$Apache::lonnet::perlvar{'lonIDsDir'}; |
Line 10280 sub init_user_environment {
|
Line 10282 sub init_user_environment {
|
my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml, |
my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml, |
$clientunicode,$clientos) = &decode_user_agent($r); |
$clientunicode,$clientos) = &decode_user_agent($r); |
|
|
# -------------------------------------- Any accessibility options to remember? |
|
if (($form->{'interface'}) && ($form->{'remember'} eq 'true')) { |
|
foreach my $option ('imagesuppress','appletsuppress', |
|
'embedsuppress','fontenhance','blackwhite') { |
|
if ($form->{$option} eq 'true') { |
|
&Apache::lonnet::put('environment',{$option => 'on'}, |
|
$domain,$username); |
|
} else { |
|
&Apache::lonnet::del('environment',[$option], |
|
$domain,$username); |
|
} |
|
} |
|
} |
|
# ------------------------------------------------------------- Get environment |
# ------------------------------------------------------------- Get environment |
|
|
my %userenv = &Apache::lonnet::dump('environment',$domain,$username); |
my %userenv = &Apache::lonnet::dump('environment',$domain,$username); |
Line 10310 sub init_user_environment {
|
Line 10299 sub init_user_environment {
|
if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; } |
if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; } |
|
|
# --------------- Do not trust query string to be put directly into environment |
# --------------- Do not trust query string to be put directly into environment |
foreach my $option ('imagesuppress','appletsuppress', |
foreach my $option ('interface','localpath','localres') { |
'embedsuppress','fontenhance','blackwhite', |
$form->{$option}=~s/[\n\r\=]//gs; |
'interface','localpath','localres') { |
|
$form->{$option}=~s/[\n\r\=]//gs; |
|
} |
} |
# --------------------------------------------------------- Write first profile |
# --------------------------------------------------------- Write first profile |
|
|
Line 10347 sub init_user_environment {
|
Line 10334 sub init_user_environment {
|
$form->{'interface'}=~s/\W//gs; |
$form->{'interface'}=~s/\W//gs; |
$initial_env{"browser.interface"} = $form->{'interface'}; |
$initial_env{"browser.interface"} = $form->{'interface'}; |
$env{'browser.interface'}=$form->{'interface'}; |
$env{'browser.interface'}=$form->{'interface'}; |
foreach my $option ('imagesuppress','appletsuppress', |
|
'embedsuppress','fontenhance','blackwhite') { |
|
if (($form->{$option} eq 'true') || |
|
($userenv{$option} eq 'on')) { |
|
$initial_env{"browser.$option"} = "on"; |
|
} |
|
} |
|
} |
} |
|
|
foreach my $tool ('aboutme','blog','portfolio') { |
foreach my $tool ('aboutme','blog','portfolio') { |