[LON-CAPA-cvs] cvs: loncom /interface londocs.pm

[raeburn]

raeburn		Sun Dec  2 18:54:40 2012 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
  Log:
  - Move edit and rename link to left of content type icon.
  - Column containing document name set to use majority of table width.  
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.516 loncom/interface/londocs.pm:1.517
--- loncom/interface/londocs.pm:1.516	Sun Dec  2 18:44:04 2012
+++ loncom/interface/londocs.pm	Sun Dec  2 18:54:40 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.516 2012/12/02 18:44:04 raeburn Exp $
+# $Id: londocs.pm,v 1.517 2012/12/02 18:54:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2142,7 +2142,7 @@
                                                  &Apache::lonnet::declutter($currurl));
         }
     }
-    my %lt;
+    my ($renamelink,%lt);
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
@@ -2239,7 +2239,7 @@
                 $nocopy=1;
             }
         }
-        my ($copylink,$cutlink,$removelink,$renamelink);
+        my ($copylink,$cutlink,$removelink);
 	my $skip_confirm = 0;
 	if ( $folder =~ /^supplemental/
 	     || ($url =~ m{( /smppg$
@@ -2313,7 +2313,6 @@
 </td>
 <td class="LC_docs_entry_commands"><span class="LC_nobreak">
 $removelink
-$renamelink
 $cutlink
 $copylink
 </span>
@@ -2451,7 +2450,7 @@
         my $fileloc = 
             &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
         if ($isexternal) {
-            $editlink = ' '.
+            $editlink = 
                 &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem);
         } elsif (!$isfolder && !$ispage) {
             my ($cfile,$home,$switchserver,$forceedit,$forceview) = 
@@ -2466,7 +2465,7 @@
                                                             $renametitle);
                 if ($jscall) {
                     $editlink = ' <a class="LC_docs_ext_edit" href="javascript:'.
-                                $jscall.'" >'.&mt('Edit').'</a>';
+                                $jscall.'" >'.&mt('Edit').'</a> ';
                 }
             }
         }
@@ -2477,7 +2476,7 @@
     } 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) {
@@ -2486,7 +2485,7 @@
     } 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) {
@@ -2495,7 +2494,7 @@
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }
-    $line.=$editlink."</td>";
+    $line.='</td>';
     $rand_pick_text = ' ' if ($rand_pick_text eq '');
     $rand_order_text = ' ' if ($rand_order_text eq '');
     if (($allowed) && ($folder!~/^supplemental/)) {