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

[raeburn]

raeburn		Sun Mar 17 18:49:17 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	londocs.pm 
  Log:
  - For 2.11
    - Backport 1.535, 1.536.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.27 loncom/interface/londocs.pm:1.484.2.28
--- loncom/interface/londocs.pm:1.484.2.27	Sun Mar 17 18:46:21 2013
+++ loncom/interface/londocs.pm	Sun Mar 17 18:49:16 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.27 2013/03/17 18:46:21 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.28 2013/03/17 18:49:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2432,12 +2432,7 @@
     my $line=&Apache::loncommon::start_data_table_row();
     my ($form_start,$form_end,$form_common);
 # Edit commands
-    my ($type, $esc_path, $path, $symb);
-    if ($container eq 'page') {
-        $type = 'page';
-    } else {
-        $type = 'folder';
-    }
+    my ($esc_path, $path, $symb);
     if ($env{'form.folderpath'}) {
 	$esc_path=&escape($env{'form.folderpath'});
 	$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
@@ -2605,8 +2600,8 @@
    <form action="/adm/coursedocs" method="post">
 ';
         $form_common=(<<END);
-   <input type="hidden" name="${type}path" value="$path" />
-   <input type="hidden" name="${type}symb" value="$symb" />
+   <input type="hidden" name="folderpath" value="$path" />
+   <input type="hidden" name="symb" value="$symb" />
    <input type="hidden" name="setparms" value="$orderidx" />
    <input type="hidden" name="changeparms" value="0" />
 END
@@ -2614,12 +2609,12 @@
 	$line.=(<<END);
 <td>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=up_$index&${type}path=$esc_path&${type}symb=$symb'>
+  <a href='/adm/coursedocs?cmd=up_$index&folderpath=$esc_path&symb=$symb'>
     <img src="${iconpath}move_up.gif" alt="$lt{'up'}" class="LC_icon" />
   </a>
 </div>
 <div class="LC_docs_entry_move">
-  <a href='/adm/coursedocs?cmd=down_$index&${type}path=$esc_path&${type}symb=$symb'>
+  <a href='/adm/coursedocs?cmd=down_$index&folderpath=$esc_path&symb=$symb'>
     <img src="${iconpath}move_down.gif" alt="$lt{'dw'}" class="LC_icon" />
   </a>
 </div>