--- loncom/publisher/lonpubdir.pm 2007/10/18 21:58:21 1.104 +++ loncom/publisher/lonpubdir.pm 2009/05/19 22:52:29 1.121 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.104 2007/10/18 21:58:21 albertel Exp $ +# $Id: lonpubdir.pm,v 1.121 2009/05/19 22:52:29 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,7 +62,7 @@ sub handler { &Apache::loncacc::constructaccess( $fn,$r->dir_config('lonDefDomain')); unless (($uname) && ($udom)) { - $r->log_reason($uname.' at '.$udom. + $r->log_reason($uname.':'.$udom. ' trying to list directory '.$env{'form.filename'}. ' ('.$fn.') - not authorized', $r->filename); @@ -74,7 +74,7 @@ sub handler { $fn=~s/\/$//; unless ($fn) { - $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. + $r->log_reason($env{'user.name'}.':'.$env{'user.domain'}. ' trying to list empty directory', $r->filename); return HTTP_NOT_FOUND; } @@ -105,15 +105,16 @@ sub handler { my $numres = 0; # Start off the directory table. - $r->print('

Directory Contents:

'); - $r->print(''. - ''. - ''. - ''. - ''. - ''. - ''."\n"); + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'' + .'' + .'' + .'' + .'' + .'' + .&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('
'.&mt('Type').''.&mt('Actions').''.&mt('Name').''.&mt('Title').''.&mt('Status').''.&mt('Last Modified'). - '
'.&mt('Type').''.&mt('Actions').''.&mt('Name').''.&mt('Title').''.&mt('Status').''.&mt('Last Modified').'
'.&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}; @@ -196,30 +199,27 @@ sub startpage { my $formaction='/priv/'.$uname.$thisdisfn.'/'; $formaction=~s|/+|/|g; - my $pagetitle .= &Apache::loncommon::help_open_menu('','',3,'Authoring'). - 'Construction Space: '. - '
'. - &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."
". - &Apache::lonhtmlcommon::select_recent('construct','recent', - 'this.form.action=this.form.recent.value;this.form.submit()'). - '
'; &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction); + if ($env{'environment.remote'} eq 'off') { - $env{'request.noversionuri'}=$currdir.'/'; - $r->print(&Apache::loncommon::start_page('Construction Space',undef, - {'body_title' => - $pagetitle,})); + $env{'request.noversionuri'}=$currdir.'/'; + $r->print(&Apache::loncommon::start_page('Construction Space',undef)); } else { - $r->print(&Apache::loncommon::start_page('Construction Space',undef, - { 'only_body' => 1,})); - $r->print($pagetitle); + $r->print(&Apache::loncommon::start_page('Construction Space',undef, + { 'only_body' => 1,})); } + $r->print(&Apache::lonhtmlcommon::breadcrumbs()); # FIXME add breadcrumbs + + $r->print(&Apache::loncommon::head_subbox( + &Apache::loncommon::CSTR_pageheader(1))); + my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn); + my $doctitle = 'LON-CAPA '.&mt('Construction Space'); + my $newname = &mt('New Name'); my $pubdirscript=(< -top.document.title = '$esc_thisdisfn/ - 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 +231,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 +261,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 +313,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 } @@ -328,8 +328,7 @@ ENDPUBDIRSCRIPT if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) && $env{'environment.remote'} ne 'off') { - $r->print('

'.&mt('Co-Author').': '.$uname.' at '.$udom. - '

'); + $r->print('

'.&mt('Co-Author [_1]',$uname.':'.$udom).'

'); } } @@ -346,7 +345,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', @@ -362,68 +361,84 @@ sub dircontrols { move => 'Move current file to', copy => 'Copy current file to', type => 'Type Name Here', - go => 'Go', + go => 'Go', prnt => 'Print contents of directory', crea => 'Create a new directory or LON-CAPA document', acti => 'Actions for current directory', - updc => 'Upload a new document' + updc => 'Upload a new document', + pick => 'Please select an action to perform using the new filename', ); + my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript $r->print(< - - $lt{'acti'} - $lt{'updc'} - $lt{'crea'} - - - -
- - + - - -
-
- - -
-
- -
- - -
- - - -
- - -
- + + + + +
+ + +
+
+ +
+ + +
+
+
+ $lt{'updc'} + + + +
+
+
+ +
+
+
+ $lt{'crea'} + -    + +    - - - - +
+ +
+ END } @@ -435,7 +450,7 @@ sub pubbuttons { ''. ''); +&mt('Edit Directory Metadata').'" />'); } sub resourceactions { @@ -527,7 +542,7 @@ sub putdirectory { )); my $actionitem = ''; if ($dirname eq '..') { - $actionitem = 'Go to ...'; + $actionitem = &mt('Go to ...'); } else { $actionitem = '
'.&mt('Select action').''. ''. ''. - ''. + ''. ''. ''. ''. @@ -552,7 +567,7 @@ sub putdirectory { ''.$actionitem.''. ''. $disfilename.''. - ''.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}); + ''.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}); if ($Apache::lonpublisher::metadatafields{'subject'} ne '') { $r->print(' '. $Apache::lonpublisher::metadatafields{'subject'}. @@ -642,7 +657,7 @@ sub putresource { } $title.="\n".'
'. - ($$bombs{$targetdir.'/'.$filename}?'bomb':'Edit Metadata').''; + ($$bombs{$targetdir.'/'.$filename}?''.&mt('bomb').'':&mt('Edit Metadata')).''; if (!$meta_same) { $title = &mt('Metadata Modified').'
'.$title. @@ -674,7 +689,7 @@ sub putresource { } my $pub_select = ''; &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres); - $r->print(''. + $r->print(&Apache::loncommon::start_data_table_row(). ''.($filename=~/[\#\~]$/?' ': '').''. ''.$pub_select.''. @@ -683,9 +698,11 @@ sub putresource { $filename.''.$editlink2.$editlink. ''. ''.$title.''. - ''.$status.''. + '  '. # Display publication status + ''.$status.''. ''.&Apache::lonlocal::locallocaltime($cmtime).''. - "\n"); + &Apache::loncommon::end_data_table_row() + ); return OK; } @@ -771,6 +788,7 @@ sub CategorizeFiles { 1; __END__ + =head1 NAME Apache::lonpubdir - Construction space directory lister @@ -826,4 +844,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 +