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.818

version 1.802, 2009/05/05 16:01:50	version 1.818, 2009/05/16 07:59:09
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);
}	}
}	}
Line 4215 Inputs:	Line 4204 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 4229 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 4238 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 4360 ENDROLE	Line 4347 ENDROLE
.&Apache::lonmenu::constspaceform();	.&Apache::lonmenu::constspaceform();
}	}

my $titletable;	my $titletable = '<table id="LC_title_bar">'
if (!$notitle) {	."<tr><td> $titleinfo $dc_info</td>".$roleinfo
$titletable =	.'</tr></table>';
'<table id="LC_title_bar">'.
"<tr><td> $titleinfo $dc_info</td>".$roleinfo.	if ($no_nav_bar) {
'</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 4381 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 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 4554 sub standard_css {	Line 4528 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 4549 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 4606 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 4630 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 4666 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 {
	/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 4688 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;
}	}

table.LC_docs_path {	table.LC_docs_path {
Line 4742 table.LC_docs_path {	Line 4697 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 4709 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 .LC_title_bar_name {
margin: 0px;	margin: 0;
}	}

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

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

span.LC_metadata {	span.LC_metadata {
Line 4774 span.LC_metadata {	Line 4729 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 4754 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 4884 td.LC_menubuttons_text {	Line 4839 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 4852 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 4867 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 4895 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 5147 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 5161 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 5234 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 5284 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 5324 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 5348 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 5369 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 5487 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 5497 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 5559 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 5696 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 5714 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 5763 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 5790 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 5812 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 5850 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 5888 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 5899 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 5985 ul.LC_CourseBreadcrumbs {	Line 5945 ul.LC_CourseBreadcrumbs {
height: 20px;	height: 20px;
line-height: 20px;	line-height: 20px;
vertical-align: bottom;	vertical-align: bottom;
margin: 0px 0px 30px 0px;	margin: 0 0 30px 0;
padding-left: 10px;	padding-left: 10px;
list-style-position: inside;	list-style-position: inside;
background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
Line 5998 ul.LC_CourseBreadcrumbs li {	Line 5958 ul.LC_CourseBreadcrumbs li {
background: url(/adm/lonIcons/arrow_white.png) no-repeat left center;	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; */	/* vertical-align: bottom; */
overflow:hidden;	overflow:hidden;
}	}
Line 6055 dl.LC_ListStyleClean dd {	Line 6015 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 6024 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 6053 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 6065 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 6089 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 6114 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 6213 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 6222 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 6232 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 6246 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 6439 $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 6458 $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 6506 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 6518 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 6770 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 10239 sub escape_url {	Line 10209 sub escape_url {
return join('/',@urlslices).'/'.$lastitem;	return join('/',@urlslices).'/'.$lastitem;
}	}

# -------------------------------------------------------- Initliaze user login	# -------------------------------------------------------- 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 10263 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 10280 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 10315 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.818