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.802 and 1.823

version 1.802, 2009/05/05 16:01:50	version 1.823, 2009/05/20 17:39:06
Line 1855 sub home_server_form_item {	Line 1855 sub home_server_form_item {
if ($numlib > 1) {	if ($numlib > 1) {
$result .= '<select name="'.$name.'" />'."\n";	$result .= '<select name="'.$name.'" />'."\n";
if ($default) {	if ($default) {
$result .= '<option value="default" selected>'.&mt('default').	$result .= '<option value="default" selected="selected">'.&mt('default').
'</option>'."\n";	'</option>'."\n";
}	}
foreach my $hostid (sort(keys(%servers))) {	foreach my $hostid (sort(keys(%servers))) {
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);
}	}
}	}
return $output;	return $output;
}	}

	##############################################
	=pod

	=item * &head_subbox()

	Inputs: $content (contains HTML code with page functions, etc.)

	Returns: HTML div with $content
	To be included in page header

	=cut

	sub head_subbox {
	my ($content)=@_;
	my $output =
	'<div id="LC_head_subbox2">' #FIXME: solve conflicts with lonhtmlcommon:breadcrumbs LC_head_subbox
	.$content
	.'</div>'
	}

	##############################################
	=pod

	=item * &CSTR_pageheader()

	Inputs: ./.

	Returns: HTML div with CSTR path and recent box
	To be included on Construction Space pages

	=cut

	sub CSTR_pageheader {
	# this is for resources; directories have customtitle, and crumbs
	# and select recent are created in lonpubdir.pm
	my ($uname,$thisdisfn)=
	($env{'request.filename'} =~ m\|^/home/([^/]+)/public_html/(.*)\|);
	my $formaction='/priv/'.$uname.'/'.$thisdisfn;
	$formaction=~s/\/+/\//g;

	my $parentpath = '';
	my $lastitem = '';
	if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
	$parentpath = $1;
	$lastitem = $2;
	} else {
	$lastitem = $thisdisfn;
	}
	return
	'<div>'
	.&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
	.'<b>'.&mt('Construction Space:').'</b> '
	.'<form name="dirs" method="post" action="'.$formaction
	.'" target="_top"><tt><b>' #FIXME lonpubdir: target="_parent"
	.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."$lastitem</b></tt><br />"
	#FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />"
	.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
	.'</form>'
	.&Apache::lonmenu::constspaceform()
	.'</div>';
	}

###############################################	###############################################
###############################################	###############################################

Line 4215 Inputs:	Line 4266 Inputs:
in the title box that appears, this text	in the title box that appears, this text
is not auto translated like the $title is	is not auto translated like the $title is

=item * $notopbar, if true, keep the 'what is this' info but remove the	=item * $no_nav_bar, if true, keep the 'what is this' info but remove the
navigational links	navigational links

=item * $bgcolor, used to override the bgcolor on a webpage to a specific value	=item * $bgcolor, used to override the bgcolor on a webpage to a specific value

=item * $notitle, if true keep the nav controls, but remove the title bar

=item * $no_inline_link, if true and in remote mode, don't show the	=item * $no_inline_link, if true and in remote mode, don't show the
'Switch To Inline Menu' link	'Switch To Inline Menu' link

Line 4242 other decorations will be returned.	Line 4291 other decorations will be returned.

sub bodytag {	sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,	my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
$notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_;	$no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;

if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }	if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }

Line 4251 sub bodytag {	Line 4300 sub bodytag {
my $font = &designparm($function.'.font',$domain);	my $font = &designparm($function.'.font',$domain);
my $pgbg = $bgcolor \|\| &designparm($function.'.pgbg',$domain);	my $pgbg = $bgcolor \|\| &designparm($function.'.pgbg',$domain);

my %design = ( 'style' => 'margin-top: 0px',	my %design = ( 'style' => 'margin-top: 0',
'bgcolor' => $pgbg,	'bgcolor' => $pgbg,
'text' => $font,	'text' => $font,
'alink' => &designparm($function.'.alink',$domain),	'alink' => &designparm($function.'.alink',$domain),
Line 4333 ENDROLE	Line 4382 ENDROLE
$forcereg=1;	$forcereg=1;
}	}

if (!$customtitle && $env{'request.state'} eq 'construct') {	if (!$customtitle && $env{'request.state'} eq 'construct') {
# this is for resources; directories have customtitle, and crumbs	$titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
# and select recent are created in lonpubdir.pm	}
my ($uname,$thisdisfn)=
($env{'request.filename'} =~ m\|^/home/([^/]+)/public_html/(.*)\|);	my $titletable = '<table id="LC_title_bar">'
my $formaction='/priv/'.$uname.'/'.$thisdisfn;	."<tr><td> $titleinfo $dc_info</td>".$roleinfo
$formaction=~s/\/+/\//g;	.'</tr></table>';

my $parentpath = '';	if ($no_nav_bar) {
my $lastitem = '';
if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
$parentpath = $1;
$lastitem = $2;
} else {
$lastitem = $thisdisfn;
}
$titleinfo =
&Apache::loncommon::help_open_menu('','',3,'Authoring')
.'<b>'.&mt('Construction Space').'</b>: '
.'<form name="dirs" method="post" action="'.$formaction
.'" target="_top"><tt><b>'
.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<span class=\"LC_fontsize_big\">$lastitem</span></b></tt><br />"
.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
.'</form>'
.&Apache::lonmenu::constspaceform();
}

my $titletable;
if (!$notitle) {
$titletable =
'<table id="LC_title_bar">'.
"<tr><td> $titleinfo $dc_info</td>".$roleinfo.
'</tr></table>';
}
if ($notopbar) {
$bodytag .= $titletable;	$bodytag .= $titletable;
} else {	} else {
	$bodytag .= qq\|<div id="LC_nav_bar">$name ($role)<br />
	<em>$realm</em> $dc_info</div>\|;
if ($env{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,	$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
$titletable);	$titletable);
Line 4395 ENDROLE	Line 4420 ENDROLE
my $menu= ($no_inline_link?''	my $menu= ($no_inline_link?''
:'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');	:'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
#	#
if ($notitle) {
return $bodytag;
}
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 4450 sub make_attr_string {	Line 4472 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 4554 sub standard_css {	Line 4567 sub standard_css {
my $lg_border_color = '#C8C8C8';	my $lg_border_color = '#C8C8C8';

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


return <<END;	return <<END;
Line 4575 a:focus {	Line 4588 a:focus {
background: yellow	background: yellow
}	}

table.thinborder,
table.thinborder tr th {
border-style: solid;
border-width: 1px;
border-color: $lg_border_color;
background: $tabbg;
}

table.thinborder tr td {
border-style: solid;
border-width: 1px;
border-color: $lg_border_color;
}

form, .inline {	form, .inline {
display: inline;	display: inline;
}	}
Line 4646 div.LC_confirm_box .LC_success img {	Line 4645 div.LC_confirm_box .LC_success img {
vertical-align: middle;	vertical-align: middle;
}	}

.LC_unknown {
color: yellow;
}

.LC_icon {	.LC_icon {
border: none;	border: none;
vertical-align: middle;	vertical-align: middle;
}	}

.LC_indexer_icon {
border: 0px;
height: 22px;
}

.LC_docs_spacer {	.LC_docs_spacer {
width: 25px;	width: 25px;
height: 1px;	height: 1px;
Line 4679 div.LC_confirm_box .LC_success img {	Line 4669 div.LC_confirm_box .LC_success img {
.LC_disc_action_links_bar {	.LC_disc_action_links_bar {
background: $tabbg;	background: $tabbg;
font-family: $sans;	font-family: $sans;
border: 0px;	border: none;
margin: 4px;	margin: 4px;
}	}

Line 4715 table#LC_nav_location {	Line 4705 table#LC_nav_location {
background: $pgbg;	background: $pgbg;
border: 2px;	border: 2px;
border-collapse: separate;	border-collapse: separate;
padding: 0px;	padding: 0;
}	}

table#LC_title_bar a {	table#LC_title_bar a {
color: $fontmenu;	color: $fontmenu;
}	}

	table#LC_title_bar {
	clear: both;
	/display: none;/
	}

table#LC_title_bar,	table#LC_title_bar,
table.LC_breadcrumbs,	table.LC_breadcrumbs,
Line 4733 table#LC_title_bar.LC_with_remote {	Line 4728 table#LC_title_bar.LC_with_remote {
color: $fontmenu;	color: $fontmenu;
font-family: $sans;	font-family: $sans;
border-collapse: collapse;	border-collapse: collapse;
padding: 0px;	padding: 0;
	margin: 0;
}	}

table.LC_docs_path {	table.LC_docs_path {
Line 4742 table.LC_docs_path {	Line 4738 table.LC_docs_path {
background: $pgbg;	background: $pgbg;
font-family: $sans;	font-family: $sans;
border-collapse: collapse;	border-collapse: collapse;
padding: 0px;	padding: 0;
}	}

table#LC_title_bar td {	table#LC_title_bar td {
Line 4754 table#LC_title_bar .LC_title_bar_who {	Line 4750 table#LC_title_bar .LC_title_bar_who {
color: $fontmenu;	color: $fontmenu;
font: small $sans;	font: small $sans;
text-align: right;	text-align: right;
margin: 0px;	margin: 0;
}	}

table#LC_title_bar .LC_title_bar_name {	table#LC_title_bar div.LC_title_bar_name {
margin: 0px;	margin: 0;
}	}

table#LC_title_bar .LC_title_bar_role {	table#LC_title_bar div.LC_title_bar_role {
margin: 0px;	margin: 0;
}	}

table#LC_title_bar .LC_title_bar_realm {	table#LC_title_bar div.LC_title_bar_realm {
margin: 0px;	margin: 0;
}	}

span.LC_metadata {	span.LC_metadata {
Line 4774 span.LC_metadata {	Line 4770 span.LC_metadata {
}	}

table#LC_menubuttons img{	table#LC_menubuttons img{
border: 0px;	border: none;
}	}

table#LC_top_nav td {	table#LC_top_nav td {
background: $tabbg;	background: $tabbg;
border: 0px;	border: none;
font-size: small;	font-size: small;
vertical-align:top;	vertical-align:top;
padding:2px 5px 2px 5px;	padding:2px 5px 2px 5px;
Line 4799 table#LC_top_nav td.LC_top_nav_logo {	Line 4795 table#LC_top_nav td.LC_top_nav_logo {
}	}

table#LC_top_nav td.LC_top_nav_logo img {	table#LC_top_nav td.LC_top_nav_logo img {
border: 0px;	border: none;
vertical-align: bottom;	vertical-align: bottom;
}	}

Line 4842 table#LC_mainmenu td.LC_mainmenu_column	Line 4838 table#LC_mainmenu td.LC_mainmenu_column
font-size: 70%;	font-size: 70%;
}	}

	#LC_head_subbox {
	clear:both;
	background: $sidebg;
	border-bottom: 1px solid $lg_border_color;
	height: 32px;
	line-height: 32px;
	margin: 0;
	padding: 0;
	}

	#LC_head_subbox2 { /* FIXME: replace by LC_head_subbox once lonhtmlcommon::breadcrumbs has been fixed */
	clear:both;
	background: #F8F8F8; /* $sidebg; */
	border-bottom: 1px solid $lg_border_color;
	margin: 0 0 10px 0;
	padding: 5px;
	}

.LC_fontsize_medium {	.LC_fontsize_medium {
font-size: 85%;	font-size: 85%;
}	}
Line 4884 td.LC_menubuttons_text {	Line 4898 td.LC_menubuttons_text {
font-weight: bold;	font-weight: bold;
}	}

.LC_dropadd_labeltext {
font-family: $sans;
text-align: right;
}

.LC_preferences_labeltext {	.LC_preferences_labeltext {
font-family: $sans;	font-family: $sans;
text-align: right;	text-align: right;
Line 4902 td.LC_menubuttons_text {	Line 4911 td.LC_menubuttons_text {
font-weight: bold;	font-weight: bold;
}	}

table.LC_aboutme_port {
border: 0px;
border-collapse: collapse;
border-spacing: 0px;
}

table.LC_data_table,	table.LC_data_table,
table.LC_mail_list {	table.LC_mail_list {
border: 1px solid #000000;	border: 1px solid #000000;
Line 4923 table.LC_mail_list {	Line 4926 table.LC_mail_list {
table.LC_nested_outer {	table.LC_nested_outer {
border: 1px solid #000000;	border: 1px solid #000000;
border-collapse: collapse;	border-collapse: collapse;
border-spacing: 0px;	border-spacing: 0;
width: 100%;	width: 100%;
}	}

table.LC_nested {	table.LC_nested {
border: 0px;	border: none;
border-collapse: collapse;	border-collapse: collapse;
border-spacing: 0px;	border-spacing: 0;
width: 100%;	width: 100%;
}	}

Line 4951 table.LC_data_table tr.LC_info_row > td	Line 4954 table.LC_data_table tr.LC_info_row > td
}	}

table.LC_data_table tr.LC_odd_row > td,	table.LC_data_table tr.LC_odd_row > td,
table.LC_pick_box tr > td.LC_odd_row,	table.LC_pick_box tr > td.LC_odd_row {
table.LC_aboutme_port tr td {
background-color: $data_table_light;	background-color: $data_table_light;
padding: 2px;	padding: 2px;
}	}

table.LC_data_table tr.LC_even_row > td,	table.LC_data_table tr.LC_even_row > td,
table.LC_pick_box tr > td.LC_even_row,	table.LC_pick_box tr > td.LC_even_row {
table.LC_aboutme_port tr.LC_even_row td {
background-color: $data_table_dark;	background-color: $data_table_dark;
padding: 2px;	padding: 2px;
}	}
Line 5205 table.LC_parm_overview_restrictions th {	Line 5206 table.LC_parm_overview_restrictions th {
}	}

table#LC_helpmenu {	table#LC_helpmenu {
border: 0px;	border: none;
height: 55px;	height: 55px;
border-spacing: 0px;	border-spacing: 0;
}	}

table#LC_helpmenu fieldset legend {	table#LC_helpmenu fieldset legend {
Line 5219 table#LC_helpmenu_links {	Line 5220 table#LC_helpmenu_links {
width: 100%;	width: 100%;
border: 1px solid black;	border: 1px solid black;
background: $pgbg;	background: $pgbg;
padding: 0px;	padding: 0;
border-spacing: 1px;	border-spacing: 1px;
}	}

Line 5292 table.LC_pick_box td.LC_pick_box_select	Line 5293 table.LC_pick_box td.LC_pick_box_select
}	}

table.LC_pick_box td.LC_pick_box_separator {	table.LC_pick_box td.LC_pick_box_separator {
padding: 0px;	padding: 0;
height: 1px;	height: 1px;
background: black;	background: black;
}	}
Line 5342 table.LC_helpform_receipt td.LC_oddrow_v	Line 5343 table.LC_helpform_receipt td.LC_oddrow_v
}	}

table.LC_helpform_receipt td.LC_pick_box_separator {	table.LC_helpform_receipt td.LC_pick_box_separator {
padding: 0px;	padding: 0;
height: 1px;	height: 1px;
background: black;	background: black;
}	}
Line 5382 table.LC_group_priv_box td.LC_groups_fun	Line 5383 table.LC_group_priv_box td.LC_groups_fun

table.LC_group_priv td {	table.LC_group_priv td {
text-align: left;	text-align: left;
padding: 0px;	padding: 0;
}	}

table.LC_notify_front_page {	table.LC_notify_front_page {
Line 5406 table.LC_notify_front_page td {	Line 5407 table.LC_notify_front_page td {
background: $tabbg;	background: $tabbg;
vertical-align: middle;	vertical-align: middle;
margin: 2ex 0ex 2ex 0ex;	margin: 2ex 0ex 2ex 0ex;
	padding: 3px;
}	}

.LC_topic_bar span {	.LC_topic_bar span {
Line 5426 table.LC_status_selector td {	Line 5428 table.LC_status_selector td {
padding: 4px;	padding: 4px;
}	}

table.LC_descriptive_input td.LC_description {
vertical-align: top;
text-align: right;
font-weight: bold;
}

div.LC_feedback_link {	div.LC_feedback_link {
clear: both;	clear: both;
background: white;	background: white;
Line 5550 span.LC_cusr_subheading {	Line 5546 span.LC_cusr_subheading {

table.LC_docs_documents {	table.LC_docs_documents {
background: #BBBBBB;	background: #BBBBBB;
border-width: 0px;	border-width: 0;
border-collapse: collapse;	border-collapse: collapse;
}	}

Line 5560 table.LC_docs_documents td.LC_docs_docum	Line 5556 table.LC_docs_documents td.LC_docs_docum
}	}

.LC_docs_entry_move {	.LC_docs_entry_move {
border: 0px;	border: none;
border-collapse: collapse;	border-collapse: collapse;
}	}

Line 5622 table.LC_sty_end {	Line 5618 table.LC_sty_end {
}	}

table.LC_double_column {	table.LC_double_column {
border-width: 0px;	border-width: 0;
border-collapse: collapse;	border-collapse: collapse;
width: 100%;	width: 100%;
padding: 2px;	padding: 2px;
Line 5759 table.LC_edit_problem_header_title {	Line 5755 table.LC_edit_problem_header_title {
border-width: $border;	border-width: $border;
background: $tabbg;	background: $tabbg;
border-collapse: collapse;	border-collapse: collapse;
padding: 0px	padding: 0;
}	}

div.LC_edit_problem_discards {	div.LC_edit_problem_discards {
Line 5777 hr.LC_edit_problem_divide {	Line 5773 hr.LC_edit_problem_divide {
color: $tabbg;	color: $tabbg;
background-color: $tabbg;	background-color: $tabbg;
height: 3px;	height: 3px;
border: 0px;	border: none;
}	}

img.stift{	img.stift{
border-width:0;	border-width: 0;
vertical-align:middle;	vertical-align: middle;
}	}

table#LC_mainmenu{	table#LC_mainmenu{
Line 5826 ul.LC_TabContent li:hover a {	Line 5822 ul.LC_TabContent li:hover a {
}	}

h1 {	h1 {
padding:5px 10px 5px 20px;	padding: 0;
line-height:130%;	line-height:130%;
}	}

h2,h3,h4,h5,h6 {	h2,h3,h4,h5,h6 {
margin:5px 0px 5px 0px;	margin: 5px 0 5px 0;
padding:0px;	padding: 0;
line-height:130%;	line-height:130%;
}	}

.LC_hcell {	.LC_hcell {
padding:3px 15px 3px 15px;	padding:3px 15px 3px 15px;
margin:0px;	margin: 0;
background-color:$tabbg;	background-color:$tabbg;
color:$fontmenu;	color:$fontmenu;
border-bottom:solid 1px $lg_border_color;	border-bottom:solid 1px $lg_border_color;
}	}

.LC_noBorder {	.LC_noBorder {
border:0px;	border: 0;
}	}


Line 5853 h2,h3,h4,h5,h6 {	Line 5849 h2,h3,h4,h5,h6 {

.LC_Right {	.LC_Right {
float: right;	float: right;
margin: 0px;	margin: 0;
padding: 0px;	padding: 0;
}	}

.LC_FormSectionClearButton input {	.LC_FormSectionClearButton input {
background-color:transparent;	background-color:transparent;
border:0px;	border: none;
cursor:pointer;	cursor:pointer;
text-decoration:underline;	text-decoration:underline;
}	}
Line 5875 h2,h3,h4,h5,h6 {	Line 5871 h2,h3,h4,h5,h6 {
}	}

dl,ul,div,fieldset {	dl,ul,div,fieldset {
margin: 10px 10px 10px 0px;	margin: 10px 10px 10px 0;
overflow:hidden;	/* overflow: hidden; */
	}

	#LC_nav_bar {
	float: left;
	margin: 0;
	}

	#LC_nav_bar em{
	font-weight: bold;
	font-style: normal;
	}

	ol.LC_smallMenu {
	float: right;
}	}

ol.LC_smallMenu, ol#LC_PathBreadcrumbs {	ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
margin: 0px;	margin: 0;
}	}

ol.LC_smallMenu li {	ol.LC_smallMenu li {
display: inline;	display: inline;
padding: 5px 5px 0px 10px;	padding: 5px 5px 0 10px;
vertical-align: top;	vertical-align: top;
}	}

Line 5899 ol.LC_smallMenu a {	Line 5909 ol.LC_smallMenu a {
text-decoration: none;	text-decoration: none;
}	}

ol#LC_TabMainMenuContent,	ul#LC_TabMainMenuContent {
	clear: both;
	color: $fontmenu;
	background: $tabbg;
	list-style: none;
	padding: 0;
	margin: 0;
	float:left;
	width: 100%;
	}

	ul#LC_TabMainMenuContent li {
	float: left;
	font-weight: bold;
	line-height: 1.8em;
	padding: 0 0.8em;
	border-right: 1px solid black;
	display: inline;
	vertical-align: middle;
	}

ul.LC_TabContent ,	ul.LC_TabContent ,
ul.LC_TabContentBigger {	ul.LC_TabContentBigger {
display:block;	display:block;
list-style:none;	list-style:none;
margin: 0px;	margin: 0;
padding: 0px;	padding: 0;
}	}

ol#LC_TabMainMenuContent li,
ul.LC_TabContent li,	ul.LC_TabContent li,
ul.LC_TabContentBigger li {	ul.LC_TabContentBigger li {
display: inline;	display: inline;
Line 5918 ul.LC_TabContentBigger li {	Line 5947 ul.LC_TabContentBigger li {
white-space:nowrap;	white-space:nowrap;
}	}

ol#LC_TabMainMenuContent li {	ul#LC_TabMainMenuContent li a {
vertical-align: bottom;	color: $fontmenu;
border-bottom: solid 1px RGB(175, 175, 175);
padding: 5px 10px 5px 10px;
margin-right:5px;
margin-bottom:3px;
font-weight: bold;
background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
}

ol#LC_TabMainMenuContent li a {
color: RGB(47, 47, 47);
text-decoration: none;	text-decoration: none;
}	}

Line 5939 ul.LC_TabContent {	Line 5958 ul.LC_TabContent {

ul.LC_TabContent li {	ul.LC_TabContent li {
vertical-align:middle;	vertical-align:middle;
padding:0px 10px 0px 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;
}	}
Line 5980 ul.LC_TabContentBigger li a {	Line 5999 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: 0px 0px 30px 0px;
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: 0px 0px 0px 10px;	padding: 0 0 0 10px;
/* vertical-align: bottom; */
overflow:hidden;	overflow:hidden;
}	}

ol#LC_MenuBreadcrumbs li a, ul.LC_CourseBreadcrumbs li a {	ol#LC_MenuBreadcrumbs li a,
	ul#LC_CourseBreadcrumbs li a {
text-decoration: none;	text-decoration: none;
font-size:90%;	font-size:90%;
}	}
Line 6055 dl.LC_ListStyleClean dd {	Line 6066 dl.LC_ListStyleClean dd {
list-style-position: inside;	list-style-position: inside;
list-style-type: none;	list-style-type: none;
overflow: hidden;	overflow: hidden;
padding: 0px;	padding: 0;
}	}

.LC_ListStyleSimple li,	.LC_ListStyleSimple li,
Line 6064 dl.LC_ListStyleClean dd {	Line 6075 dl.LC_ListStyleClean dd {
.LC_ListStyleNormal dd,	.LC_ListStyleNormal dd,
.LC_ListStyleSpecial li,	.LC_ListStyleSpecial li,
.LC_ListStyleSpecial dd {	.LC_ListStyleSpecial dd {
margin: 0px;	margin: 0;
padding: 5px 5px 5px 10px;	padding: 5px 5px 5px 10px;
clear: both;	clear: both;
}	}

.LC_ListStyleClean li,	.LC_ListStyleClean li,
.LC_ListStyleClean dd {	.LC_ListStyleClean dd {
padding-top: 0px;	padding-top: 0;
padding-bottom: 0px;	padding-bottom: 0;
}	}

.LC_ListStyleSimple dd,	.LC_ListStyleSimple dd,
Line 6093 table.LC_SimpleTable {	Line 6104 table.LC_SimpleTable {
}	}

table.LC_SimpleTable tr {	table.LC_SimpleTable tr {
padding:0px;	padding: 0;
border:solid 1px $lg_border_color;	border:solid 1px $lg_border_color;
}	}

Line 6105 div.LC_columnSection {	Line 6116 div.LC_columnSection {
display: block;	display: block;
clear: both;	clear: both;
overflow: hidden;	overflow: hidden;
margin:0px;	margin: 0;
}	}

div.LC_columnSection>* {	div.LC_columnSection>* {
float: left;	float: left;
margin: 10px 20px 10px 0px;	margin: 10px 20px 10px 0;
overflow:hidden;	overflow:hidden;
}	}

Line 6129 div.LC_columnSection > .ContentBoxSpecia	Line 6140 div.LC_columnSection > .ContentBoxSpecia

.clear {	.clear {
clear: both;	clear: both;
line-height: 0px;	line-height: 0;
font-size: 0px;	font-size: 0;
height: 0px;	height: 0;
}	}

.LC_loginpage_container {	.LC_loginpage_container {
Line 6154 div.LC_columnSection > .ContentBoxSpecia	Line 6165 div.LC_columnSection > .ContentBoxSpecia
}	}

.LC_loginpage_loginContainer h2 {	.LC_loginpage_loginContainer h2 {
margin-top:0;	margin-top: 0;
display:block;	display:block;
background:$bgcol;	background:$bgcol;
color:$textcol;	color:$textcol;
Line 6253 ul#LC_toolbar li a:hover {	Line 6264 ul#LC_toolbar li a:hover {
}	}

ul#LC_toolbar {	ul#LC_toolbar {
padding:0;	padding: 0;
margin: 2px;	margin: 2px;
list-style:none;	list-style:none;
position:relative;	position:relative;
Line 6262 ul#LC_toolbar {	Line 6273 ul#LC_toolbar {

ul#LC_toolbar li {	ul#LC_toolbar li {
border:1px solid white;	border:1px solid white;
padding:0;	padding: 0;
margin: 0;	margin: 0;
float: left;	float: left;
display:inline;	display:inline;
Line 6272 ul#LC_toolbar li {	Line 6283 ul#LC_toolbar li {

a.LC_toolbarItem {	a.LC_toolbarItem {
display:block;	display:block;
padding:0;	padding: 0;
margin:0;	margin: 0;
height: 32px;	height: 32px;
width: 32px;	width: 32px;
color:white;	color:white;
border:0 none;	border: none;
background-repeat:no-repeat;	background-repeat:no-repeat;
background-color:transparent;	background-color:transparent;
}	}
Line 6286 ul.LC_functionslist li {	Line 6297 ul.LC_functionslist li {
float: left;	float: left;
white-space: nowrap;	white-space: nowrap;
height: 35px; /* at least as high as heighest list item */	height: 35px; /* at least as high as heighest list item */
margin: 0px 15px 15px 10px;	margin: 0 15px 15px 10px;
}	}


Line 6479 $args - additional optional args support	Line 6490 $args - additional optional args support

only_body -> is true will set &bodytag() onlybodytag	only_body -> is true will set &bodytag() onlybodytag
arg on	arg on
no_nav_bar -> is true will set &bodytag() notopbar arg on	no_nav_bar -> is true will set &bodytag() no_nav_bar arg on
add_entries -> additional attributes to add to the <body>	add_entries -> additional attributes to add to the <body>
domain -> force to color decorate a page for a	domain -> force to color decorate a page for a
specific domain	specific domain
Line 6498 $args - additional optional args support	Line 6509 $args - additional optional args support
is not auto translated like the $title is	is not auto translated like the $title is
frameset -> if true will start with a <frameset>	frameset -> if true will start with a <frameset>
rather than <body>	rather than <body>
no_title -> if true the title bar won't be shown
skip_phases -> hash ref of	skip_phases -> hash ref of
head -> skip the <html><head> generation	head -> skip the <html><head> generation
body -> skip all <body> generation	body -> skip all <body> generation
Line 6547 sub start_page {	Line 6557 sub start_page {
$args->{'only_body'}, $args->{'domain'},	$args->{'only_body'}, $args->{'domain'},
$args->{'force_register'}, $args->{'body_title'},	$args->{'force_register'}, $args->{'body_title'},
$args->{'no_nav_bar'}, $args->{'bgcolor'},	$args->{'no_nav_bar'}, $args->{'bgcolor'},
$args->{'no_title'}, $args->{'no_inline_link'},	$args->{'no_inline_link'},
$args);	$args);
}	}
}	}
Line 6559 sub start_page {	Line 6569 sub start_page {
$result = &html_encode($result);	$result = &html_encode($result);
}	}

#Breadcrumbs	# Preparation for new and consistent functionlist at top of screen
	# if ($args->{'functionlist'}) {
	# $result .= &build_functionlist();
	#}

	# Don't add anything more if only_body wanted
	return $result if $args->{'only_body'};

	#Breadcrumbs
if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {	if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
#if any br links exists, add them to the breadcrumbs	#if any br links exists, add them to the breadcrumbs
Line 6803 Returns either 'student','coordinator','	Line 6821 Returns either 'student','coordinator','

###############################################	###############################################
sub get_users_function {	sub get_users_function {
my $function = 'student';	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 6821 sub get_users_function {	Line 6842 sub get_users_function {

=pod	=pod

	=item * &show_course()

	Used by lonmenu.pm and lonroles.pm to determine whether to use the word
	'Courses' or 'Roles' in inline navigation and on screen displaying user's roles.

	Inputs:
	None

	Outputs:
	Scalar: 1 if 'Course' to be used, 0 otherwise.

	=cut

	###############################################
	sub show_course {
	my $course = !$env{'user.adv'};
	if (!$env{'user.adv'}) {
	foreach my $env (keys(%env)) {
	next if ($env !~ m/^user\.priv\./);
	if ($env !~ m/^user\.priv\.(?:st\|cm)/) {
	$course = 0;
	last;
	}
	}
	}
	return $course;
	}

	###############################################

	=pod

=item * &check_user_status()	=item * &check_user_status()

Determines current status of supplied role for a	Determines current status of supplied role for a
Line 10239 sub escape_url {	Line 10292 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 10293 sub init_user_environment {	Line 10362 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 10323 sub init_user_environment {	Line 10379 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 10360 sub init_user_environment {	Line 10414 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') {

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

Removed from v.1.802
changed lines
	Added in v.1.823