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.375 and 1.394

version 1.375, 2006/05/18 01:08:50	version 1.394, 2006/06/23 03:14:00
Line 386 sub selectstudent_link {	Line 386 sub selectstudent_link {

sub coursebrowser_javascript {	sub coursebrowser_javascript {
my ($domainfilter)=@_;	my ($domainfilter)=@_;
	my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
return (<<ENDSTDBRW);	return (<<ENDSTDBRW);
<script type="text/javascript" language="Javascript" >	<script type="text/javascript" language="Javascript" >
var stdeditbrowser;	var stdeditbrowser;
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag) {	function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
var url = '/adm/pickcourse?';	var url = '/adm/pickcourse?';
var filter;	var filter;
if (filter != null) {	if (filter != null) {
Line 415 sub coursebrowser_javascript {	Line 416 sub coursebrowser_javascript {
if (multflag !=null && multflag != '') {	if (multflag !=null && multflag != '') {
url += '&multiple='+multflag;	url += '&multiple='+multflag;
}	}
	if (crstype == 'Course/Group') {
	if (formname == 'cu') {
	crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
	if (crstype == "") {
	alert("$crs_or_grp_alert");
	return;
	}
	}
	}
	if (crstype !=null && crstype != '') {
	url += '&type='+crstype;
	}
var title = 'Course_Browser';	var title = 'Course_Browser';
var options = 'scrollbars=1,resizable=1,menubar=0';	var options = 'scrollbars=1,resizable=1,menubar=0';
options += ',width=700,height=600';	options += ',width=700,height=600';
Line 426 ENDSTDBRW	Line 439 ENDSTDBRW
}	}

sub selectcourse_link {	sub selectcourse_link {
my ($form,$unameele,$udomele,$desc,$extra_element,$multflag)=@_;	my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.	return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
'","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'");'."'>".&mt('Select Course')."</a>";	'","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select [_1]',$selecttype)."</a>";
}	}

sub check_uncheck_jscript {	sub check_uncheck_jscript {
Line 717 sub help_open_menu {	Line 730 sub help_open_menu {
} else {	} else {
$link = "javascript:helpMenu('display')";	$link = "javascript:helpMenu('display')";
}	}
my $banner_link = "/adm/helpmenu?page=banner&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";	my $banner_link = "/adm/helpmenu?page=banner&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";	my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";
my $template;	my $template;
if ($text ne "") {	if ($text ne "") {
$template .=	$template .=
Line 803 sub help_open_bug {	Line 816 sub help_open_bug {
$topic=~s/\W+/\+/g;	$topic=~s/\W+/\+/g;
my $link='';	my $link='';
my $template='';	my $template='';
my $url=$Apache::lonnet::perlvar{'BugzillaHost'}.'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.	my $url=$Apache::lonnet::perlvar{'BugzillaHost'}.'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.
&escape($ENV{'REQUEST_URI'}).'&component='.$topic;	&escape($ENV{'REQUEST_URI'}).'&component='.$topic;
if (!$stayOnPage)	if (!$stayOnPage)
{	{
$link = "javascript:void(open('$url', 'Bugzilla', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";	$link = "javascript:void(open('$url', 'Bugzilla', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
Line 2813 sub bodytag {	Line 2826 sub bodytag {
@$addentries{keys(%design)} = @design{keys(%design)};	@$addentries{keys(%design)} = @design{keys(%design)};

# role and realm	# role and realm
my ($role,$realm) =	my ($role,$realm) = split(/\./,$env{'request.role'},2);
&Apache::lonnet::plaintext((split(/\./,$env{'request.role'}))[0]);	if ($role eq 'ca') {
	my ($rdom,$rname) = ($realm =~ m-^/(\w+)/(\w+)$-);
	$realm = &plainname($rname,$rdom).':'.$rdom;
	}
# realm	# realm
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
	if ($env{'request.role'} !~ /^cr/) {
	$role = &Apache::lonnet::plaintext($role,&course_type());
	}
$realm = $env{'course.'.$env{'request.course.id'}.'.description'};	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
	} else {
	$role = &Apache::lonnet::plaintext($role);
}	}
if (!$realm) { $realm=' '; }	if (!$realm) { $realm=' '; }
# Set messages	# Set messages
Line 2878 ENDROLE	Line 2899 ENDROLE
'.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 = '('.$dc_info.')';	$dc_info = '('.$dc_info.')';
}	}

Line 3076 sub standard_css {	Line 3098 sub standard_css {
my $tabbg = &designparm($function.'.tabbg', $domain);	my $tabbg = &designparm($function.'.tabbg', $domain);
my $font = &designparm($function.'.font', $domain);	my $font = &designparm($function.'.font', $domain);
my $sidebg = &designparm($function.'.sidebg',$domain);	my $sidebg = &designparm($function.'.sidebg',$domain);
my $pgbg = $bgcolor \|\|	my $pgbg_or_bgcolor =
	$bgcolor \|\|
&designparm($function.'.pgbg', $domain);	&designparm($function.'.pgbg', $domain);
	my $pgbg = &designparm($function.'.pgbg', $domain);
my $alink = &designparm($function.'.alink', $domain);	my $alink = &designparm($function.'.alink', $domain);
my $vlink = &designparm($function.'.vlink', $domain);	my $vlink = &designparm($function.'.vlink', $domain);
my $link = &designparm($function.'.link', $domain);	my $link = &designparm($function.'.link', $domain);
Line 3095 sub standard_css {	Line 3119 sub standard_css {
my $mail_replied_hover = '#888855';	my $mail_replied_hover = '#888855';
my $mail_other = '#99BBBB';	my $mail_other = '#99BBBB';
my $mail_other_hover = '#669999';	my $mail_other_hover = '#669999';
	my $table_header = '#DDDDDD';

	my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
	: '0px 3px 0px 4px';
return <<END;	return <<END;
h1, h2, h3, th { font-family: $sans }	h1, h2, h3, th { font-family: $sans }
a:focus { color: red; background: yellow }	a:focus { color: red; background: yellow }
Line 3103 table.thinborder { border-collapse: coll	Line 3130 table.thinborder { border-collapse: coll
table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}	table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}
form, .inline { display: inline; }	form, .inline { display: inline; }
.center { text-align: center; }	.center { text-align: center; }
.filename {font-family: monospace;}	.LC_filename {font-family: monospace;}
.LC_error {	.LC_error {
color: red;	color: red;
font-size: larger;	font-size: larger;
}	}
	.LC_warning {
	color: red;
	}
.LC_success {	.LC_success {
color: green;	color: green;
}	}

table#LC_top_nav, table#LC_menubuttons, table#LC_nav_location, table#LC_breadcrumbs {	table#LC_top_nav, table#LC_menubuttons {
width: 100%;	width: 100%;
background: $pgbg;	background: $pgbg;
border: 0px;	border: 2px;
border-spacing: 2px 1px;	border-collapse: seperate;
padding: 0px;
margin: 0px;
border-collapse: separate;
}
table#LC_title_bar {
width: 100%;
border: 0;
border-spacing: 0px 1px;
padding: 0px 2px 0px 2px;
background: $pgbg;
font-family: $sans;
border-collapse: separate;
}	}

	table#LC_title_bar, table#LC_breadcrumbs, table#LC_nav_location,
table#LC_title_bar.LC_with_remote {	table#LC_title_bar.LC_with_remote {
width: 100%;	width: 100%;
border: 0;	border-color: $pgbg;
border-spacing: 0;	border-style: solid;
	border-width: $border;

background: $pgbg;	background: $pgbg;
font-family: $sans;	font-family: $sans;
border-collapse: collapse;	border-collapse: collapse;
}	}

table#LC_title_bar td {	table#LC_title_bar td {
padding: 3px;	padding: 3px;
background: $tabbg;	background: $tabbg;
Line 3174 table#LC_menubuttons img, table#LC_menub	Line 3197 table#LC_menubuttons img, table#LC_menub
}	}
table#LC_top_nav td {	table#LC_top_nav td {
background: $tabbg;	background: $tabbg;
	border: 0px;
}	}
table#LC_top_nav td a, div#LC_top_nav a {	table#LC_top_nav td a, div#LC_top_nav a {
color: $font;	color: $font;
Line 3196 table#LC_breadcrumbs td.LC_breadcrumb_co	Line 3220 table#LC_breadcrumbs td.LC_breadcrumb_co
font-size: larger;	font-size: larger;
text-align: right;	text-align: right;
}	}
	td.LC_table_cell_checkbox {
	text-align: center;
	}

.LC_menubuttons_inline_text {	.LC_menubuttons_inline_text {
color: $font;	color: $font;
font-family: $sans;	font-family: $sans;
Line 3278 table.LC_mail_list tr.LC_mail_other {	Line 3306 table.LC_mail_list tr.LC_mail_other {
table.LC_mail_list tr.LC_mail_other:hover {	table.LC_mail_list tr.LC_mail_other:hover {
background-color: $mail_other_hover;	background-color: $mail_other_hover;
}	}

	table#LC_portfolio_actions {
	width: auto;
	background: $pgbg;
	border: 0px;
	border-spacing: 2px 2px;
	padding: 0px;
	margin: 0px;
	border-collapse: separate;
	}
	table#LC_portfolio_actions td.LC_label {
	background: $tabbg;
	text-align: right;
	}
	table#LC_portfolio_actions td.LC_value {
	background: $tabbg;
	}

	table#LC_cstr_controls {
	width: 100%;
	border-collapse: collapse;
	}
	table#LC_cstr_controls tr td {
	border: 4px solid $pgbg;
	padding: 4px;
	text-align: center;
	background: $tabbg;
	}
	table#LC_cstr_controls tr th {
	border: 4px solid $pgbg;
	background: $table_header;
	text-align: center;
	font-family: $sans;
	font-size: smaller;
	}

	table#LC_browser {

	}
	table#LC_browser tr th {
	background: $table_header;
	}
	table#LC_browser tr td {
	padding: 2px;
	}
	table#LC_browser tr.LC_browser_file,
	table#LC_browser tr.LC_browser_file_published {
	background: #CCFF88;
	}
	table#LC_browser tr.LC_browser_file_locked,
	table#LC_browser tr.LC_browser_file_unpublished {
	background: #FFAA99;
	}
	table#LC_browser tr.LC_browser_file_obsolete {
	background: #AAAAAA;
	}
	table#LC_browser tr.LC_browser_file_modified {
	background: #FFFF77;
	}
	table#LC_browser tr.LC_browser_folder {
	background: #CCCCFF;
	}
	span.LC_current_location {
	font-size: x-large;
	background: $pgbg;
	}

END	END
}	}

Line 3314 sub headtag {	Line 3409 sub headtag {
my $function = $args->{'function'} \|\| &get_users_function();	my $function = $args->{'function'} \|\| &get_users_function();
my $domain = $args->{'domain'} \|\| &determinedomain();	my $domain = $args->{'domain'} \|\| &determinedomain();
my $bgcolor = $args->{'bgcolor'} \|\| &designparm($function.'.pgbg',$domain);	my $bgcolor = $args->{'bgcolor'} \|\| &designparm($function.'.pgbg',$domain);
my $url = join(':',$env{'user.name'},$env{'user.domain'},	my $url = join(':',$env{'user.name'},$env{'user.domain'},time(),
$env{'environment.color.timestamp'},	#$env{'environment.color.timestamp'},
$function,$domain,$bgcolor);	$function,$domain,$bgcolor);

$url = '/adm/css/'.&escape($url).'.css';	$url = '/adm/css/'.&escape($url).'.css';
Line 3643 sub simple_error_page {	Line 3738 sub simple_error_page {
my $row_count;	my $row_count;
sub start_data_table {	sub start_data_table {
undef($row_count);	undef($row_count);
return '<table class="LC_data_table">';	return '<table class="LC_data_table">'."\n";
}	}

sub end_data_table {	sub end_data_table {
undef($row_count);	undef($row_count);
return '</table>';	return '</table>'."\n";;
}	}

sub start_data_table_row {	sub start_data_table_row {
$row_count++;	$row_count++;
return '<tr '.(($row_count % 2)?'':'class="LC_even_row"').'>';	return '<tr '.(($row_count % 2)?'':'class="LC_even_row"').'>'."\n";;
}	}

sub end_data_table_row {	sub end_data_table_row {
return '</tr>';	return '</tr>'."\n";;
}	}

sub start_data_table_header_row {	sub start_data_table_header_row {
return '<tr class="LC_header_row">';	return '<tr class="LC_header_row">'."\n";;
}	}

sub end_data_table_header_row {	sub end_data_table_header_row {
return '</tr>';	return '</tr>'."\n";;
}	}
}	}

Line 3947 sub get_user_info {	Line 4042 sub get_user_info {
return;	return;
}	}

	sub get_secgrprole_info {
	my ($cdom,$cnum,$needroles,$type) = @_;
	my %sections_count = &get_sections($cdom,$cnum);
	my @sections = (sort {$a <=> $b} keys(%sections_count));
	my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
	my @groups = sort(keys(%curr_groups));
	my $allroles = [];
	my $rolehash;
	my $accesshash = {
	active => 'Currently has access',
	future => 'Will have future access',
	previous => 'Previously had access',
	};
	if ($needroles) {
	$rolehash = {'all' => 'all'};
	my %user_roles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
	if (&Apache::lonnet::error(%user_roles)) {
	undef(%user_roles);
	}
	foreach my $item (keys(%user_roles)) {
	my ($role)=split(/\:/,$item,2);
	if ($role eq 'cr') { next; }
	if ($role =~ /^cr/) {
	$$rolehash{$role} = (split('/',$role))[3];
	} else {
	$$rolehash{$role} = &Apache::lonnet::plaintext($role,$type);
	}
	}
	foreach my $key (sort(keys(%{$rolehash}))) {
	push(@{$allroles},$key);
	}
	push (@{$allroles},'st');
	$$rolehash{'st'} = &Apache::lonnet::plaintext('st',$type);
	}
	return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
	}

=pod	=pod

=item * get_unprocessed_cgi($query,$possible_names)	=item * get_unprocessed_cgi($query,$possible_names)
Line 4962 sub restore_course_settings {	Line 5094 sub restore_course_settings {
############################################################	############################################################
############################################################	############################################################

sub propath {	sub course_type {
my ($udom,$uname)=@_;	my ($cid) = @_;
$udom=~s/\W//g;	if (!defined($cid)) {
$uname=~s/\W//g;	$cid = $env{'request.course.id'};
my $subdir=$uname.'__';	}
$subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;	if (defined($env{'course.'.$cid.'type'})) {
my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";	return $env{'course.'.$cid.'type'};
return $proname;	} else {
}	return 'Course';
	}
	}

sub icon {	sub icon {
my ($file)=@_;	my ($file)=@_;

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

Removed from v.1.375
changed lines
	Added in v.1.394