--- loncom/interface/lonindexer.pm	2009/10/30 05:12:01	1.201
+++ loncom/interface/lonindexer.pm	2010/08/13 13:32:36	1.208
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.201 2009/10/30 05:12:01 raeburn Exp $
+# $Id: lonindexer.pm,v 1.208 2010/08/13 13:32:36 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -321,10 +321,8 @@ function select_group() {
 
 function changeURL(val) {
     if (window.opener.document) {
-        var elementname  = "$element"+"_value";
-        var checkboxname = "$element"+"_setparmval";
+        var elementname  = "$element";
 	window.opener.document.forms["$form"].elements[elementname].value=val;
-        window.opener.document.forms["$form"].elements[checkboxname].checked=true;
     } else {
 	    alert("The file you selected is: "+val);
     }
@@ -452,26 +450,29 @@ ENDHEADER
 	    }
 	}
 
+        my @file_categories = &Apache::loncommon::filecategories();
+        my %select_file_categories;
+        my @select_form_order = ('');
+        $select_file_categories{''} = &mt('All file types');
+        foreach my $cat (@file_categories) {
+            my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
+            $select_file_categories{$types} = &mt($cat);
+            push(@select_form_order,$types);
+        }
+        $select_file_categories{'select_form_order'} = \@select_form_order;
+        my $onchange = 'this.form.submit();';
+        my $type_element=
+            &Apache::loncommon::select_form(
+                $typeselect,
+                'only',
+                \%select_file_categories,$onchange);
+        my $type_selector = '<label>'.&mt('File Type Displayed: [_1]',
+                                          $type_element).'</label>';
+
 # ------------------------------- output state of file attributes to be showing
 #                                 All versions has to the last item
 #                                 since it does not take an extra col
 	my %lt=&Apache::lonlocal::texthash(
-					   'ti' => 'Title',
-					   'si' => 'Size',
-					   'la' => 'Last access',
-					   'lm' => 'Last modified',
-					   'st' => 'Statistics',
-					   'au' => 'Author',
-					   'kw' => 'Keywords',
-					   'sb' => 'Subject',
-					   'nt' => 'Notes',
-					   'ab' => 'Abstract',
-					   'ln' => 'Language',
-					   'gl' => 'Grade Level',
-					   'sd' => 'Standards',
-					   'sa' => 'Source Available',
-					   'sr' => 'Show resource',
-					   'li' => 'Linked/Related Resources',
 					   'av' => 'All versions',
 					   'ud' => 'Update Display',
 					   'pr' => 'Problems',
@@ -479,57 +480,61 @@ ENDHEADER
 					   'at' => 'All types',
 					   'hd' => 'Display Options'
 					   );
-	$r->print(<<END);
-<form method="post" name="fileattr" action="$uri" enctype="application/x-www-form-urlencoded">
+        my @disp_order = ('0','4','5','6','13','1','2','3','10','14','8','11','7','12','15','16');
+        my %disp_options = &Apache::lonlocal::texthash (
+                              0  => 'Title',
+                              4  => 'Author',
+                              5  => 'Keywords',
+                              6  => 'Language',
+                              13 => 'Notes',
+                              1  => 'Size',
+                              2  => 'Last access',
+                              3  => 'Last modified',
+                              10 => 'Source Available',
+                              14 => 'Abstract',
+                              8  => 'Statistics',
+                              11 => 'Linked/Related Resources',
+                              7  => 'Show resource',
+                              12 => 'Subject',
+                              15 => 'Grade Level',
+                              16 => 'Standards',
+                           );
+        my $cell = 0;
+        my $numinrow = 4;
+	$r->print('
+<form method="post" name="fileattr" action="'.$uri.'" enctype="application/x-www-form-urlencoded">
 <fieldset>
-<legend>$lt{'hd'}</legend>
-<label><input type="checkbox" name="attr9" value="1" $attrchk[9] onclick="this.form.submit();" /> $lt{'av'}</label>
-<table border="0">
-<tr>
-<td><label><input type="checkbox" name="attr0" value="1" $attrchk[0] onclick="this.form.submit();" /> $lt{'ti'}</label></td>
-<td><label><input type="checkbox" name="attr4" value="1" $attrchk[4] onclick="this.form.submit();" /> $lt{'au'}</label></td>
-<td><label><input type="checkbox" name="attr5" value="1" $attrchk[5] onclick="this.form.submit();" /> $lt{'kw'}</label></td>
-<td><label><input type="checkbox" name="attr6" value="1" $attrchk[6] onclick="this.form.submit();" /> $lt{'ln'}</label></td>
-<td><label><input type="checkbox" name="attr13" value="1" $attrchk[13] onclick="this.form.submit();" /> $lt{'nt'}</label></td>
-<td><label><input type="checkbox" name="attr16" value="1" $attrchk[16] onclick="this.form.submit();" /> $lt{'sd'}</label></td>
-</tr>
-<tr>
-<td><label><input type="checkbox" name="attr1" value="1" $attrchk[1] onclick="this.form.submit();" /> $lt{'si'}</label></td>
-<td><label><input type="checkbox" name="attr2" value="1" $attrchk[2] onclick="this.form.submit();" /> $lt{'la'}</label></td>
-<td><label><input type="checkbox" name="attr3" value="1" $attrchk[3] onclick="this.form.submit();" /> $lt{'lm'}</label></td>
-<td><label><input type="checkbox" name="attr10" value="1" $attrchk[10] onclick="this.form.submit();" /> $lt{'sa'}</label></td>
-<td><label><input type="checkbox" name="attr14" value="1" $attrchk[14] onclick="this.form.submit();" /> $lt{'ab'}</label></td>
-<td>&nbsp;</td>
-</tr>
+<legend>'.$lt{'hd'}.'</legend>
+<table style=" border-collapse: collapse; border-style: none;">'."\n");
+        foreach my $item (@disp_order) {
+            my $style = 'padding-left: 12px; padding-right: 8px;';
+            if ($cell%$numinrow == 0) {
+                $r->print('<tr>');
+            }
+            $cell ++;
+            if ($cell > 3 * $numinrow) {
+                $style .= ' padding-bottom: 6px;'; 
+            }
+            if (defined($disp_options{$item})) {
+                $r->print('<td style="'.$style.'"><span class="LC_nobreak">'.
+                          '<label><input type="checkbox" name="attr'.$item.'" value="1" '.
+                          $attrchk[$item].' onclick="this.form.submit();" /> '.$disp_options{$item}.
+                          '</label></span></td>'."\n");
+            }
+            if ($cell > 1 && $cell%$numinrow == 0) {
+                $r->print('</tr>');
+            }
+        }
+        $r->print(<<END);
 <tr>
-<td><label><input type="checkbox" name="attr8" value="1" $attrchk[8] onclick="this.form.submit();" /> $lt{'st'}</label></td>
-<td><label><input type="checkbox" name="attr11" value="1" $attrchk[11] onclick="this.form.submit();" /> $lt{'li'}</label></td>
-<td><label><input type="checkbox" name="attr7" value="1" $attrchk[7] onclick="this.form.submit();" /> $lt{'sr'}</label></td>
-<td><label><input type="checkbox" name="attr12" value="1" $attrchk[12] onclick="this.form.submit();" /> $lt{'sb'}</label></td>
-<td><label><input type="checkbox" name="attr15" value="1" $attrchk[15] onclick="this.form.submit();" /> $lt{'gl'}</label></td>
-<td>&nbsp;</td>
+<td style="font-style: italic; border-top: 1px solid black; padding-top: 6px"> 
+<label><input type="checkbox" name="attr9" value="1" $attrchk[9] onclick="this.form.submit();" /> $lt{'av'}</label>
+</td>
+<td colspan="3" style="padding-left:8px; padding-top: 4px; font-style: italic; border-top: 1px solid black; padding-top: 8px">$type_selector</td>
 </tr>
 </table>
 <input type="hidden" name="attrs" value="1" />
-END
-        my @file_categories = &Apache::loncommon::filecategories();
-        my %select_file_categories;
-        my @select_form_order = ('');
-        $select_file_categories{''} = &mt('All file types');
-        foreach my $cat (@file_categories) {
-	    my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
-	    $select_file_categories{$types} = $cat;
-	    push(@select_form_order,$types);
-	}
-        $select_file_categories{'select_form_order'} = \@select_form_order;
-        my $type_element=
-	    &Apache::loncommon::select_form($typeselect,'only',
-					    %select_file_categories);
-        $type_element = '<label>'.&mt('File Type Displayed: [_1]',
-				      $type_element).'</label>';
-        $r->print($type_element
-                 .'</fieldset>');
-        $r->print(<<END);
+</fieldset>
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton
@@ -541,11 +546,21 @@ END
 	$storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
 	$storeuri=~s/\/+/\//g;
 # ---------------------------------------------------------------- Bread crumbs
-        $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','',
-				(($env{'form.catalogmode'} eq 'import')?
-				 'document.forms.fileattr':'')).
-		  &Apache::lonhtmlcommon::select_recent('residx','resrecent',
-'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));
+        $r->print(
+            '<p>'
+           .&Apache::lonhtmlcommon::crumbs(
+                $storeuri,
+                '',
+                '',
+                (($env{'form.catalogmode'} eq 'import')?
+                                 'document.forms.fileattr':''))
+           .'<br />'
+           .&Apache::lonhtmlcommon::select_recent(
+                'residx',
+                'resrecent',
+                'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();')
+           .'</p>'
+        );
 # -------------------------------------------------------- Resource Home Button
 	my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
 	if ($reshome) {
@@ -563,17 +578,17 @@ END
 	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # -------------------------------------------------- Check All and Uncheck all
 	if ($env{'form.catalogmode'} eq 'import') {
-	    $r->print('<br /><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onclick="javascript:checkAll()" />');
-	    $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onclick="javascript:uncheckAll()" />');
+	    $r->print('<p><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onclick="javascript:checkAll()" />');
+	    $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onclick="javascript:uncheckAll()" /></p>');
 	}
 # ----------------- output starting row to the indexed file/directory hierarchy
         #$r->print(&initdebug());
         #$r->print(&writedebug("Omit:@Omit")) if (@Omit);
         #$r->print(&writedebug("Only:@Only")) if (@Only);
-        $r->print('<br /><br />');
         $r->print(&Apache::loncommon::start_data_table("LC_tableBrowseRes")
                  .&Apache::loncommon::start_data_table_header_row());
 	$r->print("<th $colspan>".&mt('Name')."</th>\n");
+	$r->print("<th></th>\n");
 	$r->print("<th>".&mt('Title')."</th>\n") 
 	    if ($hash{'display_attrs_0'} == 1);
 	$r->print('<th class="LC_right">'.&mt("Size")." (".&mt("bytes").") ".
@@ -908,7 +923,7 @@ sub display_line {
 	$r->print ('<a href="#" onclick="document.dirpathUP.submit()"><img src="'.$iconpath.'arrow.up.gif"');
 	$r->print (' alt="'.$msg.'" class="LC_fileicon" />'.
 		   "\n");
-	$r->print(&mt("Up")."</a></form>$tabtag");
+	$r->print(&mt("Up")."</a></form></td><td>$tabtag");
         $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
     }
@@ -943,7 +958,7 @@ $r->print ('<input type="hidden" name="a
 	    $r->print("<br />(".&Apache::lonnet::domain($listname,'description').
 		      ")");
 	}
-	$r->print("</form>$tabtag");
+	$r->print("</form></td><td>$tabtag");
          $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
 
@@ -975,7 +990,12 @@ $r->print ('<input type="hidden" name="a
         $r->print ($listname.'</a>');
 
         if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
-        $r->print('</form>'.$tabtag);
+# Wishlistlink
+        $r->print('</form></td><td><a href="javascript:;" '.
+                  'title="'.&mt('Set a link for this folder to wishlist').'" '.
+                  'onclick="set_wishlistlink('."'$plainname','$startdir$listname'".')">'.
+                  '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
+                  'alt="'.&mt('set wishlistlink').'" style="width:22px;"/></a>'.$tabtag);
         $r->print(&Apache::loncommon::end_data_table_row());
         return OK;
     }
@@ -1070,6 +1090,12 @@ $r->print ('<input type="hidden" name="a
 	    $r->print('</form>');
 	}
 	$r->print("</td>\n");
+# Wishlistlink
+        $r->print('<td><a href="javascript:;" title="'.&mt('Set a link for this resource to wishlist').'" '.
+                  'onclick="set_wishlistlink('."'".&Apache::lonnet::gettitle($filelink).
+                  "','$startdir$listname'".')">'.
+                  '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
+                  'alt="'.&mt('set wishlistlink').'" style="width:22px;"/></a></td>');
 	if ($hash{'display_attrs_0'} == 1) {
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
@@ -1212,12 +1238,18 @@ $r->print ('<input type="hidden" name="a
         
         my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");
 	my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';
-        $r->print ('<a href="javascript:gothere(\''
-		   .$quotable_curdir.'\')"">'
-		   .'<img class="LC_fileicon" alt="'.&mt('Open Folder').'" src="'.
-                   $location."/".$icon.'" />'.
-                   "\n");
-	$r->print ("$listname</a></form></td>\n");
+        $r->print ('<a href="javascript:gothere('
+                  ."'$quotable_curdir'".');">'
+                  .'<img class="LC_fileicon" alt="'.&mt('Open Folder').'" src="'
+                  .$location.'/'.$icon.'" />'
+                  ."\n");
+	$r->print ("$listname</a></form>");
+# Wishlistlink
+        $r->print('</td><td><a href="javascript:;" '.
+                  'title="'.&mt('Set a link for this folder to wishlist').'" '.
+                  'onclick="set_wishlistlink('."'$listname','$startdir$listname'".')">'.
+                  '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
+                  'alt="'.&mt('set wishlistlink').'" style="width:22px;"/></a></td>');
 # Attributes
 	my $filelink = $startdir.$filecom[0].'/default';