[LON-CAPA-cvs] cvs: modules /gerd/harvesting lonindexer.pm
www
www at source.lon-capa.org
Wed Jul 11 18:51:52 EDT 2012
www Wed Jul 11 22:51:52 2012 EDT
Modified files:
/modules/gerd/harvesting lonindexer.pm
Log:
Cleanup and JavaScript problem
Index: modules/gerd/harvesting/lonindexer.pm
diff -u modules/gerd/harvesting/lonindexer.pm:1.10 modules/gerd/harvesting/lonindexer.pm:1.11
--- modules/gerd/harvesting/lonindexer.pm:1.10 Wed Jul 11 18:59:54 2012
+++ modules/gerd/harvesting/lonindexer.pm Wed Jul 11 22:51:52 2012
@@ -5,7 +5,7 @@
#
# MODIFY $datapath VARIABLE FOR LOCATION OF DATA FILES
#
-# $Id: lonindexer.pm,v 1.10 2012/07/11 18:59:54 www Exp $
+# $Id: lonindexer.pm,v 1.11 2012/07/11 22:51:52 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -336,6 +336,7 @@
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['catalogmode','launch','acts','mode','form','element',
'only','omit','titleelement','basket']);
+
#-------------------------------------------------------------------
#
# Get the current basket if being called from londocs
@@ -727,25 +728,6 @@
'at' => 'All types',
'hd' => 'Display Options'
);
- 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('
@@ -1089,16 +1071,14 @@
$r->print($extrafield);
$r->print("<td>\n");
$r->print ('<form method="post" name="dirpathUP" action="'.$updir.
- '/" '.
- 'onsubmit="return rep_dirpath(\'UP\','.
- 'document.forms.fileattr.acts.value)" '.
- 'enctype="application/x-www-form-urlencoded"'.
+ '/" enctype="application/x-www-form-urlencoded"'.
'>'."\n");
$r->print(&Apache::loncommon::inhibit_menu_check('input'));
$r->print ('<input type="hidden" name="openuri" value="'.
$startdir.'" />'."\n");
$r->print ('<input type="hidden" name="acts" value="" />'."\n");
- $r->print ('<a href="#" onclick="document.dirpathUP.submit()"><img src="'.$iconpath.'arrow.up.gif"');
+ $r->print ('<a href="#" onclick="rep_dirpath(\'UP\','.
+ 'document.forms.fileattr.acts.value); document.dirpathUP.submit()"><img src="'.$iconpath.'arrow.up.gif"');
$r->print (' alt="'.$msg.'" class="LC_fileicon" />'.
"\n");
$r->print(&mt("Up")."</a></form></td><td>$tabtag");
@@ -1124,7 +1104,8 @@
$anchor =~ s/\W//g;
$r->print ('<a name="'.$anchor.'"></a>');
$r->print ('<input type="hidden" name="acts" value="" />');
- $r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"');
+ $r->print ('<a href="#" onclick="rep_dirpath(\''.($dnum-1).'\''.
+ ',document.forms.fileattr.acts.value); document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"');
$r->print (' alt="'.$msg.'" class="LC_fileicon" /></a>'.
"\n");
my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
@@ -1154,7 +1135,8 @@
$r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
'whitespace_21.gif" class="LC_icon" />'."\n");
$r->print ('<input type="hidden" name="acts" value="" />');
- $r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()">');
+ $r->print ('<a href="#" onclick="rep_dirpath(\''.($dnum-1).'\''.
+ ',document.forms.fileattr.acts.value); document.dirpath'.($dnum-1).'.submit()">');
$r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
'.gif" class="LC_fileicon"');
$r->print (' alt="'.$msg.'"/></a>'.
@@ -1238,7 +1220,8 @@
$anchor =~ s/\W//g;
$r->print ('<input type="hidden" name="acts" value="" />');
$r->print ('<a name="'.$anchor.'"></a>');
- $r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()">');
+ $r->print ('<a href="#" onclick="rep_dirpath(\''.($dnum-1).'\''.
+ ',document.forms.fileattr.acts.value); document.dirpath'.($dnum-1).'.submit()">');
$r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
'.gif" class="LC_fileicon"');
$r->print (' alt="'.$msg.'" /></a>'.
@@ -1303,7 +1286,8 @@
}
$r->print ('<input type="hidden" name="acts" value="" />');
$r->print ('<a name="'.$anchor.'"></a>');
- $r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.
+ $r->print ('<a href="#" onclick="rep_dirpath(\''.($dnum-1).'\''.
+ ',document.forms.fileattr.acts.value); document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.
'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"');
$r->print (' alt="'.$msg.'" class="LC_fileicon" /></a>'.
"\n");
@@ -1317,7 +1301,6 @@
.$location.'/'.$icon.'" />'
."\n");
$r->print ("$listname</a></form>");
-# Wishlistlink
$r->print('</td>');
# Attributes
my $filelink = $startdir.$filecom[0].'/default';
@@ -1459,9 +1442,7 @@
$uri=&Apache::loncommon::escape_single($uri);
$r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.
'#'.$anchor.
- '" onsubmit="return rep_dirpath(\''.$dnum.'\''.
- ',document.forms.fileattr.acts.value)" '.
- 'enctype="application/x-www-form-urlencoded">'."\n");
+ '" enctype="application/x-www-form-urlencoded">'."\n");
$r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.
"\n");
$r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n");
More information about the LON-CAPA-cvs
mailing list