[LON-CAPA-cvs] cvs: loncom /interface lonindexer.pm
jms
jms@source.lon-capa.org
Thu, 19 Mar 2009 14:24:50 -0000
This is a MIME encoded message
--jms1237472690
Content-Type: text/plain
jms Thu Mar 19 14:24:50 2009 EDT
Modified files:
/loncom/interface lonindexer.pm
Log:
Reverted to changes made in 1.192, and added Grade Level to fields
--jms1237472690
Content-Type: text/plain
Content-Disposition: attachment; filename="jms-20090319142450.txt"
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.193 loncom/interface/lonindexer.pm:1.194
--- loncom/interface/lonindexer.pm:1.193 Wed Mar 18 13:47:14 2009
+++ loncom/interface/lonindexer.pm Thu Mar 19 14:24:50 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.193 2009/03/18 13:47:14 jms Exp $
+# $Id: lonindexer.pm,v 1.194 2009/03/19 14:24:50 jms Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -178,7 +178,7 @@
# --------------------- define extra fields and buttons in case of special mode
if ($env{'form.catalogmode'} eq 'interactive') {
#SB $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
- $extrafield='<td valign="bottom">'.
+ $extrafield='<td class="LC_bottom">'.
'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
' class="LC_icon" /></td>';
$colspan=" colspan='2' ";
@@ -189,7 +189,7 @@
}
elsif ($env{'form.catalogmode'} eq 'import') {
#SB $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
- $extrafield='<td valign="bottom">'.
+ $extrafield='<td class="LC_bottom">'.
'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
' class="LC_icon" /></td>';
$colspan=" colspan='2' ";
@@ -409,7 +409,7 @@
ENDHEADER
my ($headerdom)=($uri=~m{^/res/($match_domain)/});
- $r->print(&Apache::loncommon::start_page('Browse Resources',$js,
+ $r->print(&Apache::loncommon::start_page('Content Library',$js,
{'domain' => $headerdom,}));
# ---------------------------------- get state of file types to be showing
if ($env{'form.only'}) {
@@ -420,7 +420,7 @@
# ---------------------------------- get state of file attributes to be showing
if ($env{'form.attrs'}) {
- for (my $i=0; $i<=16; $i++) {
+ for (my $i=0; $i<=15; $i++) {
delete $hash{'display_attrs_'.$i};
if ($env{'form.attr'.$i} == 1) {
$attrchk[$i] = 'checked';
@@ -428,7 +428,7 @@
}
}
} else {
- for (my $i=0; $i<=16; $i++) {
+ for (my $i=0; $i<=15; $i++) {
$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
}
}
@@ -446,10 +446,9 @@
'kw' => 'Keywords',
'sb' => 'Subject',
'nt' => 'Notes',
- 'gl' => 'Grade Level',
'ab' => 'Abstract',
- 'sd' => 'Standards',
'ln' => 'Language',
+ 'gl' => 'Grade Level',
'sa' => 'Source Available',
'sr' => 'Show resource',
'li' => 'Linked/Related Resources',
@@ -473,7 +472,6 @@
<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>
@@ -481,7 +479,6 @@
<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> </td>
</tr>
<tr>
<td><label><input type="checkbox" name="attr8" value="1" $attrchk[8] onClick="this.form.submit();" /> $lt{'st'}</label></td>
@@ -532,13 +529,13 @@
# -------------------------------------------------------- Resource Home Button
my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
if ($reshome) {
- $r->print("<font size='+2'><a href='");
+ $r->print("<span class=\"LC_fontsize_large\"><a href='");
if ($env{'form.catalogmode'} eq 'import') {
$r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();');
} else {
$r->print($reshome);
}
- $r->print("'>".&mt('Home').'</a></font>');
+ $r->print("'>".&mt('Home').'</a></span>');
}
$r->print('</form>');
# ------------------------------------------------------ Remember where we were
@@ -554,12 +551,12 @@
#$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()
+ $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>".&mt('Title')."</th>\n")
if ($hash{'display_attrs_0'} == 1);
- $r->print('<th align="right">'.&mt("Size")." (".&mt("bytes").") ".
+ $r->print('<th class="LC_right">'.&mt("Size")." (".&mt("bytes").") ".
"</th>\n") if ($hash{'display_attrs_1'} == 1);
$r->print("<th>".&mt("Last accessed")."</th>\n")
if ($hash{'display_attrs_2'} == 1);
@@ -588,8 +585,6 @@
if ($hash{'display_attrs_14'} == 1);
$r->print("<th>".&mt("Grade Level")."</th>\n")
if ($hash{'display_attrs_15'} == 1);
- $r->print("<th>".&mt("Standards")."</th>\n")
- if ($hash{'display_attrs_16'} == 1);
$r->print(&Apache::loncommon::end_data_table_header_row());
@@ -855,14 +850,15 @@
my $fnptr = $filecom[3]&$dirptr;
my $msg = &mt('View').' '.$filecom[0].' '.&mt('resources');
$msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened';
+ my $nowOpen = ($diropen eq 'opened' ? 1 : 0);
my $tabtag='</td>';
my $i=0;
- while ($i<=16) {
+ while ($i<=15) {
$tabtag=join('',$tabtag,"<td> </td>")
if ($i != 9 &&
$hash{'display_attrs_'.$i} == 1);
- $i++;
+ $i++;
}
my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
@@ -886,11 +882,11 @@
$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 ('<input src="'.$iconpath.'arrow_up.gif"');
- $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+ $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 (' name="'.$msg.'" type="image" class="LC_fileicon" />'.
"\n");
- $r->print(&mt("Up")."</form>$tabtag");
+ $r->print(&mt("Up")."</a></form>$tabtag");
$r->print(&Apache::loncommon::end_data_table_row());
return OK;
}
@@ -913,18 +909,17 @@
my $anchor = $filecom[0];
$anchor =~ s/\W//g;
$r->print ('<a name="'.$anchor.'"></a>');
- $r->print ('<input type="hidden" name="acts" value="" />');
- $r->print ('<input src="'.$iconpath.'folder_pointer_'.
- $diropen.'.gif"');
- $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+$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 (' name="'.$msg.'" type="image" class="LC_fileicon" /></a>'.
"\n");
my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
$r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
'\')"><img alt="" src="'.$iconpath.'server.gif"');
- $r->print (' class="LC_icon" /></a>'."\n");
- $r->print (&mt("Domain")." - $listname ");
+ $r->print (' class="LC_fileicon" />'."\n");
+ $r->print (&mt("Domain")." - $listname </a>");
if (&Apache::lonnet::domain($listname,'description')) {
- $r->print("(".&Apache::lonnet::domain($listname,'description').
+ $r->print("<br />(".&Apache::lonnet::domain($listname,'description').
")");
}
$r->print("</form>$tabtag");
@@ -940,50 +935,52 @@
$anchor =~ s/\W//g;
#SB $r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
$r->print(&Apache::loncommon::start_data_table_row()
- .$extrafield.'<td valign="'.$valign.'">');
+ .$extrafield.'<td class="LC_'.$valign.'">');
&begin_form ($r,$curdir);
$r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
- 'whitespace1.gif" class="LC_icon" />'."\n");
+ 'whitespace_21.gif" class="LC_icon" />'."\n");
$r->print ('<input type="hidden" name="acts" value="" />');
- $r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.
- '.gif"');
- $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+ $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()">');
+ $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
+ '.gif" class="LC_fileicon"');
+ $r->print (' name="'.$msg.'"/></a>'.
"\n");
my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
$r->print ('<a href="javascript:gothere(\''.$quotable_curdir
.'\')"><img alt="'.$msg.'" src="'.
- $iconpath.'quill.gif" class="LC_indexer_icon" /></a>');
+ $iconpath.'quill.gif" class="LC_fileicon" />');
my $domain=(split(m|/|,$startdir))[2];
my $plainname=&Apache::loncommon::plainname($listname,$domain);
- $r->print ($listname);
- if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
- $r->print('</form>'.$tabtag);
+ $r->print ($listname.'</a>');
+
+ if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
+ $r->print('</form>'.$tabtag);
$r->print(&Apache::loncommon::end_data_table_row());
- return OK;
+ return OK;
}
# display file
- if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
- my $title;
- my $filelink = $pathprefix.$filecom[0];
- if ($hash{'display_attrs_0'} == 1) {
- $title = &Apache::lonnet::gettitle($filelink);
- }
- my @file_ext = split (/\./,$listname);
- my $curfext = $file_ext[-1];
- if (@Omit) {
- foreach (@Omit) { return OK if (lc($curfext) eq $_); }
- }
- if (@Only) {
- my $skip = 1;
- foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); }
- return OK if ($skip > 0);
- }
- # Set the icon for the file
- my $iconname = &Apache::loncommon::icon($listname);
+ if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
+ my $title;
+ my $filelink = $pathprefix.$filecom[0];
+ if ($hash{'display_attrs_0'} == 1) {
+ $title = &Apache::lonnet::gettitle($filelink);
+ }
+ my @file_ext = split (/\./,$listname);
+ my $curfext = $file_ext[-1];
+ if (@Omit) {
+ foreach (@Omit) { return OK if (lc($curfext) eq $_); }
+ }
+ if (@Only) {
+ my $skip = 1;
+ foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); }
+ return OK if ($skip > 0);
+ }
+ # Set the icon for the file
+ my $iconname = &Apache::loncommon::icon($listname);
#SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">);
- $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
- $r->print('<td valign="top"><span class="LC_nobreak">');
+ $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
+ $r->print('<td class="LC_middle LC_nobreak">');
if ($env{'form.catalogmode'} eq 'interactive') {
my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
@@ -991,7 +988,7 @@
$quotable_filelink,"')\">");
$r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".
"\n");
- $r->print('</span></td><td valign="top"><span class="LC_nobreak">');
+ $r->print('</td><td class="LC_middle"><span class="LC_nobreak">');
} elsif ($env{'form.catalogmode'} eq 'import') {
$r->print("<form name='form$fnum' action=''>\n");
$r->print("<input type='checkbox' name='filelink"."' ".
@@ -1001,7 +998,7 @@
$r->print("checked");
}
$r->print(" />\n");
- $r->print('</form></span></td><td valign="top"><span class="LC_nobreak">');
+ $r->print('</form></td><td class="LC_middle"><span class="LC_nobreak">');
$hash{"pre_${fnum}_link"}=$filelink;
$hash{"pre_${fnum}_title"}=$title;
if (!$hash{"pre_${fnum}_title"}) {
@@ -1016,34 +1013,27 @@
$indent--;
}
# General indentation
- if ($indent > 0 and $indent < 16) {
- $r->print("<img alt=\"\" src='",$iconpath,"whitespace",$indent,
- ".gif' class='LC_icon' />\n");
- } elsif ($indent >0) {
- my $ten = int($indent/10.);
- my $rem = $indent%10.0;
my $count = 0;
- while ($count < $ten) {
+ while ($count < $indent) {
$r->print("<img alt=\"\" src=".$iconpath.
- "whitespace10.gif class='LC_icon' />\n");
- $count++;
+ "whitespace_21.gif class='LC_icon' />\n");
+ $count++;
}
- $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
- ".gif class='LC_icon' />\n") if $rem > 0;
- }
# Sequence open/close icon
if ($filelink=~/\.(page|sequence)$/) {
my $curdir = $startdir.$filecom[0].'/';
my $anchor = $curdir;
$anchor =~ s/\W//g;
$r->print ('<input type="hidden" name="acts" value="" />');
- $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
- 'folder_pointer_'.$diropen.'.gif"');
- $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+ $r->print ('<a name="'.$anchor.'"></a>');
+ $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()">');
+ $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
+ '.gif" class="LC_fileicon"');
+ $r->print (' name="'.$msg.'" type="image" class="LC_fileicon" /></a>'.
"\n");
}
# Filetype icons
- $r->print("<img alt=\"\" src='$iconname' class='LC_icon' />\n");
+ $r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\n");
my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
$r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
@@ -1063,19 +1053,19 @@
$r->print('<td> '.($title eq '' ? ' ' : $title).
' </td>'."\n");
}
- $r->print('<td align="right"> ',
+ $r->print('<td class="LC_right"> ',
$filecom[8]," </td>\n")
if $hash{'display_attrs_1'} == 1;
- $r->print('<td> '.
+ $r->print('<td class="LC_nobreak"> '.
(&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
if $hash{'display_attrs_2'} == 1;
- $r->print('<td> '.
+ $r->print('<td class="LC_nobreak"> '.
(&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
if $hash{'display_attrs_3'} == 1;
if ($hash{'display_attrs_4'} == 1) {
my $author = &Apache::lonnet::metadata($filelink,'author');
- $r->print('<td> '.($author eq '' ? ' ' : $author).
+ $r->print('<td class="LC_nobreak"> '.($author eq '' ? ' ' : $author).
" </td>\n");
}
if ($hash{'display_attrs_5'} == 1) {
@@ -1169,12 +1159,6 @@
" </td>\n");
}
- if ($hash{'display_attrs_16'} == 1) {
- my $standards = &Apache::lonnet::metadata($filelink,'standards');
- $r->print('<td> '.($standards eq '' ? ' ' : $standards).
- " </td>\n");
- }
-
$r->print(&Apache::loncommon::end_data_table_row());
}
@@ -1188,36 +1172,31 @@
#SB $r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
$r->print(&Apache::loncommon::start_data_table_row()); # SB: bgcolor suggestion: darkgrey ("LC_info_row"?!?)
# $r->print('<tr class="LC_info_row">');
- $r->print($extrafield.'<td valign="'.$valign.'">');
+ $r->print($extrafield.'<td class="LC_middle LC_nobreak">');
&begin_form ($r,$curdir);
my $indentm1 = $indent-1;
- if ($indentm1 < 12 and $indentm1 > 0) {
- $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indentm1,
- ".gif class='LC_icon' />\n");
- } else {
- my $ten = int($indentm1/10.);
- my $rem = $indentm1%10.0;
- my $count = 0;
- while ($count < $ten) {
- $r->print ("<img alt=\"\" src=",$iconpath
- ,"whitespace10.gif class='LC_icon' />\n");
- $count++;
- }
- $r->print ("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
- ".gif class='LC_icon' />\n") if $rem > 0;
+ my $count = 0;
+ while ($count < $indentm1) {
+ $r->print ("<img alt=\"\" src=",$iconpath
+ ,"whitespace_21.gif class='LC_icon' />\n");
+ $count++;
}
$r->print ('<input type="hidden" name="acts" value="" />');
- $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
- 'folder_pointer_'.$diropen.'.gif"');
- $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+ $r->print ('<a name="'.$anchor.'"></a>');
+ $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.
+ 'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"');
+ $r->print (' name="'.$msg.'" class="LC_fileicon" /></a>'.
"\n");
my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
- $r->print ('<a href="javascript:gothere(\''
- .$quotable_curdir.'\')">'
- .'<img alt="'.&mt('Open Folder').'"src="'.
- $iconpath.'folder_'.$diropen.'.gif" class="LC_icon" /></a>'.
- "\n");
- $r->print ("$listname</form></td>\n");
+
+ 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");
# Attributes
my $filelink = $startdir.$filecom[0].'/default';
@@ -1226,13 +1205,13 @@
$r->print('<td> '.($title eq '' ? ' ' : $title).
' </td>'."\n");
}
- $r->print('<td align="right"> ',
+ $r->print('<td class="LC_right"> ',
$filecom[8]," </td>\n")
if $hash{'display_attrs_1'} == 1;
- $r->print('<td> '.
+ $r->print('<td class="LC_break"> '.
(&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
if $hash{'display_attrs_2'} == 1;
- $r->print('<td> '.
+ $r->print('<td class="LC_break"> '.
(&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
if $hash{'display_attrs_3'} == 1;
@@ -1289,12 +1268,6 @@
" </td>\n");
}
- if ($hash{'display_attrs_16'} == 1) {
- my $standards = &Apache::lonnet::metadata($filelink,'standards');
- $r->print('<td> '.($standards eq '' ? ' ' : $standards).
- " </td>\n");
- }
-
$r->print(&Apache::loncommon::end_data_table_row());
}
@@ -1344,7 +1317,7 @@
close(FH);
}
}
- $output='<font size="-2">'.$output.'</font>';
+ $output='<span class="LC_fontsize_medium">'.$output.'</span>';
} elsif ($embstyle eq 'img') {
$output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
} elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
--jms1237472690--