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.913 and 1.934

version 1.913, 2009/11/10 13:58:55	version 1.934, 2010/01/30 13:06:42
Line 483 ENDAUTHORBRW	Line 483 ENDAUTHORBRW

sub coursebrowser_javascript {	sub coursebrowser_javascript {
my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;	my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;
my $wintitle = &mt('Course Browser');	my $wintitle = 'Course_Browser';
if ($crstype ne '') {	if ($crstype eq 'Community') {
$wintitle = &mt($crstype);	$wintitle = 'Community_Browser';
}	}
my $id_functions = &javascript_index_functions();	my $id_functions = &javascript_index_functions();
my $output = '	my $output = '
Line 1127 sub help_open_topic {	Line 1127 sub help_open_topic {
$template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'	$template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
.'<img src="'.$helpicon.'" border="0"'	.'<img src="'.$helpicon.'" border="0"'
.' alt="'.&mt('Help: [_1]',$topic).'"'	.' alt="'.&mt('Help: [_1]',$topic).'"'
.' title="'.$title.'"'	.' title="'.$title.'" style="vertical-align:middle;"'
.' /></a>';	.' /></a>';
if ($text ne "") {	if ($text ne "") {
$template.='</span>';	$template.='</span>';
Line 1719 sub create_workbook {	Line 1719 sub create_workbook {
my $workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);	my $workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
if (! defined($workbook)) {	if (! defined($workbook)) {
$r->log_error("Error creating excel spreadsheet $filename: $!");	$r->log_error("Error creating excel spreadsheet $filename: $!");
$r->print('<p>'.&mt("Unable to create new Excel file. ".	$r->print(
"This error has been logged. ".	'<p class="LC_error">'
"Please alert your LON-CAPA administrator").	.&mt('Problems occurred in creating the new Excel file.')
'</p>');	.' '.&mt('This error has been logged.')
	.' '.&mt('Please alert your LON-CAPA administrator.')
	.'</p>'
	);
return (undef);	return (undef);
}	}
#	#
Line 1762 sub create_text_file {	Line 1765 sub create_text_file {
$fh = Apache::File->new('>/home/httpd'.$filename);	$fh = Apache::File->new('>/home/httpd'.$filename);
if (! defined($fh)) {	if (! defined($fh)) {
$r->log_error("Couldn't open $filename for output $!");	$r->log_error("Couldn't open $filename for output $!");
$r->print(&mt('Problems occurred in creating the output file. '	$r->print(
.'This error has been logged. '	'<p class="LC_error">'
.'Please alert your LON-CAPA administrator.'));	.&mt('Problems occurred in creating the output file.')
	.' '.&mt('This error has been logged.')
	.' '.&mt('Please alert your LON-CAPA administrator.')
	.'</p>'
	);
}	}
return ($fh,$filename)	return ($fh,$filename)
}	}
Line 1877 sub select_form {	Line 1884 sub select_form {
$selectform.=	$selectform.=
'<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.	'<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.
($key eq $def ? 'selected="selected" ' : '').	($key eq $def ? 'selected="selected" ' : '').
">".&mt($hash{$key})."</option>\n";	">".$hash{$key}."</option>\n";
}	}
$selectform.="</select>";	$selectform.="</select>";
return $selectform;	return $selectform;
Line 4367 sub CSTR_pageheader {	Line 4374 sub CSTR_pageheader {
} else {	} else {
$lastitem = $thisdisfn;	$lastitem = $thisdisfn;
}	}
return
	my $output =
'<div>'	'<div>'
.&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?	.&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
.'<b>'.&mt('Construction Space:').'</b> '	.'<b>'.&mt('Construction Space:').'</b> '
.'<form name="dirs" method="post" action="'.$formaction	.'<form name="dirs" method="post" action="'.$formaction
.'" target="_top"><tt><b>' #FIXME lonpubdir: target="_parent"	.'" target="_top">' #FIXME lonpubdir: target="_parent"
.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."$lastitem</b></tt><br />"	.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv',undef,undef);

	if ($lastitem) {
	$output .=
	'<span class="LC_filename">'
	.$lastitem
	.'</span>';
	}
	$output .=
	'<br />'
#FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</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()')	.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
.'</form>'	.'</form>'
.&Apache::lonmenu::constspaceform()	.&Apache::lonmenu::constspaceform()
.'</div>';	.'</div>';

	return $output;
}	}

###############################################	###############################################
Line 4503 sub bodytag {	Line 4522 sub bodytag {
$env{'course.'.$env{'request.course.id'}.	$env{'course.'.$env{'request.course.id'}.
'.domain'}.'/'})) {	'.domain'}.'/'})) {
my $cid = $env{'request.course.id'};	my $cid = $env{'request.course.id'};
$dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};	$dc_info = $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
$dc_info =~ s/\s+$//;	$dc_info =~ s/\s+$//;
$dc_info = '('.$dc_info.')';
}	}

$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;	$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
Line 4513 sub bodytag {	Line 4531 sub bodytag {

if ($env{'environment.remote'} eq 'off') {	if ($env{'environment.remote'} eq 'off') {
# No Remote	# No Remote
if ($no_nav_bar) { return $bodytag; }	if ($no_nav_bar \|\| $env{'form.inhibitmenu'} eq 'yes') {
	return $bodytag;
	}

if ($env{'request.state'} eq 'construct') { $forcereg=1; }	if ($env{'request.state'} eq 'construct') { $forcereg=1; }

Line 4521 sub bodytag {	Line 4541 sub bodytag {
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls	# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
# }	# }

$bodytag .= qq\|<div id="LC_nav_bar">$name $role<br />
<em>$realm</em> $dc_info</div>\| unless $env{'form.inhibitmenu'};

if ( $env{'form.inhibitmenu'} eq 'yes'
\|\| $ENV{'REQUEST_URI'} eq '/adm/logout'
\|\| $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {

	if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
	if ($dc_info) {
	$dc_info = qq\|<span class="LC_cusr_subheading">$dc_info</span>\|;
	}
	$bodytag .= qq\|<div id="LC_nav_bar">$name $role<br />
	<em>$realm</em> $dc_info</div>\|;
return $bodytag;	return $bodytag;
}	}

	unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
	$bodytag .= qq\|<div id="LC_nav_bar">$name $role</div>\|;
	}

$bodytag .= Apache::lonhtmlcommon::scripttag(	$bodytag .= Apache::lonhtmlcommon::scripttag(
Apache::lonmenu::utilityfunctions(), 'start');	Apache::lonmenu::utilityfunctions(), 'start');

$bodytag .= Apache::lonmenu::primary_menu();	$bodytag .= Apache::lonmenu::primary_menu();

	if ($dc_info) {
	$dc_info = &dc_courseid_toggle($dc_info);
	}
	$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($env{'user.name'} ne 'public' && $env{'user.domain'} ne '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');
$bodytag .= Apache::lonmenu::innerregister($forcereg) if $forcereg;	if ($env{'request.state'} eq 'construct') {
	$bodytag .= &Apache::lonmenu::innerregister($forcereg,'',
	$args->{'bread_crumbs'});
	} elsif ($forcereg) {
	$bodytag .= &Apache::lonmenu::innerregister($forcereg);
	}
}else{	}else{
# this is to seperate menu from content when there's no secondary	# this is to seperate menu from content when there's no secondary
# menu. Especially needed for public accessible ressources.	# menu. Especially needed for public accessible ressources.
Line 4549 sub bodytag {	Line 4584 sub bodytag {
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');	$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
}	}

#SD testing
#$bodytag .= Apache::lonmenu::menubuttons($forcereg);
return $bodytag;	return $bodytag;
}	}

Line 4567 sub bodytag {	Line 4600 sub bodytag {
# Explicit link to get inline menu	# Explicit link to get inline menu
my $menu= ($no_inline_link?''	my $menu= ($no_inline_link?''
:'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');	:'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');
$bodytag .= qq\|<div id="LC_nav_bar">$name $role
<em>$realm</em> $dc_info </div>	if ($dc_info) {
	$dc_info = qq\|<span class="LC_cusr_subheading">($dc_info)</span>\|;
	}

	$bodytag .= qq\|<div id="LC_nav_bar">$name $role</div>
<ol class="LC_primary_menu LC_right">	<ol class="LC_primary_menu LC_right">
<li>$menu</li>	<li>$menu</li>
</ol>\| unless $env{'form.inhibitmenu'};	</ol><div id="LC_realm"> $realm $dc_info</div>\| unless $env{'form.inhibitmenu'};
#
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 4585 $bodytag	Line 4621 $bodytag
ENDBODY	ENDBODY
}	}

	sub dc_courseid_toggle {
	my ($dc_info) = @_;
	return ' <span id="dccidtext" class="LC_cusr_subheading">'.
	'<a href="javascript:showCourseID();">'.
	&mt('(More ...)').'</a></span>'.
	'<div id="dccid" class="LC_dccid">'.$dc_info.'</div>';
	}

sub make_attr_string {	sub make_attr_string {
my ($register,$attr_ref) = @_;	my ($register,$attr_ref) = @_;

Line 4731 body {	Line 4775 body {
color:$font;	color:$font;
}	}

a:link,
a:visited {
font-size:100%;
}

a:focus {	a:focus {
color: red;	color: red;
background: yellow;	background: yellow;
Line 4762 form, .inline {	Line 4801 form, .inline {
.LC_filename {	.LC_filename {
font-family: $mono;	font-family: $mono;
white-space:pre;	white-space:pre;
	font-size: 120%;
}	}

.LC_fileicon {	.LC_fileicon {
Line 4852 table.LC_pastsubmission {	Line 4892 table.LC_pastsubmission {
margin: 2px;	margin: 2px;
}	}

table#LC_top_nav,	table#LC_menubuttons {
table#LC_menubuttons,
table#LC_nav_location {
width: 100%;	width: 100%;
background: $pgbg;	background: $pgbg;
border: 2px;	border: 2px;
Line 4872 table#LC_title_bar {	Line 4910 table#LC_title_bar {
}	}

table#LC_title_bar,	table#LC_title_bar,
table.LC_breadcrumbs,	table.LC_breadcrumbs, /* obsolete? */
table#LC_title_bar.LC_with_remote {	table#LC_title_bar.LC_with_remote {
width: 100%;	width: 100%;
border-color: $pgbg;	border-color: $pgbg;
Line 4885 table#LC_title_bar.LC_with_remote {	Line 4923 table#LC_title_bar.LC_with_remote {
margin: 0;	margin: 0;
}	}

/* #SD START (work in progress)*/	ul.LC_breadcrumb_tools_outerlist {

ul.LC_bct {
margin: 0;	margin: 0;
padding: 0;	padding: 0;
	position: relative;
	list-style: none;
}	}
ul.LC_bct ol {	ul.LC_breadcrumb_tools_outerlist li {
display: inline;
}
ul.LC_bct ul {
display: inline;
padding: 0;
}
ul.LC_bct li {
list-style-type: none;
display: inline;	display: inline;
}	}

	.LC_breadcrumb_tools_navigation {
ul.LC_breadcrumb_tools {	padding: 0;
}	margin: 0;
	float: left;
li.LC_breadcrumb_tools {
}
li.LC_breadcrumb_tools img{
vertical-align: middle;
}

.LC_breadcrumb_tools_A {
margin: 0 0 0 1em;
}
.LC_breadcrumb_tools_B {
float: right;
margin-top: 0.4em;
}	}
.LC_breadcrumb_tools_C {	.LC_breadcrumb_tools_tools {
margin: 0 1em 0 0;	padding: 0;
	margin: 0;
float: right;	float: right;
}	}
/* #SD END */

table#LC_title_bar td {	table#LC_title_bar td {
background: $tabbg;	background: $tabbg;
Line 4934 table#LC_menubuttons img {	Line 4952 table#LC_menubuttons img {
border: none;	border: none;
}	}

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

table#LC_top_nav td a,
div#LC_top_nav a {
color: $font;
}

table#LC_top_nav td.LC_top_nav_logo {
background: $tabbg;
text-align: left;
white-space: nowrap;
width: 31px;
}

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

table#LC_top_nav td.LC_top_nav_exit,
table#LC_top_nav td.LC_top_nav_help {
width: 2.0em;
}

table#LC_top_nav td.LC_top_nav_login {
width: 4.0em;
text-align: center;
}

.LC_breadcrumbs_component {	.LC_breadcrumbs_component {
float: right;	float: right;
margin: 0 1em;	margin: 0 1em;
Line 4981 td.LC_table_cell_checkbox {	Line 4964 td.LC_table_cell_checkbox {
text-align: center;	text-align: center;
}	}

table#LC_mainmenu td.LC_mainmenu_column {
vertical-align: top;
}

.LC_fontsize_small {	.LC_fontsize_small {
font-size: 70%;	font-size: 70%;
}	}
Line 4994 table#LC_mainmenu td.LC_mainmenu_column	Line 4973 table#LC_mainmenu td.LC_mainmenu_column
background: $sidebg;	background: $sidebg;
border-bottom: 1px solid $lg_border_color;	border-bottom: 1px solid $lg_border_color;
line-height: 2.5em;	line-height: 2.5em;
/* SD working here	overflow: hidden;
height: 2.5em;
overflow: hidden; */
margin: 0;	margin: 0;
padding: 0;	padding: 0;
}	}
Line 5009 table#LC_mainmenu td.LC_mainmenu_column	Line 4986 table#LC_mainmenu td.LC_mainmenu_column
#LC_head_subbox {	#LC_head_subbox {
clear:both;	clear:both;
background: #F8F8F8; /* $sidebg; */	background: #F8F8F8; /* $sidebg; */
border-bottom: 1px solid $lg_border_color;	border: 1px solid $sidebg;
margin: 0 0 10px 0;	margin: 0 0 10px 0;
padding: 5px;
}	}

.LC_fontsize_medium {	.LC_fontsize_medium {
Line 5028 table#LC_mainmenu td.LC_mainmenu_column	Line 5004 table#LC_mainmenu td.LC_mainmenu_column
padding-left:3px;	padding-left:3px;
}	}

	.LC_menubuttons_inline_text img{
	vertical-align: middle;
	}

.LC_menubuttons_link {	.LC_menubuttons_link {
text-decoration: none;	text-decoration: none;
}	}
Line 5047 td.LC_menubuttons_text {	Line 5027 td.LC_menubuttons_text {
background: $tabbg;	background: $tabbg;
}	}

.LC_new_mail {
background: $tabbg;
font-weight: bold;
}

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 5079 table.LC_nested {	Line 5054 table.LC_nested {
width: 100%;	width: 100%;
}	}

	.ui-accordion,
	.ui-accordion table.LC_data_table,
	.ui-accordion table.LC_nested_outer{
	border: 0px;
	border-spacing: 0px;
	margin: 3px;
	}

table.LC_data_table tr th,	table.LC_data_table tr th,
table.LC_calendar tr th,	table.LC_calendar tr th,
table.LC_mail_list tr th,	table.LC_mail_list tr th,
Line 5188 table.LC_nested tr td.LC_right_item {	Line 5171 table.LC_nested tr td.LC_right_item {
text-align: right;	text-align: right;
}	}

	.ui-accordion table.LC_nested tr.LC_odd_row td.LC_left_item,
	.ui-accordion table.LC_nested tr.LC_even_row td.LC_left_item {
	text-align: right;
	width: 40%;
	padding-right:10px;
	vertical-align: top;
	padding: 5px;
	}

	.ui-accordion table.LC_nested tr.LC_odd_row td.LC_right_item,
	.ui-accordion table.LC_nested tr.LC_even_row td.LC_right_item {
	text-align: left;
	width: 60%;
	padding: 2px 4px;
	}

table.LC_nested tr.LC_odd_row td {	table.LC_nested tr.LC_odd_row td {
background-color: #EEEEEE;	background-color: #EEEEEE;
}	}
Line 5208 table.LC_createuser tr.LC_info_row td {	Line 5207 table.LC_createuser tr.LC_info_row td {
table.LC_calendar {	table.LC_calendar {
border: 1px solid #000000;	border: 1px solid #000000;
border-collapse: collapse;	border-collapse: collapse;
	width: 98%;
}	}

table.LC_calendar_pickdate {	table.LC_calendar_pickdate {
Line 5217 table.LC_calendar_pickdate {	Line 5217 table.LC_calendar_pickdate {
table.LC_calendar tr td {	table.LC_calendar tr td {
border: 1px solid #000000;	border: 1px solid #000000;
vertical-align: top;	vertical-align: top;
	width: 14%;
}	}

table.LC_calendar tr td.LC_calendar_day_empty {	table.LC_calendar tr td.LC_calendar_day_empty {
Line 5235 table.LC_mail_list tr.LC_mail_new:hover	Line 5236 table.LC_mail_list tr.LC_mail_new:hover
background-color: $mail_new_hover;	background-color: $mail_new_hover;
}	}

table.LC_mail_list tr.LC_mail_even {
}

table.LC_mail_list tr.LC_mail_odd {
}

table.LC_mail_list tr.LC_mail_read {	table.LC_mail_list tr.LC_mail_read {
background-color: $mail_read;	background-color: $mail_read;
}	}
Line 5520 table.LC_notify_front_page td {	Line 5515 table.LC_notify_front_page td {

.LC_topic_bar {	.LC_topic_bar {
font-weight: bold;	font-weight: bold;
width: 100%;
background: $tabbg;	background: $tabbg;
vertical-align: middle;	margin: 1em 0em 1em 2em;
margin: 2ex 0ex 2ex 0ex;
padding: 3px;	padding: 3px;
	font-size: 1.2em;
}	}

.LC_topic_bar span {	.LC_topic_bar span {
	left: 0.5em;
	position: absolute;
vertical-align: middle;	vertical-align: middle;
}	font-size: 1.2em;

.LC_topic_bar img {
vertical-align: bottom;
}	}

table.LC_course_group_status {	table.LC_course_group_status {
Line 5644 span.LC_prior_string,	Line 5637 span.LC_prior_string,
span.LC_prior_custom,	span.LC_prior_custom,
span.LC_prior_reaction,	span.LC_prior_reaction,
span.LC_prior_math {	span.LC_prior_math {
font-family: monospace;	font-family: $mono;
white-space: pre;	white-space: pre;
}	}

span.LC_prior_string {	span.LC_prior_string {
font-family: monospace;	font-family: $mono;
white-space: pre;	white-space: pre;
}	}

Line 5682 span.LC_cusr_subheading {	Line 5675 span.LC_cusr_subheading {
font-size: 85%;	font-size: 85%;
}	}

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

table.LC_docs_documents td.LC_docs_document {
border: 2px solid black;
padding: 4px;
}

div.LC_docs_entry_move {	div.LC_docs_entry_move {
border: 1px solid #BBBBBB;	border: 1px solid #BBBBBB;
background: #DDDDDD;	background: #DDDDDD;
Line 5893 img.stift {	Line 5875 img.stift {
vertical-align: middle;	vertical-align: middle;
}	}

table#LC_mainmenu {	table td.LC_mainmenu_col_fieldset {
margin-top:10px;
width:80%;
}

table#LC_mainmenu td.LC_mainmenu_col_fieldset {
vertical-align: top;	vertical-align: top;
width: 45%;
}

.LC_mainmenu_fieldset_category {
color: $font;
background: $pgbg;
font-size: small;
font-weight: bold;
}	}

div.LC_createcourse {	div.LC_createcourse {
margin: 10px 10px 10px 10px;	margin: 10px 10px 10px 10px;
}	}

	.LC_dccid {
	margin: 0.2em 0 0 0;
	padding: 0;
	font-size: 90%;
	display:none;
	}

/* ---- Remove when done ----	/* ---- Remove when done ----
# The following styles is part of the redesign of LON-CAPA and are	# The following styles is part of the redesign of LON-CAPA and are
# subject to change during this project.	# subject to change during this project.
Line 5963 h6 {	Line 5939 h6 {
border: 0;	border: 0;
}	}

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

.LC_FormSectionClearButton input {	.LC_FormSectionClearButton input {
background-color:transparent;	background-color:transparent;
border: none;	border: none;
Line 6001 fieldset > legend {	Line 5971 fieldset > legend {

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

	#LC_realm {
margin: 0.2em 0 0 0;	margin: 0.2em 0 0 0;
	padding: 0;
	font-weight: bold;
	text-align: center;
}	}

#LC_nav_bar em {	#LC_nav_bar em {
Line 6011 fieldset > legend {	Line 5988 fieldset > legend {

ol.LC_primary_menu {	ol.LC_primary_menu {
float: right;	float: right;
margin: 0.2em 0 0 0;	margin: 0;
	}

	span.LC_new_message{
	font-weight:bold;
	color: darkred;
}	}

ol#LC_PathBreadcrumbs {	ol#LC_PathBreadcrumbs {
Line 6026 ol.LC_primary_menu li {	Line 6008 ol.LC_primary_menu li {

ol.LC_primary_menu li img {	ol.LC_primary_menu li img {
vertical-align: bottom;	vertical-align: bottom;
	height: 1.1em;
}	}

ol.LC_primary_menu a {	ol.LC_primary_menu a {
font-size: 90%;
color: RGB(80, 80, 80);	color: RGB(80, 80, 80);
text-decoration: none;	text-decoration: none;
}	}
Line 6167 ol#LC_MenuBreadcrumbs,	Line 6149 ol#LC_MenuBreadcrumbs,
ol#LC_PathBreadcrumbs {	ol#LC_PathBreadcrumbs {
padding-left: 10px;	padding-left: 10px;
margin: 0;	margin: 0;
list-style-position: inside;	height: 2.5em; /* equal to #LC_breadcrumbs line-height */
/* SD working here
white-space: nowrap; */
}	}

ol#LC_MenuBreadcrumbs li,	ol#LC_MenuBreadcrumbs li,
ol#LC_PathBreadcrumbs li,	ol#LC_PathBreadcrumbs li,
ul.LC_CourseBreadcrumbs li {	ul.LC_CourseBreadcrumbs li {
display: inline;	display: inline;
white-space: nowrap;	white-space: normal;
/* SD working here
white-space: normal; */
}	}

ol#LC_MenuBreadcrumbs li a,	ol#LC_MenuBreadcrumbs li a,
Line 6219 dl.LC_ListStyleClean dd {	Line 6197 dl.LC_ListStyleClean dd {
.LC_ListStyleClean,	.LC_ListStyleClean,
.LC_ListStyleSimple,	.LC_ListStyleSimple,
.LC_ListStyleNormal,	.LC_ListStyleNormal,
.LC_ListStyle_Border,
.LC_ListStyleSpecial {	.LC_ListStyleSpecial {
/* display:block; */	/* display:block; */
list-style-position: inside;	list-style-position: inside;
Line 6354 table.LC_tableOfContent a {	Line 6331 table.LC_tableOfContent a {
text-decoration: none;	text-decoration: none;
}	}

table.LC_tableBrowseRes tr.LC_trOdd,
table.LC_tableOfContent tr.LC_trOdd {
background-color: #EEEEEE;
}

table.LC_tableOfContent img {	table.LC_tableOfContent img {
border: none;	border: none;
height: 1.3em;	height: 1.3em;
Line 6432 a.LC_toolbarItem {	Line 6404 a.LC_toolbarItem {
background-color:transparent;	background-color:transparent;
}	}

	ul.LC_funclist {
	margin: 0;
	padding: 0.5em 1em 0.5em 0;
	}

	ul.LC_funclist > li:first-child {
	font-weight:bold;
	margin-left:0.8em;
	}

	ul.LC_funclist + ul.LC_funclist {
	/*
	left border as a seperator if we have more than
	one list
	*/
	border-left: 1px solid $sidebg;
	/*
	this hides the left border behind the border of the
	outer box if element is wrapped to the next 'line'
	*/
	margin-left: -1px;
	}

ul.LC_funclist li {	ul.LC_funclist li {
float: left;	display: inline;
white-space: nowrap;	white-space: nowrap;
height: 35px; /* at least as high as heighest list item */	margin: 0 0 0 25px;
margin: 0 15px 15px 10px;	line-height: 150%;
}	}

	.ui-accordion .LC_advanced_toggle {
	float: right;
	font-size: 90%;
	padding: 0px 4px
	}

END	END
}	}
Line 6715 sub start_page {	Line 6715 sub start_page {
# Don't add anything more if only_body wanted	# Don't add anything more if only_body wanted
return $result if $args->{'only_body'};	return $result if $args->{'only_body'};

	#Breadcrumbs for Construction Space provided by &bodytag.
	if (($env{'environment.remote'} eq 'off') && ($env{'request.state'} eq 'construct')) {
	return $result;
	}

#Breadcrumbs	#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();
Line 9593 sub extract_categories {	Line 9598 sub extract_categories {
my $trailstr;	my $trailstr;
if ($name eq 'instcode') {	if ($name eq 'instcode') {
$trailstr = &mt('Official courses (with institutional codes)');	$trailstr = &mt('Official courses (with institutional codes)');
	} elsif ($name eq 'communities') {
	$trailstr = &mt('Communities');
} else {	} else {
$trailstr = $name;	$trailstr = $name;
}	}
Line 9705 cathash - reference to hash of categorie	Line 9712 cathash - reference to hash of categorie

currcat - scalar with an & separated list of categories assigned to a course.	currcat - scalar with an & separated list of categories assigned to a course.

	type - scalar contains course type (Course or Community).

Returns: $output (markup to be displayed)	Returns: $output (markup to be displayed)

=cut	=cut

sub assign_categories_table {	sub assign_categories_table {
my ($cathash,$currcat) = @_;	my ($cathash,$currcat,$type) = @_;
my $output;	my $output;
if (ref($cathash) eq 'HASH') {	if (ref($cathash) eq 'HASH') {
my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);	my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
Line 9719 sub assign_categories_table {	Line 9728 sub assign_categories_table {
if (@cats > 0) {	if (@cats > 0) {
my $itemcount = 0;	my $itemcount = 0;
if (ref($cats[0]) eq 'ARRAY') {	if (ref($cats[0]) eq 'ARRAY') {
$output = &Apache::loncommon::start_data_table();
my @currcategories;	my @currcategories;
if ($currcat ne '') {	if ($currcat ne '') {
@currcategories = split('&',$currcat);	@currcategories = split('&',$currcat);
}	}
	my $table;
for (my $i=0; $i<@{$cats[0]}; $i++) {	for (my $i=0; $i<@{$cats[0]}; $i++) {
my $parent = $cats[0][$i];	my $parent = $cats[0][$i];
my $css_class = $itemcount%2?' class="LC_odd_row"':'';
next if ($parent eq 'instcode');	next if ($parent eq 'instcode');
	if ($type eq 'Community') {
	next unless ($parent eq 'communities');
	} else {
	next if ($parent eq 'communities');
	}
	my $css_class = $itemcount%2?' class="LC_odd_row"':'';
my $item = &escape($parent).'::0';	my $item = &escape($parent).'::0';
my $checked = '';	my $checked = '';
if (@currcategories > 0) {	if (@currcategories > 0) {
Line 9735 sub assign_categories_table {	Line 9749 sub assign_categories_table {
$checked = ' checked="checked"';	$checked = ' checked="checked"';
}	}
}	}
$output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.	my $parent_title = $parent;
'<input type="checkbox" name="usecategory" value="'.	if ($parent eq 'communities') {
$item.'"'.$checked.' />'.$parent.'</span>'.	$parent_title = &mt('Communities');
'<input type="hidden" name="catname" value="'.$parent.'" /></td>';	}
	$table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
	'<input type="checkbox" name="usecategory" value="'.
	$item.'"'.$checked.' />'.$parent_title.'</span>'.
	'<input type="hidden" name="catname" value="'.$parent.'" /></td>';
my $depth = 1;	my $depth = 1;
push(@path,$parent);	push(@path,$parent);
$output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);	$table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
pop(@path);	pop(@path);
$output .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';	$table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
$itemcount ++;	$itemcount ++;
}	}
$output .= &Apache::loncommon::end_data_table();	if ($itemcount) {
	$output = &Apache::loncommon::start_data_table().
	$table.
	&Apache::loncommon::end_data_table();
	}
}	}
}	}
}	}

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

Removed from v.1.913
changed lines
	Added in v.1.934