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.1041 and 1.1050

version 1.1041, 2011/12/20 23:57:51	version 1.1050, 2012/01/04 00:08:29
Line 154 sub ssi_with_retries {	Line 154 sub ssi_with_retries {
# ----------------------------------------------- Filetypes/Languages/Copyright	# ----------------------------------------------- Filetypes/Languages/Copyright
my %language;	my %language;
my %supported_language;	my %supported_language;
	my %latex_language; # For choosing hyphenation in <transl..>
	my %latex_language_bykey; # for choosing hyphenation from metadata
my %cprtag;	my %cprtag;
my %scprtag;	my %scprtag;
my %fe; my %fd; my %fm;	my %fe; my %fd; my %fm;
Line 186 BEGIN {	Line 188 BEGIN {
while (my $line = <$fh>) {	while (my $line = <$fh>) {
next if ($line=~/^\#/);	next if ($line=~/^\#/);
chomp($line);	chomp($line);
my ($key,$two,$country,$three,$enc,$val,$sup)=(split(/\t/,$line));	my ($key,$two,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line));
$language{$key}=$val.' - '.$enc;	$language{$key}=$val.' - '.$enc;
if ($sup) {	if ($sup) {
$supported_language{$key}=$sup;	$supported_language{$key}=$sup;
}	}
	if ($latex) {
	$latex_language_bykey{$key} = $latex;
	$latex_language{$two} = $latex;
	}
}	}
close($fh);	close($fh);
}	}
Line 3227 sub languagedescription {	Line 3233 sub languagedescription {
($supported_language{$code}?' ('.&mt('interface available').')':'');	($supported_language{$code}?' ('.&mt('interface available').')':'');
}	}

	=pod

	=item * &plainlanguagedescription

	Returns both the plain language description (e.g. 'Creoles and Pidgins, English-based (Other)')
	and the language character encoding (e.g. ISO) separated by a ' - ' string.

	=cut

sub plainlanguagedescription {	sub plainlanguagedescription {
my $code=shift;	my $code=shift;
return $language{$code};	return $language{$code};
}	}

	=pod

	=item * &supportedlanguagecode

	Returns the supported language code (e.g. sptutf maps to pt) given a language
	code.

	=cut

sub supportedlanguagecode {	sub supportedlanguagecode {
my $code=shift;	my $code=shift;
return $supported_language{$code};	return $supported_language{$code};
Line 3239 sub supportedlanguagecode {	Line 3263 sub supportedlanguagecode {

=pod	=pod

	=item * &latexlanguage()

	Given a language key code returns the correspondnig language to use
	to select the correct hyphenation on LaTeX printouts. This is undef if there
	is no supported hyphenation for the language code.

	=cut

	sub latexlanguage {
	my $code = shift;
	return $latex_language{$code};
	}

	=pod

	=item * &latexhyphenation()

	Same as above but what's supplied is the language as it might be stored
	in the metadata.

	=cut

	sub latexhyphenation {
	my $key = shift;
	return $latex_language_bykey{$key};
	}

	=pod

=item * &copyrightids()	=item * &copyrightids()

returns list of all copyrights	returns list of all copyrights
Line 4980 body {	Line 5033 body {
a:focus,	a:focus,
a:focus img {	a:focus img {
color: red;	color: red;
background: yellow;
}	}

form, .inline {	form, .inline {
Line 5075 div.LC_confirm_box .LC_success img {	Line 5127 div.LC_confirm_box .LC_success img {
}	}

.LC_discussion {	.LC_discussion {
background: $tabbg;	background: $data_table_dark;
border: 1px solid black;	border: 1px solid black;
margin: 2px;	margin: 2px;
}	}

.LC_disc_action_links_bar {
background: $tabbg;
border: none;
margin: 4px;
}

.LC_disc_action_left {	.LC_disc_action_left {
	background: $sidebg;
text-align: left;	text-align: left;
	padding: 4px;
	margin: 2px;
}	}

.LC_disc_action_right {	.LC_disc_action_right {
	background: $sidebg;
text-align: right;	text-align: right;
	padding: 4px;
	margin: 2px;
}	}

.LC_disc_new_item {	.LC_disc_new_item {
background: white;	background: white;
border: 2px solid red;	border: 2px solid red;
margin: 2px;	margin: 4px;
	padding: 4px;
}	}

.LC_disc_old_item {	.LC_disc_old_item {
background: white;	background: white;
border: 1px solid black;	margin: 4px;
margin: 2px;	padding: 4px;
}	}

table.LC_pastsubmission {	table.LC_pastsubmission {
Line 6314 ul.LC_TabContent li.active a {	Line 6367 ul.LC_TabContent li.active a {
background:#FFFFFF;	background:#FFFFFF;
outline: none;	outline: none;
}	}

	ul.LC_TabContent li.goback {
	float: left;
	border-left: none;
	}

#maincoursedoc {	#maincoursedoc {
clear:both;	clear:both;
}	}
Line 6563 a#LC_content_toolbar_changefolder_toggle	Line 6622 a#LC_content_toolbar_changefolder_toggle
background-image:url(/res/adm/pages/open-all-folders.gif);	background-image:url(/res/adm/pages/open-all-folders.gif);
}	}

	a#LC_content_toolbar_edittoplevel {
	background-image:url(/res/adm/pages/edittoplevel.gif);
	}

ul#LC_toolbar li a:hover {	ul#LC_toolbar li a:hover {
background-position: bottom center;	background-position: bottom center;
}	}
Line 6969 sub end_page {	Line 7032 sub end_page {

sub wishlist_window {	sub wishlist_window {
return(<<'ENDWISHLIST');	return(<<'ENDWISHLIST');
<script type="text/javascript" lang="javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
// <!-- BEGIN LON-CAPA Internal	// <!-- BEGIN LON-CAPA Internal
function set_wishlistlink(title, path) {	function set_wishlistlink(title, path) {
Line 6991 ENDWISHLIST	Line 7054 ENDWISHLIST

sub modal_window {	sub modal_window {
return(<<'ENDMODAL');	return(<<'ENDMODAL');
<script type="text/javascript" lang="javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
// <!-- BEGIN LON-CAPA Internal	// <!-- BEGIN LON-CAPA Internal
var modalWindow = {	var modalWindow = {
Line 7046 sub modal_link {	Line 7109 sub modal_link {
sub modal_adhoc_script {	sub modal_adhoc_script {
my ($funcname,$width,$height,$content)=@_;	my ($funcname,$width,$height,$content)=@_;
return (<<ENDADHOC);	return (<<ENDADHOC);
<script type="text/javascript" lang="javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
var $funcname = function()	var $funcname = function()
{	{
Line 7065 sub modal_adhoc_inner {	Line 7128 sub modal_adhoc_inner {
my ($funcname,$width,$height,$content)=@_;	my ($funcname,$width,$height,$content)=@_;
my $innerwidth=$width-20;	my $innerwidth=$width-20;
$content=&js_ready(	$content=&js_ready(
&start_page('Dialog',undef,{'only_body'=>1,'add_progressbar'=>1,'bgcolor'=>'#FFFFFF'}).	&start_page('Dialog',undef,{'only_body'=>1,'bgcolor'=>'#FFFFFF'}).
&start_scrollbox($width.'px',$innerwidth.'px',$height.'px').	&start_scrollbox($width.'px',$innerwidth.'px',$height.'px').
$content.	$content.
&end_scrollbox().	&end_scrollbox().
Line 7142 sub end_togglebox {	Line 7205 sub end_togglebox {
}	}

sub LCprogressbar_script {	sub LCprogressbar_script {
	my ($id)=@_;
return(<<ENDPROGRESS);	return(<<ENDPROGRESS);
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
var LCprogressTxt='---';	\$('#progressbar$id').progressbar({

\$('#progressbar').progressbar({
value: 0,	value: 0,
change: function(event, ui) {	change: function(event, ui) {
var newVal = \$(this).progressbar('option', 'value');	var newVal = \$(this).progressbar('option', 'value');
Line 7167 sub LCprogressbarUpdate_script {	Line 7229 sub LCprogressbarUpdate_script {
</style>	</style>
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
function LCupdateProgress(percent,progresstext) {	var LCprogressTxt='---';

	function LCupdateProgress(percent,progresstext,id) {
LCprogressTxt=progresstext;	LCprogressTxt=progresstext;
\$('#progressbar').progressbar('value',percent);	\$('#progressbar'+id).progressbar('value',percent);
}	}
// ]]>	// ]]>
</script>	</script>
ENDPROGRESSUPDATE	ENDPROGRESSUPDATE
}	}

	my $LClastpercent;
	my $LCidcnt;
	my $LCcurrentid;

sub LCprogressbar {	sub LCprogressbar {
my ($r,$mode)=(@_);	my ($r)=(@_);
	$LClastpercent=0;
	$LCidcnt++;
	$LCcurrentid=$$.'_'.$LCidcnt;
my $starting=&mt('Starting');	my $starting=&mt('Starting');
my $content=(<<ENDPROGBAR);	my $content=(<<ENDPROGBAR);
<p>	<p>
<div id="progressbar">	<div id="progressbar$LCcurrentid">
<span class="pblabel">$starting</span>	<span class="pblabel">$starting</span>
</div>	</div>
</p>	</p>
ENDPROGBAR	ENDPROGBAR
$content.=&LCprogressbar_script();	&r_print($r,$content.&LCprogressbar_script($LCcurrentid));
if ($mode eq 'popup') {
$r->print(&modal_adhoc_launch('LCprogwin',500,50,$content));
} else {
$r->print($content);
}
$r->rflush();
}	}

sub LCprogressbarUpdate {	sub LCprogressbarUpdate {
my ($r,$val,$text,$mode)=@_;	my ($r,$val,$text)=@_;
unless ($val) { $val=0; }	unless ($val) {
	if ($LClastpercent) {
	$val=$LClastpercent;
	} else {
	$val=0;
	}
	}
if ($val<0) { $val=0; }	if ($val<0) { $val=0; }
if ($val>100) { $val=0; }	if ($val>100) { $val=0; }
	$LClastpercent=$val;
unless ($text) { $text=$val.'%'; }	unless ($text) { $text=$val.'%'; }
my $function='';
if ($mode eq 'popup') { $function='modalWindow.'; }
$function.='LCupdateProgress';
$text=&js_ready($text);	$text=&js_ready($text);
$r->print(<<ENDUPDATE);	&r_print($r,<<ENDUPDATE);
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
$function($val,'$text');	LCupdateProgress($val,'$text','$LCcurrentid');
// ]]>	// ]]>
</script>	</script>
ENDUPDATE	ENDUPDATE
$r->rflush();	}

	sub LCprogressbarClose {
	my ($r)=@_;
	$LClastpercent=0;
	&r_print($r,<<ENDCLOSE);
	<script type="text/javascript">
	// <![CDATA[
	\$("#progressbar$LCcurrentid").hide('slow');
	// ]]>
	</script>
	ENDCLOSE
	}

	sub r_print {
	my ($r,$to_print)=@_;
	if ($r) {
	$r->print($to_print);
	$r->rflush();
	} else {
	print($to_print);
	}
}	}

sub html_encode {	sub html_encode {
Line 7222 sub html_encode {	Line 7312 sub html_encode {

return $result;	return $result;
}	}

sub js_ready {	sub js_ready {
my ($result) = @_;	my ($result) = @_;

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

Removed from v.1.1041
changed lines
	Added in v.1.1050