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.711 and 1.742

version 1.711, 2008/12/08 22:43:52	version 1.742, 2009/02/05 00:45:29
Line 943 ENDTEMPLATE	Line 943 ENDTEMPLATE
# This is a quicky function for Latex cheatsheet editing, since it	# This is a quicky function for Latex cheatsheet editing, since it
# appears in at least four places	# appears in at least four places
sub helpLatexCheatsheet {	sub helpLatexCheatsheet {
my $other = shift;	my ($topic,$text,$not_author) = @_;
	my $out;
my $addOther = '';	my $addOther = '';
if ($other) {	if ($topic) {
$addOther = Apache::loncommon::help_open_topic($other, shift,	$addOther = &Apache::loncommon::help_open_topic($topic,$text,
undef, undef, 600) .	undef, undef, 600).
'</td><td>';	'</td><td>';
}	}
return '<table><tr><td>'.	$out = '<table><tr><td>'.
$addOther .	$addOther .
&Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),	&Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
undef,undef,600)	undef,undef,600).
.'</td><td>'.	'</td><td>'.
&Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),	&Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
undef,undef,600)	undef,undef,600).
.'</td><td>'.	'</td>';
&Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),	unless ($not_author) {
undef,undef,600)	$out .= '<td>'.
.'</td></tr></table>';	&Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
	undef,undef,600).
	'</td>';
	}
	$out .= '</tr></table>';
	return $out;
}	}

sub general_help {	sub general_help {
Line 1629 sub multiple_select_form {	Line 1635 sub multiple_select_form {
$size = scalar(keys(%$hash));	$size = scalar(keys(%$hash));
}	}
}	}
$output.="\n<select name='$name' size='$size' multiple='1'>";	$output.="\n".'<select name="'.$name.'" size="'.$size.'" multiple="multiple">';
my @order;	my @order;
if (ref($order) eq 'ARRAY') {	if (ref($order) eq 'ARRAY') {
@order = @{$order};	@order = @{$order};
Line 1686 sub select_form {	Line 1692 sub select_form {
sub display_filter {	sub display_filter {
if (!$env{'form.show'}) { $env{'form.show'}=10; }	if (!$env{'form.show'}) { $env{'form.show'}=10; }
if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }	if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
return '<nobr><label>'.&mt('Records [_1]',	return '<span class="LC_nobreak"><label>'.&mt('Records [_1]',
&Apache::lonmeta::selectbox('show',$env{'form.show'},undef,	&Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
(&mt('all'),10,20,50,100,1000,10000))).	(&mt('all'),10,20,50,100,1000,10000))).
'</label></nobr> <nobr>'.	'</label></span> <span class="LC_nobreak">'.
&mt('Filter [_1]',	&mt('Filter [_1]',
&select_form($env{'form.displayfilter'},	&select_form($env{'form.displayfilter'},
'displayfilter',	'displayfilter',
('currentfolder' => 'Current folder/page',	('currentfolder' => 'Current folder/page',
'containing' => 'Containing phrase',	'containing' => 'Containing phrase',
'none' => 'None'))).	'none' => 'None'))).
'<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';	'<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></span>';
}	}

sub gradeleveldescription {	sub gradeleveldescription {
Line 2717 sub flush_email_cache {	Line 2723 sub flush_email_cache {
&Apache::lonnet::devalidate_cache_new('emailscache',$id);	&Apache::lonnet::devalidate_cache_new('emailscache',$id);
}	}

	# -------------------------------------------------------------------- getlangs

	=pod

	=item * &getlangs($uname,$udom)

	Gets a user's language preference and returns it as a hash with key:
	language.

	=cut


	sub getlangs {
	my ($uname,$udom) = @_;
	if (!$udom) { $udom =$env{'user.domain'}; }
	if (!$uname) { $uname=$env{'user.name'}; }
	my $id=$uname.':'.$udom;
	my ($langs,$cached)=&Apache::lonnet::is_cached_new('userlangs',$id);
	if ($cached) {
	return %{$langs};
	} else {
	my %loadlangs=&Apache::lonnet::get('environment',['languages'],
	$udom,$uname);
	&Apache::lonnet::do_cache_new('userlangs',$id,\%loadlangs);
	return %loadlangs;
	}
	}

	sub flush_langs_cache {
	my ($uname,$udom)=@_;
	if (!$udom) { $udom =$env{'user.domain'}; }
	if (!$uname) { $uname=$env{'user.name'}; }
	return if ($udom eq 'public' && $uname eq 'public');
	my $id=$uname.':'.$udom;
	&Apache::lonnet::devalidate_cache_new('userlangs',$id);
	}

# ------------------------------------------------------------------ Screenname	# ------------------------------------------------------------------ Screenname

=pod	=pod
Line 3030 sub languages {	Line 3073 sub languages {
return $preferred_possibilities[0];	return $preferred_possibilities[0];
}	}

	sub user_lang {
	my ($touname,$toudom,$fromcid) = @_;
	my @userlangs;
	if (($fromcid ne '') && ($env{'course.'.$fromcid.'.languages'} ne '')) {
	@userlangs=(@userlangs,split(/\s(\,\|\;\|\:)\s/,
	$env{'course.'.$fromcid.'.languages'}));
	} else {
	my %langhash = &getlangs($touname,$toudom);
	if ($langhash{'languages'} ne '') {
	@userlangs = split(/\s(\,\|\;\|\:)\s/,$langhash{'languages'});
	} else {
	my %domdefs = &Apache::lonnet::get_domain_defaults($toudom);
	if ($domdefs{'lang_def'} ne '') {
	@userlangs = ($domdefs{'lang_def'});
	}
	}
	}
	my @languages=&Apache::lonlocal::get_genlanguages(@userlangs);
	my $user_lh = Apache::localize->get_handle(@languages);
	return $user_lh;
	}


###############################################################	###############################################################
## Student Answer Attempts ##	## Student Answer Attempts ##
###############################################################	###############################################################
Line 3168 sub relative_to_absolute {	Line 3234 sub relative_to_absolute {
}	}
$thisdir=~s-/[^/]*$--;	$thisdir=~s-/[^/]*$--;
foreach my $link (@rlinks) {	foreach my $link (@rlinks) {
unless (($link=~/^http:\/\//i) \|\|	unless (($link=~/^https?\:\/\//i) \|\|
($link=~/^\//) \|\|	($link=~/^\//) \|\|
($link=~/^javascript:/i) \|\|	($link=~/^javascript:/i) \|\|
($link=~/^mailto:/i) \|\|	($link=~/^mailto:/i) \|\|
Line 4392 sub standard_css {	Line 4458 sub standard_css {
my $link = &designparm($function.'.link', $domain);	my $link = &designparm($function.'.link', $domain);

my $loginbg = &designparm('login.sidebg',$domain);	my $loginbg = &designparm('login.sidebg',$domain);
	my $bgcol = &designparm('login.bgcol',$domain);
	my $textcol = &designparm('login.textcol',$domain);

my $sans = 'Verdana,Arial,Helvetica,sans-serif';	my $sans = 'Verdana,Arial,Helvetica,sans-serif';
my $mono = 'monospace';	my $mono = 'monospace';
Line 4441 table.thinborder tr td {	Line 4509 table.thinborder tr td {
}	}

form, .inline { display: inline; }	form, .inline { display: inline; }
.center { text-align: center; }
.left { text-align:left; }	.LC_center { text-align: center; }
.right {text-align:right;}	.LC_left { text-align:left; }
.middle {vertical-align:middle;}	.LC_right {text-align:right;}
.top {vertical-align:top;}	.LC_middle {vertical-align:middle;}
.bottom {vertical-align:bottom;}	.LC_top {vertical-align:top;}
	.LC_bottom {vertical-align:bottom;}

	/* just for tests */
	.LC_300Box { width:300px; }
	.LC_200Box {width:200px; }
	.LC_500Box {width:500px; }
	.LC_600Box {width:600px; }
	.LC_800Box {width:800px;}
	/* end */

.LC_filename {font-family: $mono; white-space:pre;}	.LC_filename {font-family: $mono; white-space:pre;}
.LC_error {	.LC_error {
color: red;	color: red;
Line 4480 form, .inline { display: inline; }	Line 4558 form, .inline { display: inline; }
}	}

.LC_internal_info {	.LC_internal_info {
color: #999;	color: #999999;
}	}

table.LC_pastsubmission {	table.LC_pastsubmission {
Line 4665 td.LC_menubuttons_text {	Line 4743 td.LC_menubuttons_text {
font-size: small;	font-size: small;
}	}

	.LC_mail_functions {
	font-weight: bold;
	}

table.LC_aboutme_port {	table.LC_aboutme_port {
border: 0px;	border: 0px;
border-collapse: collapse;	border-collapse: collapse;
Line 4698 table.LC_prior_tries tr th {	Line 4780 table.LC_prior_tries tr th {
font-size:90%;	font-size:90%;
}	}
table.LC_data_table tr.LC_info_row > td {	table.LC_data_table tr.LC_info_row > td {
background-color: #CCC;	background-color: #CCCCCC;
font-weight: bold;	font-weight: bold;
text-align: left;	text-align: left;
}	}
Line 4746 table.LC_nested_outer tr td.LC_subheader	Line 4828 table.LC_nested_outer tr td.LC_subheader
text-align: right;	text-align: right;
}	}
table.LC_nested tr.LC_info_row td {	table.LC_nested tr.LC_info_row td {
background-color: #CCC;	background-color: #CCCCCC;
font-weight: bold;	font-weight: bold;
font-size: small;	font-size: small;
text-align: center;	text-align: center;
Line 4756 table.LC_nested_outer tr th.LC_left_item	Line 4838 table.LC_nested_outer tr th.LC_left_item
text-align: left;	text-align: left;
}	}
table.LC_nested td {	table.LC_nested td {
background-color: #FFF;	background-color: #FFFFFF;
font-size: small;	font-size: small;
}	}
table.LC_nested_outer tr th.LC_right_item,	table.LC_nested_outer tr th.LC_right_item,
Line 4767 table.LC_nested tr td.LC_right_item {	Line 4849 table.LC_nested tr td.LC_right_item {
}	}

table.LC_nested tr.LC_odd_row td {	table.LC_nested tr.LC_odd_row td {
background-color: #EEE;	background-color: #EEEEEE;
}	}

table.LC_createuser {	table.LC_createuser {
Line 4778 table.LC_createuser tr.LC_section_row td	Line 4860 table.LC_createuser tr.LC_section_row td
}	}

table.LC_createuser tr.LC_info_row td {	table.LC_createuser tr.LC_info_row td {
background-color: #CCC;	background-color: #CCCCCC;
font-weight: bold;	font-weight: bold;
text-align: center;	text-align: center;
}	}
Line 4968 table.LC_pick_box td.LC_pick_box_title {	Line 5050 table.LC_pick_box td.LC_pick_box_title {
background: $tabbg;	background: $tabbg;
font-weight: bold;	font-weight: bold;
text-align: right;	text-align: right;
	vertical-align: top;
width: 184px;	width: 184px;
padding: 8px;	padding: 8px;
}	}
Line 5209 table.LC_docs_documents td.LC_docs_docum	Line 5292 table.LC_docs_documents td.LC_docs_docum
padding: 4px;	padding: 4px;
}	}

.LC_docs_course_commands div {
float: left;
border: 4px solid #AAAAAA;
padding: 4px;
background: #DDDDCC;
}

.LC_docs_entry_move {	.LC_docs_entry_move {
border: 0px;	border: 0px;
border-collapse: collapse;	border-collapse: collapse;
Line 5442 table#LC_mainmenu td.LC_mainmenu_col_fie	Line 5518 table#LC_mainmenu td.LC_mainmenu_col_fie
font-weight: bold;	font-weight: bold;
}	}

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

/* ---- 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 5450 table#LC_mainmenu td.LC_mainmenu_col_fie	Line 5530 table#LC_mainmenu td.LC_mainmenu_col_fie
# --------------------------*/	# --------------------------*/

a:hover,	a:hover,
ol.smallMenu a:hover,	ol.LC_smallMenu a:hover,
ol#MenuBreadcrumbs a:hover,	ol#LC_MenuBreadcrumbs a:hover,
ul#TabMainMenuContent a:hover,	ol#LC_PathBreadcrumbs a:hover,
.FormSectionClearButton input:hover{	ul#LC_TabMainMenuContent a:hover,
	.LC_FormSectionClearButton input:hover
	ul.LC_TabContent li:hover a{
color:#BF2317;	color:#BF2317;
text-decoration:none;	text-decoration:none;
}	}

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

h2,h3,h4,h5,h6	h2,h3,h4,h5,h6
{	{
margin:5px 0px 5px 0px;	margin:5px 0px 5px 0px;
line-height:130%;	padding:0px;
	line-height:130%;
}	}
.hcell{	.LC_hcell{
padding:3px 15px 3px 15px;	padding:3px 15px 3px 15px;
margin:0px;	margin:0px;
background-color:$tabbg;	background-color:$tabbg;
border-bottom:solid 1px $lg_border_color;	border-bottom:solid 1px $lg_border_color;
}	}
.noBorder {	.LC_noBorder {
border:0px;	border:0px;
}	}
/*
.bgLightGrey { background:URL(images/TabMenuBG.png) repeat-x left top; }	.LC_bgLightGrey{
.bgLightGreyYellow {background-color:#EFECE0;}	background:URL(/adm/lonIcons/lightGreyBG.png) repeat-x left bottom;
*/	}


/* Main Header with discription of Person, Course, etc. */	/* Main Header with discription of Person, Course, etc. */
.HeadRight {	.LC_HeadRight {
text-align: right;	text-align: right;
float: right;	float: right;
margin: 0px;	margin: 0px;
Line 5494 line-height:130%;	Line 5577 line-height:130%;
overflow:hidden;	overflow:hidden;
}	}

p {	p, .LC_ContentBox {
padding: 10px;	padding: 10px;

}	}
.FormSectionClearButton input {	.LC_FormSectionClearButton input {
background-color:transparent;	background-color:transparent;
border:0px;	border:0px;
cursor:pointer;	cursor:pointer;
text-decoration:underline;	text-decoration:underline;
Line 5510 dl,ul,div,fieldset {	Line 5593 dl,ul,div,fieldset {
margin: 10px 10px 10px 0px;	margin: 10px 10px 10px 0px;
overflow:hidden;	overflow:hidden;
}	}
ol.smallMenu {	ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
margin: 0px;	margin: 0px;
}	}

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

ol.smallMenu li img {	ol.LC_smallMenu li img {
vertical-align: bottom;	vertical-align: bottom;
}	}

ol.smallMenu a {	ol.LC_smallMenu a {
font-size: 90%;	font-size: 90%;
color: RGB(80, 80, 80);	color: RGB(80, 80, 80);
text-decoration: none;	text-decoration: none;
}	}
	ol#LC_TabMainMenueContent, ul.LC_TabContent,
ol#TabMainMenuContent {	ul.LC_TabContentBigger {
	display:block;
margin: 0px 0px 10px 0px;	list-style:none;
	margin: 0px;
padding: 0px;	padding: 0px;
}	}

ol#TabMainMenuContent li {	ol#LC_TabMainMenuContent li, ul.LC_TabContent,
	ul.LC_TabContentBigger li{
display: inline;	display: inline;
	border-right: solid 1px $lg_border_color;
	float:left;
	line-height:140%;
	white-space:nowrap;
	}
	ol#LC_TabMainMenuContent li{
vertical-align: bottom;	vertical-align: bottom;
border-bottom: solid 1px RGB(175, 175, 175);	border-bottom: solid 1px RGB(175, 175, 175);
border-right: solid 1px RGB(175, 175, 175);	padding: 5px 10px 5px 10px;
padding: 5px 15px 5px 15px;	margin-right:5px;
margin-right:4px;	margin-bottom:3px;
line-height: 140%;
font-weight: bold;	font-weight: bold;
overflow:hidden;	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
/* background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left top;*/
}	}

ol#TabMainMenuContent li a{	ol#LC_TabMainMenuContent li a{
color: RGB(47, 47, 47);	color: RGB(47, 47, 47);
text-decoration: none;	text-decoration: none;
}	}
	ul.LC_TabContent {
	min-height:1.6em;
	border-bottom:solid 1px $lg_border_color;
	}
	ul.LC_TabContent li{
	vertical-align:middle;
	padding:0px 10px 0px 10px;
	}
	ul.LC_TabContent li a, ul.LC_TabContent li{
	color:rgb(47,47,47);
	text-decoration:none;
	font-size:95%;
	font-weight:bold;
	}
	ul.LC_TabContentBigger li{
	vertical-align:bottom;
	border-top:solid 1px $lg_border_color;
	border-left:solid 1px $lg_border_color;
	padding:5px 10px 5px 10px;
	margin-left:2px;
	background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
	}
	ul.LC_TabContentBigger li, ul.LC_TabContentBigger li a{
	font-size:110%;
	font-weight:bold;
	}
	#LC_CourseDocuments, #LC_SupplementalCourseDocuments
	{
	margin:0px;
	}

ol#TabMainMenuContent div.columnSection {	.LC_hideThis
margin-bottom: 0px;	{
	display:none;
	visibility:hidden;
}	}

ol#MenuBreadcrumbs, ol#PathBreadcrumbs {	ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs {
border-top: solid 1px RGB(255, 255, 255);	border-top: solid 1px RGB(255, 255, 255);
height: 20px;	height: 20px;
line-height: 20px;	line-height: 20px;
Line 5566 ol#MenuBreadcrumbs, ol#PathBreadcrumbs {	Line 5687 ol#MenuBreadcrumbs, ol#PathBreadcrumbs {
margin: 0px 0px 30px 0px;	margin: 0px 0px 30px 0px;
padding-left: 10px;	padding-left: 10px;
list-style-position: inside;	list-style-position: inside;
/* background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
top;*/
}	}

ol#MenuBreadcrumbs li, ol#PathBreadcrumbs li {	ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li {
/* background: url(images/pfeil_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: 0px 0px 0px 10px;
vertical-align: bottom;	vertical-align: bottom;
overflow:hidden;	overflow:hidden;
}	}

ol#MenuBreadcrumbs li a {	ol#LC_MenuBreadcrumbs li a {
text-decoration: none;	text-decoration: none;
font-size:90%;	font-size:90%;
}	}
ol#PathBreadcrumbs li a{	ol#LC_PathBreadcrumbs li a{
text-decoration:none;	text-decoration:none;
font-size:100%;	font-size:100%;
font-weight:bold;	font-weight:bold;
}	}
	.LC_ContentBoxSpecial
.ContentBoxSpecial
{	{
border: solid 1px $lg_border_color;	border: solid 1px $lg_border_color;
}	}
.ContentBox {
padding:10px;
}
.PopUp
{
padding:10px;
border-left:solid 1px $lg_border_color;
border-top:solid 1px $lg_border_color;
border-bottom:outset 1px $lg_border_color;
border-right:outset 1px $lg_border_color;
display:none;
position:absolute;
right:0;
background-color:white;
z-index:5;
}

dl.ListStyleClean dt {	dl.LC_ListStyleClean dt {
padding-right: 5px;	padding-right: 5px;
display: table-header-group;	display: table-header-group;
}	}

dl.ListStyleClean dd {	dl.LC_ListStyleClean dd {
display: table-row;	display: table-row;
}	}

.ListStyleClean,	.LC_ListStyleClean,
.ListStyleSimple,	.LC_ListStyleSimple,
.ListStyleNormal,	.LC_ListStyleNormal,
.ListStyleNormal_Border,	.LC_ListStyleNormal_Border,
.ListStyleSpecial	.LC_ListStyleSpecial
{	{
/display:block; /	/display:block; /
list-style-position: inside;	list-style-position: inside;
Line 5631 dl.ListStyleClean dd {	Line 5736 dl.ListStyleClean dd {
padding: 0px;	padding: 0px;
}	}

.ListStyleSimple li,	.LC_ListStyleSimple li,
.ListStyleSimple dd,	.LC_ListStyleSimple dd,
.ListStyleNormal li,	.LC_ListStyleNormal li,
.ListStyleNormal dd,	.LC_ListStyleNormal dd,
.ListStyleSpecial li,	.LC_ListStyleSpecial li,
.ListStyleSpecial dd	.LC_ListStyleSpecial dd
{	{
margin: 0px;	margin: 0px;
padding: 5px 5px 5px 10px;	padding: 5px 5px 5px 10px;
clear: both;	clear: both;
}	}

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

.ListStyleSimple dd,	.LC_ListStyleSimple dd,
.ListStyleSimple li{	.LC_ListStyleSimple li{
border-bottom: solid 1px $lg_border_color;	border-bottom: solid 1px $lg_border_color;
}	}

.ListStyleSpecial li,	.LC_ListStyleSpecial li,
.ListStyleSpecial dd {	.LC_ListStyleSpecial dd {
list-style-type: none;	list-style-type: none;
background-color: RGB(220, 220, 220);	background-color: RGB(220, 220, 220);
margin-bottom: 4px;	margin-bottom: 4px;
}	}

table.SimpleTable {	table.LC_SimpleTable {
margin:5px;	margin:5px;
border:solid 1px $lg_border_color;	border:solid 1px $lg_border_color;
}	}

table.SimpleTable tr {	table.LC_SimpleTable tr {
padding:0px;	padding:0px;
border:solid 1px $lg_border_color;	border:solid 1px $lg_border_color;
}	}
table.SimpleTable thead{	table.LC_SimpleTable thead{
background:rgb(220,220,220);	background:rgb(220,220,220);
}	}

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

div.columnSection>* {	div.LC_columnSection>* {
float: left;	float: left;
margin: 10px 20px 10px 0px;	margin: 10px 20px 10px 0px;
overflow:hidden;	overflow:hidden;
}	}
div.columnSection > .ContentBox,	div.LC_columnSection > .LC_ContentBox,
div.columnSection > .ContentBoxSpecial	div.LC_columnSection > .LC_ContentBoxSpecial
{	{
width: 400px;	width: 400px;
	}

	.ContentBoxSpecialTemplate
	{
	border: solid 1px $lg_border_color;
	}
	.ContentBoxTemplate {
	padding:10px;
	}

	div.LC_columnSection > .ContentBoxTemplate,
	div.LC_columnSection > .ContentBoxSpecialTemplate
	{
	width: 600px;

	}

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

.LC_loginpage_container {	.LC_loginpage_container {
Line 5699 div.columnSection > .ContentBoxSpecial	Line 5825 div.columnSection > .ContentBoxSpecial
width:65%;	width:65%;
padding: 10px;	padding: 10px;
height: auto;	height: auto;
# background-color:#FFFFFF;	background-color:#FFFFFF;
background-color:$loginbg;
border:1px solid #CCCCCC;	border:1px solid #CCCCCC;
}	}


.LC_loginpage_loginContainer {	.LC_loginpage_loginContainer {
float:left;	float:left;
width:60%;	width: 182px;
	border:1px solid #CCCCCC;
	background-color:$loginbg;
}	}

	.LC_loginpage_loginContainer h2{
	margin-top:0;
	display:block;
	background:$bgcol;
	color:$textcol;
	padding-left:5px;
	}
.LC_loginpage_loginInfo {	.LC_loginpage_loginInfo {
margin-top:20px;
margin-left:20px;	margin-left:20px;
float:left;	float:left;
width:30%;	width:30%;
Line 5719 div.columnSection > .ContentBoxSpecial	Line 5852 div.columnSection > .ContentBoxSpecial
padding:10px;	padding:10px;
}	}

	.LC_loginpage_loginDomain {
	margin-right:20px;
	width:20%;
	float:left;
	padding:10px;
	}

.LC_loginpage_space {	.LC_loginpage_space {
clear:both;	clear:both;
margin-bottom:20px;	margin-bottom:20px;
border-bottom: 1px solid #CCCCCC;	border-bottom: 1px solid #CCCCCC;
}	}

.LC_loginpage_fieldset{
border: 1px solid #CCCCCC;
margin: 0 auto;
}

.LC_loginpage_legend{
padding: 2px;
margin: 0px;
font-size:14px;
font-weight:bold;
}



END	END
}	}

Line 6002 sub start_page {	Line 6128 sub start_page {
}	}

if ($args->{'js_ready'}) {	if ($args->{'js_ready'}) {
$result = &js_ready($result);	$result = &js_ready($result);
}	}
if ($args->{'html_encode'}) {	if ($args->{'html_encode'}) {
$result = &html_encode($result);	$result = &html_encode($result);
	}

	if (exists($args->{'bread_crumbs'})) {
	&Apache::lonhtmlcommon::clear_breadcrumbs();
	if (ref($args->{'bread_crumbs'}) eq 'ARRAY') {
	foreach my $crumb (@{$args->{'bread_crumbs'}}){
	&Apache::lonhtmlcommon::add_breadcrumb($crumb);
	}
	}
	$result .= &Apache::lonhtmlcommon::breadcrumbs();
}	}

return $result;	return $result;
}	}

Line 7854 sub upfile_select_html {	Line 7991 sub upfile_select_html {
# xml => &mt('HTML/XML'),	# xml => &mt('HTML/XML'),
);	);
my $Str = '<input type="file" name="upfile" size="50" />'.	my $Str = '<input type="file" name="upfile" size="50" />'.
'<br />Type: <select name="upfiletype">';	'<br />'.&mt('Type').': <select name="upfiletype">';
foreach my $type (sort(keys(%Types))) {	foreach my $type (sort(keys(%Types))) {
$Str .= '<option value="'.$type.'" >'.$Types{$type}."</option>\n";	$Str .= '<option value="'.$type.'" >'.$Types{$type}."</option>\n";
}	}
Line 7942 sub csv_print_select_table {	Line 8079 sub csv_print_select_table {
&end_data_table_header_row()."\n");	&end_data_table_header_row()."\n");
foreach my $array_ref (@$d) {	foreach my $array_ref (@$d) {
my ($value,$display,$defaultcol)=@{ $array_ref };	my ($value,$display,$defaultcol)=@{ $array_ref };
$r->print(&start_data_table_row().'<tr><td>'.$display.'</td>');	$r->print(&start_data_table_row().'<td>'.$display.'</td>');

$r->print('<td><select name=f'.$i.	$r->print('<td><select name=f'.$i.
' onchange="javascript:flip(this.form,'.$i.');">');	' onchange="javascript:flip(this.form,'.$i.');">');
Line 9278 sub construct_course {	Line 9415 sub construct_course {
'policy.email',	'policy.email',
'comment.email',	'comment.email',
'pch.users.denied',	'pch.users.denied',
'plc.users.denied'],	'plc.users.denied',
	'hidefromcat',
	'categories'],
$$crsudom,$$crsunum);	$$crsudom,$$crsunum);
}	}

Line 9736 sub init_user_environment {	Line 9875 sub init_user_environment {
}	}
}	}

	foreach my $tool ('aboutme','blog','portfolio') {
	$userenv{'availabletools.'.$tool} =
	&Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
	}

$env{'user.environment'} = "$lonids/$cookie.id";	$env{'user.environment'} = "$lonids/$cookie.id";

if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
Line 9774 sub _add_to_env {	Line 9918 sub _add_to_env {
# --- Get the symbolic name of a problem and the url	# --- Get the symbolic name of a problem and the url
sub get_symb {	sub get_symb {
my ($request,$silent) = @_;	my ($request,$silent) = @_;
(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;	(my $url=$env{'form.url'}) =~ s-^https?\://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;
my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));	my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
if ($symb eq '') {	if ($symb eq '') {
if (!$silent) {	if (!$silent) {
Line 9801 sub get_annotation {	Line 9945 sub get_annotation {
}	}

sub clean_symb {	sub clean_symb {
my ($symb) = @_;	my ($symb,$delete_enc) = @_;

&Apache::lonenc::check_decrypt(\$symb);	&Apache::lonenc::check_decrypt(\$symb);
my $enc = $env{'request.enc'};	my $enc = $env{'request.enc'};
delete($env{'request.enc'});	if ($delete_enc) {
	delete($env{'request.enc'});
	}

return ($symb,$enc);	return ($symb,$enc);
}	}

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

Removed from v.1.711
changed lines
	Added in v.1.742