--- loncom/interface/loncommon.pm	2011/12/21 18:01:58	1.1042
+++ loncom/interface/loncommon.pm	2011/12/25 20:41:53	1.1047
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1042 2011/12/21 18:01:58 www Exp $
+# $Id: loncommon.pm,v 1.1047 2011/12/25 20:41:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6314,6 +6314,12 @@ ul.LC_TabContent li.active a {
   background:#FFFFFF;
   outline: none;
 }
+
+ul.LC_TabContent li.goback {
+  float: left;
+  border-left: none;
+}
+
 #maincoursedoc {
   clear:both;
 }
@@ -6563,6 +6569,10 @@ a#LC_content_toolbar_changefolder_toggle
   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 {
   background-position: bottom center;
 }
@@ -6969,7 +6979,7 @@ sub end_page {
 
 sub wishlist_window {
     return(<<'ENDWISHLIST');
-<script type="text/javascript" lang="javascript">
+<script type="text/javascript">
 // <![CDATA[
 // <!-- BEGIN LON-CAPA Internal
 function set_wishlistlink(title, path) {
@@ -6991,7 +7001,7 @@ ENDWISHLIST
 
 sub modal_window {
     return(<<'ENDMODAL');
-<script type="text/javascript" lang="javascript">
+<script type="text/javascript">
 // <![CDATA[
 // <!-- BEGIN LON-CAPA Internal
 var modalWindow = {
@@ -7046,7 +7056,7 @@ sub modal_link {
 sub modal_adhoc_script {
     my ($funcname,$width,$height,$content)=@_;
     return (<<ENDADHOC);
-<script type="text/javascript" lang="javascript">
+<script type="text/javascript">
 // <![CDATA[
         var $funcname = function()
         {
@@ -7142,12 +7152,11 @@ sub end_togglebox {
 }
 
 sub LCprogressbar_script {
+   my ($id)=@_;
    return(<<ENDPROGRESS);
 <script type="text/javascript">
 // <![CDATA[
-var LCprogressTxt='---';
-
-\$('#progressbar').progressbar({
+\$('#progressbar$id').progressbar({
   value: 0,
   change: function(event, ui) {
     var newVal = \$(this).progressbar('option', 'value');
@@ -7167,9 +7176,11 @@ sub LCprogressbarUpdate_script {
 </style>
 <script type="text/javascript">
 // <![CDATA[
-function LCupdateProgress(percent,progresstext) {
+var LCprogressTxt='---';
+
+function LCupdateProgress(percent,progresstext,id) {
    LCprogressTxt=progresstext;
-   \$('#progressbar').progressbar('value',percent);
+   \$('#progressbar'+id).progressbar('value',percent);
 }
 // ]]>
 </script>
@@ -7177,20 +7188,23 @@ ENDPROGRESSUPDATE
 }
 
 my $LClastpercent;
+my $LCidcnt;
+my $LCcurrentid;
 
 sub LCprogressbar {
     my ($r)=(@_);
     $LClastpercent=0;
+    $LCidcnt++;
+    $LCcurrentid=$$.'_'.$LCidcnt;
     my $starting=&mt('Starting');
     my $content=(<<ENDPROGBAR);
 <p>
-  <div id="progressbar">
+  <div id="progressbar$LCcurrentid">
     <span class="pblabel">$starting</span>
   </div>
 </p>
 ENDPROGBAR
-    $r->print($content.&LCprogressbar_script());
-    $r->rflush();
+    &r_print($r,$content.&LCprogressbar_script($LCcurrentid));
 }
 
 sub LCprogressbarUpdate {
@@ -7207,27 +7221,35 @@ sub LCprogressbarUpdate {
     $LClastpercent=$val;
     unless ($text) { $text=$val.'%'; }
     $text=&js_ready($text);
-    $r->print(<<ENDUPDATE);
+    &r_print($r,<<ENDUPDATE);
 <script type="text/javascript">
 // <![CDATA[
-LCupdateProgress($val,'$text');
+LCupdateProgress($val,'$text','$LCcurrentid');
 // ]]>
 </script>
 ENDUPDATE
-    $r->rflush();
 }
 
 sub LCprogressbarClose {
     my ($r)=@_;
     $LClastpercent=0;
-    $r->print(<<ENDCLOSE);
+    &r_print($r,<<ENDCLOSE);
 <script type="text/javascript">
 // <![CDATA[
-\$("#progressbar").hide('slow'); 
+\$("#progressbar$LCcurrentid").hide('slow'); 
 // ]]>
 </script>
 ENDCLOSE
-    $r->rflush();
+}
+
+sub r_print {
+    my ($r,$to_print)=@_;
+    if ($r) {
+      $r->print($to_print);
+      $r->rflush();
+    } else {
+      print($to_print);
+    }
 }
 
 sub html_encode {
@@ -7237,6 +7259,7 @@ sub html_encode {
     
     return $result;
 }
+
 sub js_ready {
     my ($result) = @_;