--- loncom/publisher/lonpubdir.pm 2004/11/30 19:08:18 1.66 +++ loncom/publisher/lonpubdir.pm 2005/05/20 18:28:22 1.81 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.66 2004/11/30 19:08:18 raeburn Exp $ +# $Id: lonpubdir.pm,v 1.81 2005/05/20 18:28:22 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -61,7 +61,7 @@ sub handler { $fn,$r->dir_config('lonDefDomain')); unless (($uname) && ($udom)) { $r->log_reason($uname.' at '.$udom. - ' trying to list directory '.$ENV{'form.filename'}. + ' trying to list directory '.$env{'form.filename'}. ' ('.$fn.') - not authorized', $r->filename); return HTTP_NOT_ACCEPTABLE; @@ -72,7 +72,7 @@ sub handler { $fn=~s/\/$//; unless ($fn) { - $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}. + $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. ' trying to list empty directory', $r->filename); return HTTP_NOT_FOUND; } @@ -91,9 +91,11 @@ sub handler { my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); &startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page. - if ($ENV{'environment.remote'} eq 'off') { + if ($env{'environment.remote'} eq 'off') { &dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory, # browse/upload + new file page. + } else { + &pubbuttons($r,$uname,$thisdisfn); } &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc. @@ -146,8 +148,8 @@ sub getEffectiveUrl { my $r = shift; my $fn; - if ($ENV{'form.filename'}) { # If a form filename is defined. - $fn=$ENV{'form.filename'}; + if ($env{'form.filename'}) { # If a form filename is defined. + $fn=$env{'form.filename'}; # # Replace the ~username of the URL with /home/username/public_html # so that we don't have to worry about ~ expansion internally. @@ -189,43 +191,40 @@ sub startpage { my $currdir = '/priv/'.$uname.$thisdisfn; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - - $r->print('LON-CAPA Construction Space'); + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'LON-CAPA Construction Space'); my $pagetitle; - my $formaction='/priv/'.$uname.'/'.$thisdisfn.'/'; + my $formaction='/priv/'.$uname.$thisdisfn.'/'; $formaction=~s/\/+/\//g; $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring'). - 'Construction Space: '. + 'Construction Space: '. '
'. - &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv','','+1'). + '" target="_parent">'. + &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; + if ($env{'environment.remote'} eq 'off') { + $env{'request.noversionuri'}=$currdir.'/'; $r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle)); } else { $r->print($pagetitle); } my $pubdirscript=(< + ENDPUBDIRSCRIPT $r->print($pubdirscript); - if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { + if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) && + $env{'environment.remote'} ne 'off') { $r->print('

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

'); } @@ -370,9 +318,9 @@ sub dircontrols { $r->print(< - Actions for current directory - Upload a new document - Create a new directory or LON-CAPA document + Actions for current directory + Upload a new document + Create a new directory or LON-CAPA document @@ -380,7 +328,6 @@ sub dircontrols { @@ -389,12 +336,9 @@ sub dircontrols {
-
- -
@@ -409,7 +353,7 @@ sub dircontrols { '. + ''. +''); +} + sub resourceactions { my ($r,$uname,$udom,$thisdisfn) = @_; $r->print(<
- - +
- -
@@ -511,6 +461,8 @@ sub putdirectory { %Apache::lonpublisher::metadatakeys=(); my $construct=$here; $construct=~s:^/priv/(\w+)$:/home/$1/public_html:; + my $dirpath = $here; + $dirpath=~s:^/priv/:/~:; &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile( $construct.'/'.$dirname.'/default.meta' )); @@ -527,13 +479,10 @@ sub putdirectory { ''. ''. ''. - ''. ''. - ''. - ''. - ''. - ''. - ''. + ''. + ''. ''. '
'; $$numdir ++; @@ -559,6 +508,7 @@ sub putresource { my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir, $linkdir, $cmtime,$bombs,$numres) = @_; + &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename); my $pubstatus = 'unpublished'; my $status=&mt('Unpublished'); my $bgcolor='#FFAA99'; @@ -589,7 +539,7 @@ sub putresource { # $action_buttons=''; # } $title=''. + '.meta" target="cat">'. &getTitleString($targetdir.'/'.$filename).''; } else { $pubstatus = 'modified'; @@ -598,17 +548,17 @@ sub putresource { &mt(&getSourceRightString($targetdir.'/'.$filename)); $bgcolor='#FFFF77'; # $action_buttons=''; - $title=''. + $title=''. &getTitleString($targetdir.'/'.$filename).''; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { $status.='
'.&mt('Diffs').''; + '&versiontwo=priv" target="cat">'.&mt('Diffs').''; } } - $title.='
'. + $title.="\n".'
'. ($$bombs{$targetdir.'/'.$filename}?'':'Edit Metadata').''; - $status.='
'.&mt('Retrieve').''; } my $editlink=''; @@ -646,31 +596,29 @@ sub create_pubselect { $$pub_select = '
+'. +''. +'
'; + $uname.$thisdisfn.'/'.$filename.'" />'; $$numres ++; }