loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.947 and 1.948.2.2

version 1.947, 2010/03/03 21:33:15	version 1.948.2.2, 2010/05/18 00:44:12
Line 4231 sub get_domainconf {	Line 4231 sub get_domainconf {
if (defined($cached)) { return %{$result}; }	if (defined($cached)) { return %{$result}; }

my %domconfig = &Apache::lonnet::get_dom('configuration',	my %domconfig = &Apache::lonnet::get_dom('configuration',
['login','rolecolors'],$udom);	['login','rolecolors','autoenroll'],$udom);
my (%designhash,%legacy);	my (%designhash,%legacy);
if (keys(%domconfig) > 0) {	if (keys(%domconfig) > 0) {
if (ref($domconfig{'login'}) eq 'HASH') {	if (ref($domconfig{'login'}) eq 'HASH') {
Line 4242 sub get_domainconf {	Line 4242 sub get_domainconf {
if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') {	if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') {
my @ids = &Apache::lonnet::current_machine_ids();	my @ids = &Apache::lonnet::current_machine_ids();
foreach my $hostname (@ids) {	foreach my $hostname (@ids) {
if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) {	if (ref($domconfig{'login'}{'loginvia'}{$hostname}) eq 'HASH') {
my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'};	if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) {
$designhash{$udom.'.login.loginvia'} = $server;	my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'};
if ($domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'} eq 'custom') {	$designhash{$udom.'.login.loginvia'} = $server;
	if ($domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'} eq 'custom') {
$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'};
} else {	$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'};
$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'};	} else {
}	$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'};
if ($domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}) {	}
$designhash{$udom.'.login.loginvia_exempt_'.$hostname} = $domconfig{'login'}{'loginvia'}{$hostname}{'exempt'};	if ($domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}) {
	$designhash{$udom.'.login.loginvia_exempt_'.$hostname} = $domconfig{'login'}{'loginvia'}{$hostname}{'exempt'};
	}
}	}
}	}
}	}
Line 4288 sub get_domainconf {	Line 4290 sub get_domainconf {
} else {	} else {
$legacy{'rolecolors'} = 1;	$legacy{'rolecolors'} = 1;
}	}
	if (ref($domconfig{'autoenroll'}) eq 'HASH') {
	if ($domconfig{'autoenroll'}{'co-owners'}) {
	$designhash{$udom.'.autoassign.co-owners'}=$domconfig{'autoenroll'}{'co-owners'};
	}
	}
if (keys(%legacy) > 0) {	if (keys(%legacy) > 0) {
my %legacyhash = &get_legacy_domconf($udom);	my %legacyhash = &get_legacy_domconf($udom);
foreach my $item (keys(%legacyhash)) {	foreach my $item (keys(%legacyhash)) {
Line 4565 sub bodytag {	Line 4572 sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,	my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
$no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;	$no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;

	my $public;
	if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
	\|\| ($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) {
	$public = 1;
	}
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }	if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }

$function = &get_users_function() if (!$function);	$function = &get_users_function() if (!$function);
Line 4614 sub bodytag {	Line 4626 sub bodytag {
}	}

my $name = &plainname($env{'user.name'},$env{'user.domain'});	my $name = &plainname($env{'user.name'},$env{'user.domain'});
if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {	if ($public) {
undef($role);	undef($role);
} else {	} else {
$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
}	}

my $titleinfo = '<h1>'.$title.'</h1>';	my $titleinfo = '<h1>'.$title.'</h1>';
#	#
# Extra info if you are the DC	# Extra info if you are the DC
Line 4673 sub bodytag {	Line 4685 sub bodytag {
$bodytag .= qq\|<div id="LC_realm">$realm $dc_info</div>\|;	$bodytag .= qq\|<div id="LC_realm">$realm $dc_info</div>\|;

#don't show menus for public users	#don't show menus for public users
if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){	if (!$public){
$bodytag .= Apache::lonmenu::secondary_menu();	$bodytag .= Apache::lonmenu::secondary_menu();
$bodytag .= Apache::lonmenu::serverform();	$bodytag .= Apache::lonmenu::serverform();
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');	$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
Line 4867 sub standard_css {	Line 4879 sub standard_css {
my $table_header = '#DDDDDD';	my $table_header = '#DDDDDD';
my $feedback_link_bg = '#BBBBBB';	my $feedback_link_bg = '#BBBBBB';
my $lg_border_color = '#C8C8C8';	my $lg_border_color = '#C8C8C8';
	my $button_hover = '#BF2317';

my $border = ($env{'browser.type'} eq 'explorer' \|\|	my $border = ($env{'browser.type'} eq 'explorer' \|\|
$env{'browser.type'} eq 'safari' ) ? '0 2px 0 2px'	$env{'browser.type'} eq 'safari' ) ? '0 2px 0 2px'
: '0 3px 0 4px';	: '0 3px 0 4px';


return <<END;	return <<END;

/* needed for iframe to allow 100% height in FF */	/* needed for iframe to allow 100% height in FF */
Line 5134 td.LC_table_cell_checkbox {	Line 5146 td.LC_table_cell_checkbox {
vertical-align: middle;	vertical-align: middle;
}	}

	li.LC_menubuttons_inline_text img,a {
	cursor:pointer;
	}

.LC_menubuttons_link {	.LC_menubuttons_link {
text-decoration: none;	text-decoration: none;
}	}
Line 6012 ol#LC_PathBreadcrumbs a:hover,	Line 6028 ol#LC_PathBreadcrumbs a:hover,
ul#LC_secondary_menu a:hover,	ul#LC_secondary_menu a:hover,
.LC_FormSectionClearButton input:hover	.LC_FormSectionClearButton input:hover
ul.LC_TabContent li:hover a {	ul.LC_TabContent li:hover a {
color:#BF2317;	color:$button_hover;
text-decoration:none;	text-decoration:none;
}	}

Line 6163 ul#LC_secondary_menu li a {	Line 6179 ul#LC_secondary_menu li a {
}	}

ul.LC_TabContent {	ul.LC_TabContent {
min-height:1.5em;	min-height:20px;
}	}

ul.LC_TabContent li {	ul.LC_TabContent li {
Line 6171 ul.LC_TabContent li {	Line 6187 ul.LC_TabContent li {
padding: 0 10px 0 10px;	padding: 0 10px 0 10px;
background-color:$tabbg;	background-color:$tabbg;
border-bottom:solid 1px $lg_border_color;	border-bottom:solid 1px $lg_border_color;
	border-right: solid 1px $font;
}	}

ul.LC_TabContent .right {	ul.LC_TabContent .right {
Line 6184 ul.LC_TabContent li {	Line 6201 ul.LC_TabContent li {
font-size:95%;	font-size:95%;
font-weight:bold;	font-weight:bold;
padding-right: 16px;	padding-right: 16px;
	min-height:20px;
	}

	ul.LC_TabContent li a:hover {
	color: $button_hover;
	}

	ul.LC_TabContent li:hover {
	color: $button_hover;
	cursor:pointer;
}	}

ul.LC_TabContent li:hover,
ul.LC_TabContent li.active {	ul.LC_TabContent li.active {
	color: $font;
background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;	background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
border-bottom:solid 2px #FFFFFF;	border-bottom:solid 1px #FFFFFF;
padding-right: 16px;	cursor: default;
}	}

#maincoursedoc {	#maincoursedoc {
Line 10255 sub construct_course {	Line 10282 sub construct_course {
$cenv{'url'}=$oldcenv{'url'};	$cenv{'url'}=$oldcenv{'url'};
# Restore title	# Restore title
$cenv{'description'}=$oldcenv{'description'};	$cenv{'description'}=$oldcenv{'description'};
	# Restore creation date, creator and creation context.
	$cenv{'internal.created'}=$oldcenv{'internal.created'};
	$cenv{'internal.creator'}=$oldcenv{'internal.creator'};
	$cenv{'internal.creationcontext'}=$oldcenv{'internal.creationcontext'};
# Mark as cloned	# Mark as cloned
$cenv{'clonedfrom'}=$cloneid;	$cenv{'clonedfrom'}=$cloneid;
# Need to clone grading mode	# Need to clone grading mode

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.947
changed lines
	Added in v.1.948.2.2