--- loncom/interface/londocs.pm	2011/09/09 20:13:17	1.458
+++ loncom/interface/londocs.pm	2011/11/27 20:55:58	1.464
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.458 2011/09/09 20:13:17 raeburn Exp $
+# $Id: londocs.pm,v 1.464 2011/11/27 20:55:58 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -176,7 +176,7 @@ sub dumpcourse {
 	    $newfilename=&clean($newfilename);
 	    $newfilename.='.'.$ext;
 	    my @dirs=split(/\//,$newfilename);
-	    my $path='/home/'.$ca.'/public_html';
+	    my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
 	    my $makepath=$path;
 	    my $fail=0;
 	    for (my $i=0;$i<$#dirs;$i++) {
@@ -1577,7 +1577,7 @@ sub handle_edit_cmd {
 
     if ($cmd eq 'del') {
 	if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
-	    ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
+	    ($url!~/$LONCAPA::assess_page_seq_re/)) {
 	    &Apache::lonnet::removeuploadedurl($url);
 	} else {
 	    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
@@ -1787,9 +1787,11 @@ sub editor {
     if ($supplementalflag) {
         $tid = 2;
     }
-    $r-print(&generate_edit_table($tid,$orderhash,$to_show));
     if ($allowed) {
+        $r->print(&generate_edit_table($tid,$orderhash,$to_show));
         &print_paste_buffer($r,$container);
+    } else {
+        $r->print($to_show);
     }
     return;
 }
@@ -2629,7 +2631,7 @@ ENDHEADERS
                     $r->print(' <a href="/adm/diff?filename='.
 			      &Apache::lonnet::clutter($root.'.'.$extension).
 			      '&versionone='.$prevvers.
-			      '">'.&mt('Diffs').'</a>');
+			      '" target="diffs">'.&mt('Diffs').'</a>');
 		}
 		$r->print('</span><br />');
                 if (++$entries_count % $entries_per_col == 0) {
@@ -2870,12 +2872,24 @@ sub handler {
     my $containertag;
     my $uploadtag;
 
+# Do we directly jump somewhere?
+   if ($env{'form.command'} eq 'direct') {
+       (my $mapurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
+       my $maptitle = &Apache::lonnet::gettitle($mapurl);
+       $mapurl=~s{^.*/([^/]+)\.\w+$}{$1};
+       $env{'form.folderpath'}=
+                    'default&'.&Apache::lonhtmlcommon::entity_encode('Main Course Documents').
+                    '&default&...::::&'.
+                    &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                        &Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
+   }
+
 # Where do we store these for when we come back?
     my $stored_folderpath='docs_folderpath';
     if ($supplementalflag) {
        $stored_folderpath='docs_sup_folderpath';
     }
-       
+
 # No folderpath, no pagepath, see if we have something stored
     if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,
@@ -2914,6 +2928,9 @@ sub handler {
                                                 {'pagepath' => 'scalar',
                                                  'folderpath' => 'scalar'});
 
+       &Apache::lonnet::logthis("Folder: ".$env{'form.folderpath'});
+
+
     if ($env{'form.folderpath'}) {
 	my (@folderpath)=split('&',$env{'form.folderpath'});
 	$env{'form.foldername'}=&unescape(pop(@folderpath));
@@ -3111,7 +3128,6 @@ CHBO
 
     my $fileuploada = "<br clear='all' /><input type='submit' value='".$lt{'upld'}."' /> $help{'Uploading_From_Harddrive'}";
 	my $fileuploadform=(<<FUFORM);
-        <div style="float:left">
 	<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 	<input type="hidden" name="active" value="aa" />
 	$fileupload
@@ -3125,7 +3141,7 @@ CHBO
 	$checkbox
 	</span>
 FUFORM
-    $fileuploadform .= $fileuploada.'</form></div>';
+    $fileuploadform .= $fileuploada.'</form>';
 
 	my $simpleeditdefaultform=(<<SEDFFORM);
 	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
@@ -3138,7 +3154,7 @@ SEDFFORM
 	);
 	$simpleeditdefaultform .= &create_form_ul(&create_list_elements(@simpleeditdefaultforma));
 	$simpleeditdefaultform .=(<<SEDFFORM);
-	<hr />
+	<hr id="bb_hrule" style="width:0px;text-align:left;margin-left:0" />
 	$lt{'copm'}<br />
 	<input type="text" size="40" name="importmap" /><br />
 	<span class="LC_nobreak" style="float:left"><input type="button"
@@ -3391,7 +3407,7 @@ NGFFORM
         my @importdoc = (
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},);
-        $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc)) . '<hr/>' . $fileuploadform;
+        $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc)) . '<hr id="cc_hrule" style="width:0px;text-align:left;margin-left:0" />' . $fileuploadform;
 
         @gradingforma=(
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
@@ -3537,7 +3553,7 @@ my @supimportdoc = (
 		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supnewext\');" />'
             =>$supnewextform},
         );
-$supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc)) . '<hr/>' . $supupdocform;
+$supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc)) . '<hr id="ee_hrule" style="width:0px;text-align:left;margin-left:0" />' . $supupdocform;
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
                 'ee' => ['Import Documents',$supupdocform],
@@ -4077,11 +4093,12 @@ function resize_contentdiv(scrollboxname
         var minscrollboxw = 250;
 
         var maxtabw = 0;
+        var actabw = 0;
         for (var i=0; i<alltabs.length; i++) {
             if (activeTab == alltabs[i]) {
-                var tabw = document.getElementById(alltabs[i]).offsetWidth;
-                if (tabw > maxtabw) {
-                    maxtabw = tabw;
+                actabw = document.getElementById(alltabs[i]).offsetWidth;
+                if (actabw > maxtabw) {
+                    maxtabw = actabw;
                 }
             } else {
                 if (document.getElementById(alltabs[i]) != null) {
@@ -4132,6 +4149,23 @@ function resize_contentdiv(scrollboxname
             listwchange = 1;
         }
 
+        if (activeTab == 'cc1') {
+            if (document.getElementById('cc_hrule') != null) {
+                document.getElementById('cc_hrule').style.width=actabw+"px";
+            }
+        } else {
+            if (activeTab == 'bb1') {
+                if (document.getElementById('bb_hrule') != null) {
+                    document.getElementById('bb_hrule').style.width=actabw+"px";
+                }
+            } else {
+                if (activeTab == 'ee2') {
+                    if (document.getElementById('ee_hrule') != null) {
+                        document.getElementById('ee_hrule').style.width=actabw+"px";
+                    }
+                }
+            }
+        }
     }
     if ((chkh == 1) || (listwchange)) {
         var primaryheight = document.getElementById("LC_nav_bar").offsetHeight;