version 1.164, 2015/06/18 20:19:27
|
version 1.174, 2022/05/27 04:24:55
|
Line 67 sub handler {
|
Line 67 sub handler {
|
$r->send_http_header; |
$r->send_http_header; |
|
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
my $js = '<script type="text/javascript" |
$r->print(&Apache::loncommon::start_page('Authoring Space'). |
src="/res/adm/includes/file_upload.js"></script>'; |
|
$r->print(&Apache::loncommon::start_page('Authoring Space', $js). |
|
'<div class="LC_error">'. |
'<div class="LC_error">'. |
'<br /><p>'. |
'<br /><p>'. |
&mt('Your Authoring Space is currently in the location used by LON-CAPA version 2.10 and older, but your domain is using a newer LON-CAPA version ([_1]).',$version).'</p>'. |
&mt('Your Authoring Space is currently in the location used by LON-CAPA version 2.10 and older, but your domain is using a newer LON-CAPA version ([_1]).',$version).'</p>'. |
Line 82 sub handler {
|
Line 80 sub handler {
|
} |
} |
} |
} |
$thisdisfn=~s/^\Q$docroot\E\/priv//; |
$thisdisfn=~s/^\Q$docroot\E\/priv//; |
|
|
my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory |
my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory |
my $targetdir='/res'.$thisdisfn; # Publication target directory. |
my $targetdir='/res'.$thisdisfn; # Publication target directory. |
my $linkdir='/priv'.$thisdisfn; # Full URL name of constr space. |
my $linkdir='/priv'.$thisdisfn; # Full URL name of constr space. |
|
|
|
my $cstr = 'author'; |
|
my ($crsauthor,$crstype); |
|
if ($env{'request.course.id'}) { |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
if ($thisdisfn =~ m{^/\Q$cdom/$cnum\E}) { |
|
$crsauthor = 1; |
|
$cstr = 'course'; |
|
$crstype = &Apache::loncommon::course_type(); |
|
} |
|
} |
|
|
my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); |
my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); |
|
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname, |
my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname, |
"$londocroot/priv/$udom/$uname"); # expressed in kB |
"$londocroot/priv/$udom/$uname"); # expressed in kB |
my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom, |
my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom, |
'author'); # expressed in MB |
$cstr,$crstype); # expressed in MB |
|
|
# Put out the start of page. |
# Put out the start of page. |
&startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota); |
&startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor); |
|
|
if (!-d $fn) { |
if (!-d $fn) { |
if (-e $fn) { |
if (-e $fn) { |
Line 348 my $result = "<script type=\"text/javasc
|
Line 358 my $result = "<script type=\"text/javasc
|
# $thisdisfn - Displayable version of the filename. |
# $thisdisfn - Displayable version of the filename. |
# $current_disk_usage - User's current disk usage (in kB). |
# $current_disk_usage - User's current disk usage (in kB). |
# $disk_quota - Disk quota for user's authoring space (in MB). |
# $disk_quota - Disk quota for user's authoring space (in MB). |
|
# $crstype - Course type, if this is for "course author" |
|
|
sub startpage { |
sub startpage { |
my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota) = @_; |
my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor) = @_; |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
my $formaction='/priv'.$thisdisfn.'/'; |
my $formaction='/priv'.$thisdisfn.'/'; |
$formaction=~s|/+|/|g; |
$formaction=~s|/+|/|g; |
&Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction); |
|
|
my $title; |
|
if ($crsauthor) { |
|
$title = 'Course Authoring'; |
|
} else { |
|
$title = 'Authoring Space'; |
|
&Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction); |
|
} |
|
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::add_breadcrumb({ |
&Apache::lonhtmlcommon::add_breadcrumb({ |
'text' => 'Authoring Space', |
'text' => $title, |
'href' => &Apache::loncommon::authorspace($formaction), |
'href' => &Apache::loncommon::authorspace($formaction), |
}); |
}); |
# breadcrumbs (and tools) will be created |
# breadcrumbs (and tools) will be created |
Line 369 sub startpage {
|
Line 387 sub startpage {
|
$env{'request.noversionuri'}=$formaction; |
$env{'request.noversionuri'}=$formaction; |
my $js = '<script type="text/javascript" |
my $js = '<script type="text/javascript" |
src="/res/adm/includes/file_upload.js"></script>'; |
src="/res/adm/includes/file_upload.js"></script>'; |
$r->print(&Apache::loncommon::start_page('Authoring Space', $js)); |
$r->print(&Apache::loncommon::start_page($title, $js)); |
|
|
$disk_quota = 1024 * $disk_quota; # convert from MB to kB |
$disk_quota = 1024 * $disk_quota; # convert from MB to kB |
|
|
$r->print(&Apache::loncommon::head_subbox( |
$r->print(&Apache::loncommon::head_subbox( |
'<div style="float:right;padding-top:0;margin-top;0">' |
'<div style="float:right;padding-top:0;margin-top;0">' |
.&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota) |
.&Apache::lonhtmlcommon::display_usage($current_disk_usage, |
|
$disk_quota,'authoring') |
.'</div>' |
.'</div>' |
.&Apache::loncommon::CSTR_pageheader())); |
.&Apache::loncommon::CSTR_pageheader())); |
|
|
my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn); |
my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn); |
my $doctitle = 'LON-CAPA '.&mt('Authoring Space'); |
my $doctitle = 'LON-CAPA '.&mt($title); |
my $newname = &mt('New Name'); |
my $newname = &mt('New Name'); |
my $pubdirscript=(<<ENDPUBDIRSCRIPT); |
my $pubdirscript=(<<ENDPUBDIRSCRIPT); |
<script type="text/javascript"> |
<script type="text/javascript"> |
Line 551 sub dircontrols {
|
Line 570 sub dircontrols {
|
<input type="hidden" name="filename" value="/priv$thisdisfn/" /> |
<input type="hidden" name="filename" value="/priv$thisdisfn/" /> |
</fieldset> |
</fieldset> |
</form> |
</form> |
<form name="publishdir" method="post" action="/adm/publish" target="_parent"> |
<form name="publishdir" method="post" action="/adm/publish"> |
<input type="hidden" name="pubrec" value="" /> |
<input type="hidden" name="pubrec" value="" /> |
<input type="hidden" name="filename" value="" /> |
<input type="hidden" name="filename" value="" /> |
</form> |
</form> |
<form name="printdir" method="post" action="/adm/printout" target="_parent"> |
<form name="printdir" method="post" action="/adm/printout"> |
<input type="hidden" name="postdata" value="" /> |
<input type="hidden" name="postdata" value="" /> |
</form> |
</form> |
</div> |
</div> |
|
|
<div> |
<div style="padding-bottom: 2px"> |
<form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent"> |
<form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload"> |
<fieldset> |
<fieldset> |
<legend>$lt{'updc'}</legend> |
<legend>$lt{'updc'}</legend> |
<input type="hidden" name="filename" value="/priv$thisdisfn/" /> |
<input type="hidden" name="filename" value="/priv$thisdisfn/" /> |
<input type="file" name="upfile" class="flUpload testclass" size="20" /> |
<input type="file" name="upfile" class="LC_flUpload" size="20" /> |
<input type="hidden" id="free_space" value=$free_space /> |
<input type="hidden" id="LC_free_space" value="$free_space" /> |
<input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" /> |
<input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" /> |
</fieldset> |
</fieldset> |
</form> |
</form> |
</div> |
</div> |
|
|
<div> |
<div> |
<form name="fileaction" method="post" action="/adm/cfile" target="_parent"> |
<form name="fileaction" method="post" action="/adm/cfile"> |
<fieldset> |
<fieldset> |
<legend>$lt{'crea'}</legend> |
<legend>$lt{'crea'}</legend> |
<span class="LC_nobreak"> |
<span class="LC_nobreak"> |
Line 661 END
|
Line 680 END
|
sub resourceactions { |
sub resourceactions { |
my ($r,$uname,$udom,$thisdisfn) = @_; |
my ($r,$uname,$udom,$thisdisfn) = @_; |
$r->print(<<END); |
$r->print(<<END); |
<form name="moveresource" action="/adm/cfile" target="_parent" method="post"> |
<form name="moveresource" action="/adm/cfile" method="post"> |
<input type="hidden" name="filename" value="" /> |
<input type="hidden" name="filename" value="" /> |
<input type="hidden" name="newfilename" value="" /> |
<input type="hidden" name="newfilename" value="" /> |
<input type="hidden" name="action" value="" /> |
<input type="hidden" name="action" value="" /> |
</form> |
</form> |
<form name="delresource" action="/adm/cfile" target="_parent" method="post"> |
<form name="delresource" action="/adm/cfile" method="post"> |
<input type="hidden" name="filename" value="" /> |
<input type="hidden" name="filename" value="" /> |
<input type="hidden" name="action" value="delete" /> |
<input type="hidden" name="action" value="delete" /> |
</form> |
</form> |
<form name="pubresource" action="/adm/publish" target="_parent" method="post"> |
<form name="pubresource" action="/adm/publish" method="post"> |
<input type="hidden" name="filename" value="" /> |
<input type="hidden" name="filename" value="" /> |
<input type="hidden" name="makeobsolete" value="0" /> |
<input type="hidden" name="makeobsolete" value="0" /> |
</form> |
</form> |
<form name="printresource" action="/adm/printout" target="_parent" method="post"> |
<form name="printresource" action="/adm/printout" method="post"> |
<input type="hidden" name="postdata" value="" /> |
<input type="hidden" name="postdata" value="" /> |
</form> |
</form> |
<form name="retrieveres" action="/adm/retrieve" target="_parent" method="post"> |
<form name="retrieveres" action="/adm/retrieve" method="post"> |
<input type="hidden" name="filename" value="" /> |
<input type="hidden" name="filename" value="" /> |
</form> |
</form> |
<form name="cleanup" action="/adm/cleanup" target="_parent" method="post"> |
<form name="cleanup" action="/adm/cleanup" method="post"> |
<input type="hidden" name="filename" value="" /> |
<input type="hidden" name="filename" value="" /> |
</form> |
</form> |
END |
END |
Line 758 sub putdirectory {
|
Line 777 sub putdirectory {
|
} else { |
} else { |
$actionitem = |
$actionitem = |
'<form name="dirselect_'.$$numdir. |
'<form name="dirselect_'.$$numdir. |
'" action="/adm/publish" target="_parent">'. |
'" action="/adm/publish">'. |
'<select name="diraction" onchange="SetPubDir(this.form,document)">'. |
'<select name="diraction" onchange="SetPubDir(this.form,document)">'. |
'<option selected="selected">'.&mt('Select action').'</option>'. |
'<option selected="selected">'.&mt('Select action').'</option>'. |
'<option value="open">'.&mt('Open').'</option>'. |
'<option value="open">'.&mt('Open').'</option>'. |
Line 777 sub putdirectory {
|
Line 796 sub putdirectory {
|
'<td><img src="'. |
'<td><img src="'. |
$Apache::lonnet::perlvar{'lonIconsURL'}.'/navmap.folder.closed.gif" alt="folder" /></td>'. |
$Apache::lonnet::perlvar{'lonIconsURL'}.'/navmap.folder.closed.gif" alt="folder" /></td>'. |
'<td>'.$actionitem.'</td>'. |
'<td>'.$actionitem.'</td>'. |
'<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'. |
'<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/">'. |
$disfilename.'</a></span></td>'. |
$disfilename.'</a></span></td>'. |
'<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($targetdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}); |
'<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($targetdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}); |
if ($Apache::lonpublisher::metadatafields{'subject'} ne '') { |
if ($Apache::lonpublisher::metadatafields{'subject'} ne '') { |
Line 915 sub putresource {
|
Line 934 sub putresource {
|
$editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=editxml">'.&mt('EditXML').'</a>)'; |
$editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=editxml">'.&mt('EditXML').'</a>)'; |
$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)'; |
$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)'; |
} |
} |
|
if ($filename=~/\.(xml|html|htm|xhtml|xhtm)$/ || $filename=~/$LONCAPA::assess_re/) { |
|
if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) { |
|
my $daxeurl = '/daxepage'.$linkdir.'/'.$filename; |
|
$editlink .= ' (<a href="'.$daxeurl.'" target="_blank">Daxe</a>)'; |
|
} |
|
} |
if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) { |
if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) { |
$editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'" target="_parent">'.&mt('Clean Up').')</a>'; |
$editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'">'.&mt('Clean Up').')</a>'; |
} |
} |
if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { |
if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { |
$editlink=' (<a target="_parent" href="/adm/cfile?decompress='.$linkfilename.'">'.&mt('Decompress').'</a>)'; |
$editlink=' (<a href="/adm/cfile?decompress='.$linkfilename.'">'.&mt('Decompress').'</a>)'; |
} |
} |
my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish'); |
my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish'); |
my $pub_select = ''; |
my $pub_select = ''; |
Line 929 sub putresource {
|
Line 954 sub putresource {
|
'<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'. |
'<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'. |
'<td>'.$pub_select.'</td>'. |
'<td>'.$pub_select.'</td>'. |
'<td><span class="LC_filename">'. |
'<td><span class="LC_filename">'. |
'<a href="'.$linkdir.'/'.$filename.'" target="_parent">'. |
'<a href="'.$linkdir.'/'.$filename.'">'. |
$filename.'</a></span>'.$editlink2.$editlink. |
$filename.'</a></span>'.$editlink2.$editlink. |
'</td>'. |
'</td>'. |
'<td>'.$title.'</td>'. |
'<td>'.$title.'</td>'. |