--- loncom/xml/scripttag.pm	2010/05/23 12:29:25	1.153
+++ loncom/xml/scripttag.pm	2011/12/19 18:00:27	1.161
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.153 2010/05/23 12:29:25 www Exp $
+# $Id: scripttag.pm,v 1.161 2011/12/19 18:00:27 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,7 +41,7 @@ use Apache::style();
 BEGIN {
   &Apache::lonxml::register('Apache::scripttag',
 			    ('script','scriptlib','parserlib','import',
-			     'window','display','storetc','physnet',
+			     'window','togglebox','display','storetc','physnet',
 			     'standalone','comment','num','parse','algebra',
 			     'LONCAPA_INTERNAL_TURN_STYLE_ON',
 			     'LONCAPA_INTERNAL_TURN_STYLE_OFF'));
@@ -102,31 +102,15 @@ sub start_script {
 	    ($Apache::lonhomework::viewgrades == 'F')) {
 	    $Apache::lonxml::evaluate--;
 	    my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
-	    my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
-	    my $start_page =
-		&Apache::loncommon::start_page('Script Vars', undef,
-					       {'only_body' => 1,
-						'bgcolor'   => '#FFFFFF',
-						'js_ready'  => 1,});
-	    my $end_page =
-		&Apache::loncommon::end_page({'js_ready' => 1,});
-
 	    $uname =~s/\W//g;
 	    $udom  =~s/\W//g;
 	    my $function_name = 
 		join('_','LONCAPA_scriptvars',$uname,$udom,
 		     $env{'form.counter'},$Apache::lonxml::curdepth);
-	    my $script_var ="<script type=\"text/javascript\">
-// <![CDATA[
-    function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>";
-	    my $listing=&Apache::run::dump($target,$safeeval);
-	    $listing=~s/\\/\\\\/g;
-	    $listing=~s/\'/\\\'/g;
-	    $script_var.=$listing;
-	    $script_var.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
-// ]]>
-</script><a href=\"javascript:$function_name();void(0);\">".&mt('Script Vars')."</a><br />";
-	    &Apache::lonxml::add_script_result($script_var);
+            &Apache::lonxml::add_script_result(
+	             &Apache::loncommon::modal_adhoc_window($function_name,500,500,
+                            '<pre>'.&Apache::run::dump($target,$safeeval).'</pre>',
+                            &mt('Script Vars'))."<br />");
 	}
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
@@ -309,13 +293,11 @@ sub start_window {
 	$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);
 	$result.=&Apache::edit::text_arg('Height:','height',$token,5);
 	$result.=&Apache::edit::text_arg('Width:','width',$token,5);
-	$result.=&Apache::edit::text_arg('Mime Type:','mimetype',$token,5);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						     $safeeval,'linktext',
-						     'width','height',
-						     'mimetype');
+						     'width','height');
 	if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
     }
     return $result;  
@@ -326,39 +308,16 @@ sub end_window {
   my $result;
   if ($target eq 'web' || $target eq 'webgrade') {
     my $output=&Apache::lonxml::endredirection;
-    $output =~ s/[\n\r]/ /g;
-#    $output = &HTML::Entities::encode($output,'<>&"\'');
-    $output =~ s/\'/\\\'/g;
     my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval);
     if (!$linktext) { $linktext='<sup>*</sup>'; }
     my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
     if (!$width) { $width='500'; }
     my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
     if (!$height) { $height='200'; }
-    my $mimetype= &Apache::lonxml::get_param('mimetype',$parstack,$safeeval)
-	          || 'text/html';
 
     my ($start_page,$end_page);
-    if ($mimetype eq 'text/html') {
-	$start_page =
-	    &Apache::loncommon::start_page($linktext, undef,
-					   {'only_body' => 1,
-					    'bgcolor'   => '#FFFFFF',
-					    'js_ready'  => 1,});
-	$end_page =
-	    &Apache::loncommon::end_page({'js_ready' => 1,});
-    }
-    $result = "<script type=\"text/javascript\">
-//<!--
- function LONCAPA_newwindow_$Apache::lonxml::curdepth() {
-newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W');
-newWindow.close();
-newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');
-newWindow.".&Apache::lonhtmlcommon::javascript_docopen($mimetype).";
-newWindow.document.writeln('$start_page $output $end_page');
-newWindow.document.close();}
-//-->
-</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";
+    $result=&Apache::loncommon::modal_adhoc_window
+           ("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext);
   } elsif ($target eq 'tex') {
       $result = '}';
   } else {
@@ -367,6 +326,62 @@ newWindow.document.close();}
   return $result; 
 }
 
+
+sub start_togglebox {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result = '';
+    if ($target eq 'web' || $target eq 'webgrade') {
+        my $id="LONCAPA_togglebox_$Apache::lonxml::curdepth";
+        my $heading=&Apache::lonxml::get_param('heading',$parstack,$safeeval);
+        unless ($heading) { $heading=''; } else { $heading.=' '; }
+        my $showtext=&Apache::lonxml::get_param('showtext',$parstack,$safeeval);
+        unless ($showtext) { $showtext=&mt('show'); }
+        my $hidetext=&Apache::lonxml::get_param('hidetext',$parstack,$safeeval);
+        unless ($hidetext) { $hidetext=&mt('hide'); }
+        my $headerbg=&Apache::lonxml::get_param('headerbg',$parstack,$safeeval);
+        unless ($headerbg) { $headerbg='#FFFFFF'; }
+        $result=&Apache::loncommon::start_data_table().
+                &Apache::loncommon::start_data_table_header_row().'<td bgcolor="'.$headerbg.'">'.$heading.
+                '[<a id="'.$id.'link" href="javascript:LCtoggleDisplay(\''.$id.'\',\''.$hidetext.'\',\''.
+                $showtext.'\')">'.$showtext.'</a>]</td>'.
+                &Apache::loncommon::end_data_table_header_row().
+                '<tr id="'.$id.'" style="display:none""><td>';
+    } elsif ($target eq 'tex') {
+        my $heading=&Apache::lonxml::get_param('heading',$parstack,$safeeval);
+        unless ($heading) { $heading=''; } else { $heading.=' '; }
+        $result = "\n\n".'\fbox{{\bf '.$heading.'} \qquad '."\n";
+    } elsif ($target eq 'edit') {
+        $result.=&Apache::edit::tag_start($target,$token);
+        $result.=&Apache::edit::text_arg('Heading:','heading',$token,70);
+        $result.=&Apache::edit::text_arg('Header Background:','headerbg',$token,7);
+        $result.=&Apache::edit::text_arg('Show text:','showtext',$token,10);
+        $result.=&Apache::edit::text_arg('Hide text:','hidetext',$token,10);
+        $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+        my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                     $safeeval,'heading',
+                                                     'showtext','hidetext',
+                                                     'headerbg','textbg');
+        if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+    }
+    return $result;
+}
+
+sub end_togglebox {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'web' || $target eq 'webgrade') {
+    $result='</td></tr>'.&Apache::loncommon::end_data_table();
+  } elsif ($target eq 'tex') {
+      $result = "}\n\n";
+  } else {
+      $result = '';
+  }
+  return $result;
+}
+
+
+
 sub start_import {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $bodytext=$$parser[$#$parser]->get_text("/import");
@@ -385,9 +400,17 @@ sub start_import {
       return "";
     }
     my $importmode=&Apache::lonxml::get_param('importmode',$parstack,$safeeval);
-    if ($importmode eq 'problem') {
-       $file=~s/^\s*<problem>/<library>/s;
-       $file=~s/<\/problem>\s*$/<\/library>/s;
+    if (($importmode eq 'problem') || ($importmode eq 'part')) {
+# We are using import to import published problems
+       if (($importmode eq 'problem') || ($file=~/<part[^<]*>/s)) {
+# We explicitly don't want this to be a separate part or the problem already has parts
+          $file=~s/^\s*<problem>/<library>/s;
+	  $file=~s/<\/problem>\s*$/<\/library>/s;
+       } else {
+# We want this to be a separate part, but it currently is not
+          $file=~s/^\s*<problem>/<library><part>/s;
+	  $file=~s/<\/problem>\s*$/<\/part><\/library>/s;
+       }
     }
     my $dir=$location;
     $dir=~s:/[^/]*$::;
@@ -406,14 +429,17 @@ sub start_import {
     $location=~s/\s*$//s;
     $result.=&Apache::edit::editline($location,$bodytext,'',40);
     $result.=&Apache::edit::browse(undef,'textnode');
-        $result.= '<label>'.&mt('Import as:').
+    $result.= '&nbsp;<label>'.&mt('Import as:').
               '<select name="importmode_'.$Apache::lonxml::curdepth.'">';
-    foreach my $option ('','problem') {
+    my %options=&Apache::lonlocal::texthash(''        => 'as standard library',
+                                            'problem' => 'as problem',
+                                            'part'    => 'as problem part(s)');
+    foreach my $option (sort(keys(%options))) {
        $result.='<option value="'.$option.'"';
        if ($option eq &Apache::lonxml::get_param('importmode',$parstack,$safeeval)) {
           $result.=' selected="selected"';
        }
-       $result.='>'.($option?&mt('as problem'):&mt('as standard library')).'</option>';
+       $result.='>'.$options{$option}.'</option>';
     }
     $result.='</select></label>';
     #FIXME this need to convert $bodytext to be a contruction space reference
@@ -429,7 +455,7 @@ sub start_import {
     if ($id) {
       $result.='" id="'.$id;
     }
-    $result.='">';
+    $result.='" importmode="'.$token->[2]{'importmode'}.'">';
     $result.=$bodytext;
     $result.='</import>';
   }
@@ -616,7 +642,7 @@ sub start_algebra {
 	$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
 	if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
 	    my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval);
-	    $result=&Apache::lontexconvert::algebra($inside,undef,$target,$style,$parstack,$safeeval);
+	    $result=&Apache::lontexconvert::algebra($inside,$target,$style,$parstack,$safeeval);
 	}
 	$Apache::lonxml::post_evaluate=0;
     }