--- loncom/publisher/lonpubdir.pm 2008/01/16 12:08:04 1.106
+++ loncom/publisher/lonpubdir.pm 2009/02/12 21:15:56 1.119
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.106 2008/01/16 12:08:04 bisitz Exp $
+# $Id: lonpubdir.pm,v 1.119 2009/02/12 21:15:56 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -105,15 +105,16 @@ sub handler {
my $numres = 0;
# Start off the directory table.
- $r->print('<h3>'.&mt('Directory Contents:').'</h3>');
- $r->print('<table id="LC_browser"><tr>'.
- '<th>'.&mt('Type').'</th>'.
- '<th>'.&mt('Actions').'</th>'.
- '<th>'.&mt('Name').'</th>'.
- '<th>'.&mt('Title').'</th>'.
- '<th>'.&mt('Status').'</th>'.
- '<th>'.&mt('Last Modified').
- '</th></tr>'."\n");
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Type').'</th>'
+ .'<th>'.&mt('Actions').'</th>'
+ .'<th>'.&mt('Name').'</th>'
+ .'<th>'.&mt('Title').'</th>'
+ .'<th colspan="2">'.&mt('Status').'</th>'
+ .'<th>'.&mt('Last Modified').'</th>'
+ .&Apache::loncommon::end_data_table_header_row()
+ );
my $filename;
my $dirptr=16384; # Mask indicating a directory in stat.cmode.
@@ -139,7 +140,9 @@ sub handler {
}
closedir(DIR);
- $r->print('</table>'.&Apache::loncommon::end_page());
+ $r->print(&Apache::loncommon::end_data_table()
+ .&Apache::loncommon::end_page()
+ );
return OK;
}
#
@@ -156,7 +159,7 @@ sub getEffectiveUrl {
# Replace the ~username of the URL with /home/username/public_html
# so that we don't have to worry about ~ expansion internally.
#
- $fn=~s/^http\:\/\/[^\/]+\///;
+ $fn=~s/^https?\:\/\/[^\/]+\///;
$fn=~s/^\///;
$fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html};
@@ -207,19 +210,21 @@ sub startpage {
&Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
if ($env{'environment.remote'} eq 'off') {
$env{'request.noversionuri'}=$currdir.'/';
- $r->print(&Apache::loncommon::start_page(&mt('Construction Space'),undef,
+ $r->print(&Apache::loncommon::start_page('Construction Space',undef,
{'body_title' =>
$pagetitle,}));
} else {
- $r->print(&Apache::loncommon::start_page(&mt('Construction Space'),undef,
+ $r->print(&Apache::loncommon::start_page('Construction Space',undef,
{ 'only_body' => 1,}));
$r->print($pagetitle);
}
my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
+ my $doctitle = 'LON-CAPA '.&mt('Construction Space');
+ my $newname = &mt('New Name');
my $pubdirscript=(<<ENDPUBDIRSCRIPT);
<script type="text/javascript">
-top.document.title = '$esc_thisdisfn/ - '.&mt('LON-CAPA Construction Space');
+top.document.title = '$esc_thisdisfn/ - $doctitle';
// Store directory location for menu bar to find
parent.lastknownpriv='/~$uname$esc_thisdisfn/';
@@ -231,7 +236,7 @@ parent.lastknownpriv='/~$uname$esc_thisd
document.publishdir.filename.value = theform.filename.value;
document.publishdir.submit();
}
- if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editmeta') {
top.location=theform.filename.value+'default.meta'
}
if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'printdir' ) {
@@ -261,7 +266,7 @@ parent.lastknownpriv='/~$uname$esc_thisd
if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
theform.submit();
}
- if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
+ if (theform.diraction.options[theform.diraction.selectedIndex].value == "editmeta") {
top.location=theform.filename.value+'default.meta'
}
if (theform.diraction.options[theform.diraction.selectedIndex].value == "printdir") {
@@ -313,7 +318,7 @@ parent.lastknownpriv='/~$uname$esc_thisd
}
function changename(theform,activity) {
var oldname=theform.dispfilename.value;
- var newname=prompt('New Name',oldname);
+ var newname=prompt('$newname',oldname);
if (newname == "" || !newname || newname == oldname) {
return
}
@@ -346,7 +351,7 @@ sub dircontrols {
list => 'List Directory',
uplo => 'Upload file',
dele => 'Delete',
- edit => 'Edit Catalog Information',
+ edit => 'Edit Metadata',
sela => 'Select Action',
nfil => 'New file',
nhtm => 'New HTML file',
@@ -371,42 +376,46 @@ sub dircontrols {
);
my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
$r->print(<<END);
- <table id="LC_cstr_controls">
- <tr>
- <th>$lt{'acti'}</th>
- <th>$lt{'updc'}</th>
- <th>$lt{'crea'}</th>
- </tr>
- <tr>
- <td>
- <form name="curractions" method="post" action="">
- <select name="dirtask" onchange="currdiract(this.form)">
+<div class="LC_columnSection">
+ <div>
+ <form name="curractions" method="post" action="">
+ <fieldset>
+ <legend>$lt{'acti'}</legend>
+ <select name="dirtask" onchange="currdiract(this.form)">
<option>$lt{'sela'}</option>
<option value="publish">$lt{'pubd'}</option>
- <option value="editcat">$lt{'edit'}</option>
+ <option value="editmeta">$lt{'edit'}</option>
<option value="printdir">$lt{'prnt'}</option>
<option value="delete">$lt{'dedr'}</option>
- </select>
- <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
- </form>
- <form name="publishdir" method="post" action="/adm/publish" target="_parent">
- <input type="hidden" name="pubrec" value="" />
- <input type="hidden" name="filename" value="" />
- </form>
- <form name="printdir" method="post" action="/adm/printout" target="_parent">
- <input type="hidden" name="postdata" value="" />
- </form>
- </td>
- <td>
- <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
- <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
- <input type="file" name="upfile" size="20" />
- <input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />
- </form>
- </td>
- <td>
- <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
- <span style="white-space: nowrap">
+ </select>
+ <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
+ </fieldset>
+ </form>
+ <form name="publishdir" method="post" action="/adm/publish" target="_parent">
+ <input type="hidden" name="pubrec" value="" />
+ <input type="hidden" name="filename" value="" />
+ </form>
+ <form name="printdir" method="post" action="/adm/printout" target="_parent">
+ <input type="hidden" name="postdata" value="" />
+ </form>
+ </div>
+
+ <div>
+ <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
+ <fieldset>
+ <legend>$lt{'updc'}</legend>
+ <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
+ <input type="file" name="upfile" size="20" />
+ <input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />
+ </fieldset>
+ </form>
+ </div>
+
+ <div>
+ <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
+ <fieldset>
+ <legend>$lt{'crea'}</legend>
+ <span class="LC_nobreak">
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
<script type="text/javascript">
function validate_go() {
@@ -432,10 +441,10 @@ sub dircontrols {
<option value="newdir">$lt{'nsub'}:</option>
</select> <input type="text" name="newfilename" value="$lt{'type'}" onfocus="if (this.value == '$mytype') this.value=''" /> <input type="button" value="Go" onclick="validate_go();" />
</span>
- </form>
- </td>
- </tr>
- </table>
+ </fieldset>
+ </form>
+ </div>
+</div>
END
}
@@ -447,7 +456,7 @@ sub pubbuttons {
'<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
'<input type="button" onclick="window.location='."'/~".
$uname.$thisdisfn."/default.meta'".'" value="'.
-&mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
+&mt('Edit Directory Metadata').'" /></td></tr></table></form>');
}
sub resourceactions {
@@ -539,7 +548,7 @@ sub putdirectory {
));
my $actionitem = '';
if ($dirname eq '..') {
- $actionitem = 'Go to ...';
+ $actionitem = &mt('Go to ...');
} else {
$actionitem =
'<form name="dirselect_'.$$numdir.
@@ -548,7 +557,7 @@ sub putdirectory {
'<option selected="selected">'.&mt('Select action').'</option>'.
'<option value="open">'.&mt('Open').'</option>'.
'<option value="publish">'.&mt('Publish').'</option>'.
- '<option value="editcat">'.&mt('Edit catalog information').'</option>'.
+ '<option value="editmeta">'.&mt('Edit Metadata').'</option>'.
'<option value="printdir">'.&mt('Print directory').'</option>'.
'<option value="delete">'.&mt('Delete directory').'</option>'.
'</select>'.
@@ -564,7 +573,7 @@ sub putdirectory {
'<td>'.$actionitem.'</td>'.
'<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
$disfilename.'</a></span></td>'.
- '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
+ '<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
$r->print(' <i>'.
$Apache::lonpublisher::metadatafields{'subject'}.
@@ -654,7 +663,7 @@ sub putresource {
}
$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.
- ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="bomb" />':'Edit Metadata').'</a>';
+ ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />':&mt('Edit Metadata')).'</a>';
if (!$meta_same) {
$title = &mt('Metadata Modified').'<br />'.$title.
@@ -686,7 +695,7 @@ sub putresource {
}
my $pub_select = '';
&create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
- $r->print('<tr class="LC_browser_file_'.$pubstatus.'">'.
+ $r->print(&Apache::loncommon::start_data_table_row().
'<td>'.($filename=~/[\#\~]$/?' ':
'<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
'<td>'.$pub_select.'</td>'.
@@ -695,9 +704,11 @@ sub putresource {
$filename.'</a></span>'.$editlink2.$editlink.
'</td>'.
'<td>'.$title.'</td>'.
- '<td>'.$status.'</td>'.
+ '<td class="LC_browser_file_'.$pubstatus.'"> </td>'. # Display publication status
+ '<td>'.$status.'</td>'.
'<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
- "</tr>\n");
+ &Apache::loncommon::end_data_table_row()
+ );
return OK;
}
@@ -783,6 +794,7 @@ sub CategorizeFiles {
1;
__END__
+
=head1 NAME
Apache::lonpubdir - Construction space directory lister
@@ -838,4 +850,64 @@ run through list of files and attempt to
=back
+=head1 SUBROUTINES:
+
+=over
+
+=item startpage($r, $uame, $udom, $thisdisfn)
+
+Output the header of the page. This includes:
+ - The HTML header
+ - The H1/H3 stuff which includes the directory.
+
+ startpage($r, $uame, $udom, $thisdisfn);
+ $r - The apache request object.
+ $uname - User name.
+ $udom - Domain name the user is logged in under.
+ $thisdisfn - Displayable version of the filename.
+
+=item getTitleString($fullname)
+
+ Get the title string or "[untitled]" if the file has no title metadata:
+ Without the latter substitution, it's impossible to examine metadata for
+ untitled resources. Resources may be legitimately untitled, to prevent
+ searches from locating them.
+
+ $str = getTitleString($fullname);
+ $fullname - Fully qualified filename to check.
+
+=item putdirectory(r, base, here, dirname, modtime)
+
+ Put out a directory table row:
+
+ putdirectory($r, $base, $here, $dirname, $modtime)
+ $r - Apache request object.
+ $reqfile - File in request.
+ $here - Where we are in directory tree.
+ $dirname - Name of directory special file.
+ $modtime - Encoded modification time.
+
+=item CategorizeFiles($location, $files)
+
+ Categorize files in the directory.
+ For each file in a list of files in a file directory,
+ the file categorized as one of:
+ - directory
+ - sequence
+ - problem
+ - Other resource.
+
+ For each file the modification date is determined as well.
+ Returned is a list of sublists:
+ (directories, sequences, problems, other)
+ each of the sublists contains entries of the following form (sorted by filename):
+ (filename, typecode, lastmodtime)
+
+ $list = CategorizeFiles($location, $files)
+ $location - Directory in which the files live (relative to our execution)
+ $files - list of files.
+
+=back
+
=cut
+