--- loncom/interface/londocs.pm	2012/11/27 23:34:41	1.510
+++ loncom/interface/londocs.pm	2012/12/02 22:40:09	1.518
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.510 2012/11/27 23:34:41 raeburn Exp $
+# $Id: londocs.pm,v 1.518 2012/12/02 22:40:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2142,7 +2142,7 @@ sub entryline {
                                                  &Apache::lonnet::declutter($currurl));
         }
     }
-    my %lt;
+    my ($renamelink,%lt);
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
@@ -2239,7 +2239,7 @@ sub entryline {
                 $nocopy=1;
             }
         }
-        my ($copylink,$cutlink,$removelink,$renamelink);
+        my ($copylink,$cutlink,$removelink);
 	my $skip_confirm = 0;
 	if ( $folder =~ /^supplemental/
 	     || ($url =~ m{( /smppg$
@@ -2279,9 +2279,11 @@ ENDREM
 <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
 ENDREM
         }
-        $renamelink=(<<ENDREN);
+        unless ($isexternal) {
+            $renamelink=(<<ENDREN);
 <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
 ENDREN
+        }
 	$form_start = '
    <form action="/adm/coursedocs" method="post">
 ';
@@ -2313,7 +2315,6 @@ END
 </td>
 <td class="LC_docs_entry_commands"><span class="LC_nobreak">
 $removelink
-$renamelink
 $cutlink
 $copylink
 </span>
@@ -2353,7 +2354,7 @@ END
 	}
     }
 
-    my $editlink;
+    my ($editlink,$extresform);
     my $orig_url = $url;
     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
     $url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
@@ -2434,7 +2435,7 @@ $form_common.'
         if ($title) {
             $url .= '&amp;title='.&HTML::Entities::encode($renametitle,'<>&"');
         }
-        if ($orderidx) {
+        if ($isexternal && $orderidx) {
             $url .= '&amp;idx='.$orderidx;
         }
     }
@@ -2451,28 +2452,22 @@ $form_common.'
         my $fileloc = 
             &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
         if ($isexternal) {
-            $editlink =
+            ($editlink,$extresform) = 
                 &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem);
-        } else {
+        } elsif (!$isfolder && !$ispage) {
             my ($cfile,$home,$switchserver,$forceedit,$forceview) = 
                 &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
-            my $geteditlink;
-            if ($supplementalflag) {
-                if ($orig_url eq "/adm/$env{'user.domain'}/$env{'user.name'}/aboutme") {
-                    $geteditlink = 1;
-                }
-            } elsif (($cfile ne '') && ($symb ne '')) {
-                $geteditlink = 1;
-            }
-            if ($geteditlink) {
+            if (($cfile ne '') && ($symb ne '' || $supplementalflag)) {
                 my $jscall = 
                     &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
                                                             $switchserver,
                                                             $forceedit,
-                                                            undef,$symb);
+                                                            undef,$symb,
+                                                            &escape($env{'form.folderpath'}),
+                                                            $renametitle);
                 if ($jscall) {
-                    $editlink = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:'.
-                                $jscall.'" >'.&mt('Edit').'</a>';
+                    $editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
+                                $jscall.'" >'.&mt('Edit').'</a>&nbsp;'."\n";
                 }
             }
         }
@@ -2483,7 +2478,7 @@ $form_common.'
     } else {
         $reinit = &mt('(re-initialize course to access)');
     }  
-    $line.='<td>';
+    $line.='<td class="LC_docs_entry_commands" align="right" valign="top"><span class="LC_nobreak">'.$editlink.$renamelink;
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
     } elsif ($url) {
@@ -2492,7 +2487,7 @@ $form_common.'
     } else {
        $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
     }
-    $line.='</td><td>';
+    $line.='</span></td><td width="80%">';
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'">'.$title.'</a>';
     } elsif ($url) {
@@ -2501,7 +2496,7 @@ $form_common.'
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }
-    $line.=$editlink."</td>";
+    $line.="$extresform</td>";
     $rand_pick_text = '&nbsp;' if ($rand_pick_text eq '');
     $rand_order_text = '&nbsp;' if ($rand_order_text eq '');
     if (($allowed) && ($folder!~/^supplemental/)) {
@@ -3298,7 +3293,7 @@ sub handler {
                if ($mapurl eq 'default') {
                    $maptitle = 'Main Course Documents';
                }
-               $path .= ($path ne '')? '&' : ''.
+               $path .= (($path ne '')? '&' : '').
                     &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
                     &Apache::lonhtmlcommon::entity_encode($maptitle).
                     ':'.$mapresobj->randompick().
@@ -3602,10 +3597,6 @@ sub handler {
                 'prev' => 'Preview',
                 'lnk'  => 'Add Link', 
                 'parse' => 'Upload embedded images/multimedia files if HTML file',
-		'nd' => 'Upload Document',
-		'pm' => 'Published Map',
-		'sd' => 'Special Document',
-		'mo' => 'More Options',
 					  );
 # -----------------------------------------------------------------------------
 	my $fileupload=(<<FIUP);
@@ -3629,7 +3620,7 @@ CHBO
         <a class="LC_menubuttons_link" href="javascript:toggleUpload('ims');">
         $lt{'imsf'}</a> $help{'Importing_IMS_Course'}
         <form name="uploadims" action="/adm/imsimportdocs" method="post" enctype="multipart/form-data" target="IMSimport">
-        <fieldset id="uploadimsform" style="display: none;" />
+        <fieldset id="uploadimsform" style="display: none;">
         <legend>$lt{'imsf'}</legend>
         $fileupload
         <br />
@@ -3654,7 +3645,7 @@ IMSFORM
         <a class="LC_menubuttons_link" href="javascript:toggleUpload('doc');">
         $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
         <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-        <fieldset id="uploaddocform" style="display: none;" />
+        <fieldset id="uploaddocform" style="display: none;">
         <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="aa" />
 	$fileupload
@@ -3674,17 +3665,17 @@ IMSFORM
 FUFORM
 
 	my $importpubform=(<<SEDFFORM);
-        <a class="LC_menubuttons_link" href="javascript:toggleMap();">
+        <a class="LC_menubuttons_link" href="javascript:toggleMap('map');">
         $lt{'impm'}</a>$help{'Load_Map'}
 	<form action="/adm/coursedocs" method="post" name="mapimportform">
-        <fieldset id="importmapform" style="display: none;" />
+        <fieldset id="importmapform" style="display: none;">
         <legend>$lt{'impm'}</legend>
 	<input type="hidden" name="active" value="bb" />
         $lt{'copm'}<br />
         <span class="LC_nobreak">
         <input type="text" name="importmap" size="40" value="" 
         onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" />
-        &nbsp;<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a><br />
+        &nbsp;<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a></span><br />
         <input type="submit" name="loadmap" value="$lt{'load'}" />
         </fieldset>
         </form>
@@ -3694,7 +3685,7 @@ SEDFFORM
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },
-        { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap();" />' => $importpubform }
+        { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform }
 	);
 	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
         my $extresourcesform =
@@ -3953,7 +3944,7 @@ my %orderhash = (
 unless ($env{'form.pagepath'}) {
     $orderhash{'00'} = ['Newfolder',$newfolderform];
     $orderhash{'dd'} = ['Collaboration',$communityform];
-    $orderhash{'ee'} = ['Special Documents',$specialdocumentsform];
+    $orderhash{'ee'} = ['Special Pages',$specialdocumentsform];
 }
 
  $hadchanges=0;
@@ -3994,7 +3985,7 @@ unless ($env{'form.pagepath'}) {
         <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppdoc');">
         $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
 	<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">
-        <fieldset id="uploadsuppdocform" style="display: none;" />
+        <fieldset id="uploadsuppdocform" style="display: none;">
         <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="ee" />	
 	$fileupload
@@ -4057,7 +4048,7 @@ my @specialdocs = (
             =>$supnewaboutmeform},
 		);
 my @supimportdoc = (
-		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'suppext\')" />'
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'suppext\')" />'
             =>$supextform},
                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'
             =>$supupdocform},
@@ -4067,7 +4058,7 @@ $supupdocform =  &create_form_ul(&create
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
                 'ee' => ['Import Content',$supupdocform],
-                'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))]
+                'ff' => ['Special Pages',&create_form_ul(&create_list_elements(@specialdocs))]
                 );
         if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
@@ -4351,7 +4342,7 @@ sub generate_edit_table {
         $activetab = $env{'form.active'};
     }
     my $backicon = $iconpath.'clickhere.gif';
-    my $backtext = &mt('To Overview');
+    my $backtext = &mt('Exit');
     $form = '<div class="LC_Box" style="margin:0;">'.
             '<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".
             '<li class="goback">'.
@@ -4561,12 +4552,14 @@ function toggleUpload(caller) {
     return;
 }
 
-function toggleMap() {
+function toggleMap(caller) {
     var disp = 'none';
     if (document.getElementById('importmapform')) {
-        var curr = document.getElementById('importmapform').style.display;
-        if (curr == 'none') {
-            disp='block';
+        if (caller == 'map') {
+            var curr = document.getElementById('importmapform').style.display;
+            if (curr == 'none') {
+                disp='block';
+            }
         }
         document.getElementById('importmapform').style.display=disp;
         resize_scrollbox('contentscroll','1','1');