--- loncom/interface/loncommon.pm	2011/12/26 13:47:18	1.1028.2.1
+++ loncom/interface/loncommon.pm	2011/12/08 01:16:14	1.1030
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1028.2.1 2011/12/26 13:47:18 foxr Exp $
+# $Id: loncommon.pm,v 1.1030 2011/12/08 01:16:14 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -154,7 +154,6 @@ sub ssi_with_retries {
 # ----------------------------------------------- Filetypes/Languages/Copyright
 my %language;
 my %supported_language;
-my %latex_language;		# Language name LaTeX uses for selecting hyphenation.
 my %cprtag;
 my %scprtag;
 my %fe; my %fd; my %fm;
@@ -187,14 +186,11 @@ BEGIN {
             while (my $line = <$fh>) {
                 next if ($line=~/^\#/);
                 chomp($line);
-                my ($key,$two,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line));
+                my ($key,$two,$country,$three,$enc,$val,$sup)=(split(/\t/,$line));
                 $language{$key}=$val.' - '.$enc;
                 if ($sup) {
                     $supported_language{$key}=$sup;
                 }
-		if ($latex) {
-		    $latex_language{$two} = $latex;
-		}
             }
             close($fh);
         }
@@ -3234,29 +3230,11 @@ sub languagedescription {
 	    ($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 {
     my $code=shift;
     return $language{$code};
 }
 
-=pod
-
-=item * &supportedlanguagecode
-
-Returns the supported language code (e.g. sptutf maps to pt) given a language
-code.
-
-=cut
-
 sub supportedlanguagecode {
     my $code=shift;
     return $supported_language{$code};
@@ -3264,21 +3242,6 @@ sub supportedlanguagecode {
 
 =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 * &copyrightids() 
 
 returns list of all copyrights
@@ -5561,6 +5524,11 @@ span.LC_current_location {
   background: $pgbg;
 }
 
+span.LC_current_nav_location {
+  font-weight:bold;
+  background: $sidebg;
+}
+
 span.LC_parm_menu_item {
   font-size: larger;
 }
@@ -6666,6 +6634,53 @@ ul.LC_funclist li {
   display: none;
 }
 
+.LCmodal-overlay {
+		position:fixed;
+		top:0;
+		right:0;
+		bottom:0;
+		left:0;
+		height:100%;
+		width:100%;
+		margin:0;
+		padding:0;
+		background:#999;
+		opacity:.75;
+		filter: alpha(opacity=75);
+		-moz-opacity: 0.75;
+		z-index:101;
+}
+
+* html .LCmodal-overlay {   
+		position: absolute;
+		height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}
+
+.LCmodal-window {
+		position:fixed;
+		top:50%;
+		left:50%;
+		margin:0;
+		padding:0;
+		z-index:102;
+	}
+
+* html .LCmodal-window {
+		position:absolute;
+}
+
+.LCclose-window {
+		position:absolute;
+		width:32px;
+		height:32px;
+		right:8px;
+		top:8px;
+		background:transparent url('/res/adm/pages/process-stop.png') no-repeat scroll right top;
+		text-indent:-99999px;
+		overflow:hidden;
+		cursor:pointer;
+}
+
 END
 }
 
@@ -6725,7 +6740,7 @@ sub headtag {
 	&& !$args->{'frameset'}) {
 	$result .= &help_menu_js();
     }
-
+    $result.=&modal_window();
     if (ref($args->{'redirect'})) {
 	my ($time,$url,$inhibit_continue) = @{$args->{'redirect'}};
 	$url = &Apache::lonenc::check_encrypt($url);
@@ -6850,32 +6865,12 @@ $args - additional optional args support
 sub start_page {
     my ($title,$head_extra,$args) = @_;
     #&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
-#SD
-#I don't see why we copy certain elements of %$args to %head_args
-#head args is passed to headtag() and this routine only reads those
-#keys that are needed. There doesn't happen any writes or any processing
-#of other keys.
-#proposal: just pass $args to headtag instead of \%head_args and delete 
-#marked lines
-#<- MARK
-    my %head_args;
-    foreach my $arg ('redirect','force_register','domain','function',
-		     'bgcolor','frameset','no_nav_bar','only_body',
-		     'no_auto_mt_title') {
-	if (defined($args->{$arg})) {
-	    $head_args{$arg} = $args->{$arg};
-	}
-    }
-#MARK ->
 
     $env{'internal.start_page'}++;
     my $result;
 
     if (! exists($args->{'skip_phases'}{'head'}) ) {
-        $result .= 
-                  &xml_begin() . &headtag($title,$head_extra,\%head_args);
-#replace prev line by
-#                 &xml_begin() . &headtag($title, $head_extra, $args);
+        $result .= &xml_begin() . &headtag($title, $head_extra, $args);
     }
     
     if (! exists($args->{'skip_phases'}{'body'}) ) {
@@ -6941,7 +6936,6 @@ sub end_page {
 	}
 	$result .= &Apache::lonxml::xmlend($target,$parser);
     }
-
     if ($args->{'frameset'}) {
 	$result .= '</frameset>';
     } else {
@@ -6960,6 +6954,58 @@ sub end_page {
     return $result;
 }
 
+sub modal_window {
+    return(<<'ENDMODAL');
+<script type="text/javascript" lang="javascript">
+// <![CDATA[
+// <!-- BEGIN LON-CAPA Internal
+var modalWindow = {
+	parent:"body",
+	windowId:null,
+	content:null,
+	width:null,
+	height:null,
+	close:function()
+	{
+	        $(".LCmodal-window").remove();
+	        $(".LCmodal-overlay").remove();
+	},
+	open:function()
+	{
+		var modal = "";
+		modal += "<div class=\"LCmodal-overlay\"></div>";
+		modal += "<div id=\"" + this.windowId + "\" class=\"LCmodal-window\" style=\"width:" + this.width + "px; height:" + this.height + "px; margin-top:-" + (this.height / 2) + "px; margin-left:-" + (this.width / 2) + "px;\">";
+		modal += this.content;
+		modal += "</div>";	
+
+		$(this.parent).append(modal);
+
+		$(".LCmodal-window").append("<a class=\"LCclose-window\"></a>");
+		$(".LCclose-window").click(function(){modalWindow.close();});
+		$(".LCmodal-overlay").click(function(){modalWindow.close();});
+	}
+};
+	var openMyModal = function(source,width,height)
+	{
+		modalWindow.windowId = "myModal";
+		modalWindow.width = width;
+		modalWindow.height = height;
+		modalWindow.content = "<iframe width='"+width+"' height='"+height+"' frameborder='0' scrolling='no' allowtransparency='true' src='" + source + "'>&lt/iframe>";
+		modalWindow.open();
+	};	
+// END LON-CAPA Internal -->
+// ]]>
+</script>
+ENDMODAL
+}
+
+sub modal_link {
+    my ($link,$linktext,$width,$height,$target)=@_;
+    unless ($width) { $width=480; }
+    unless ($height) { $height=400; }
+    return '<a href="'.$link.'" target="'.$target.'" onclick="openMyModal(\''.$link.'\','.$width.','.$height.'); return false;">'.$linktext.'</a>';
+}
+
 sub html_encode {
     my ($result) = @_;