--- loncom/publisher/lonpubdir.pm 2004/11/30 19:08:18 1.66 +++ loncom/publisher/lonpubdir.pm 2004/12/07 22:35:34 1.70 @@ -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.70 2004/12/07 22:35:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -193,19 +193,19 @@ sub startpage { $r->print('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; + $ENV{'request.noversionuri'}=$currdir.'/'; $r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle)); } else { $r->print($pagetitle); @@ -214,7 +214,7 @@ sub startpage { ENDPUBDIRSCRIPT $r->print($pubdirscript); @@ -370,9 +343,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 @@ -393,8 +366,6 @@ sub dircontrols {
- -
@@ -409,7 +380,7 @@ sub dircontrols { - -
@@ -511,6 +478,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' )); @@ -529,11 +498,9 @@ sub putdirectory { ''. '
'; $$numdir ++; @@ -647,20 +614,16 @@ sub create_pubselect {
+
'; + $uname.$thisdisfn.'/'.$filename.'">'; $$numres ++; }