--- loncom/publisher/lonpubdir.pm 2004/11/08 22:42:20 1.65 +++ loncom/publisher/lonpubdir.pm 2004/12/02 18:38:37 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.65 2004/11/08 22:42:20 albertel Exp $ +# $Id: lonpubdir.pm,v 1.67 2004/12/02 18:38:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -192,24 +192,24 @@ sub startpage { $r->print('LON-CAPA Construction Space'); - my $pagetitle; - my $formaction='/priv/'.$uname.'/'.$thisdisfn; + my $pagetitle; + my $formaction='/priv/'.$uname.'/'.$thisdisfn.'/'; $formaction=~s/\/+/\//g; - $pagetitle .= ('
'. + $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring'). 'Construction Space: '. - &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn,'top','/priv','','-1'). + ''. + &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv','','+1'). &Apache::lonhtmlcommon::select_recent('construct','recent', 'this.form.action=this.form.recent.value;this.form.submit()'). - '
'); - &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction); + ''; + &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction); 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); } - $r->print(&Apache::loncommon::help_open_menu('','','','',3,'Authoring')); my $pubdirscript=(< // Store directory location for menu bar to find @@ -228,7 +228,7 @@ parent.lastknownpriv='/~$uname/$thisdisf pubrecdir(document.publishdir) } if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') { - window.location=theform.filename.value+'default.meta' + top.location=theform.filename.value+'default.meta' } if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'printdir' ) { document.printdir.postdata.value=theform.filename.value @@ -266,7 +266,7 @@ parent.lastknownpriv='/~$uname/$thisdisf function SetPubDir(theform,printForm) { if (theform.diraction.options[theform.diraction.selectedIndex].value == "open") { - window.location = theform.filename.value + top.location = theform.filename.value return } if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") { @@ -276,7 +276,7 @@ parent.lastknownpriv='/~$uname/$thisdisf pubrecdir(theform) } if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") { - window.location=theform.filename.value+'default.meta' + top.location=theform.filename.value+'default.meta' } if (theform.diraction.options[theform.diraction.selectedIndex].value == "print") { theform.action = '/adm/printout' @@ -370,9 +370,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 @@ -511,6 +511,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,7 +531,7 @@ sub putdirectory { ''. '