version 1.162, 2014/10/17 13:00:39
|
version 1.172, 2019/08/11 15:15:43
|
Line 67 sub handler {
|
Line 67 sub handler {
|
$r->send_http_header; |
$r->send_http_header; |
|
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
$r->print(&Apache::loncommon::start_page('Authoring Space'). |
my $js = '<script type="text/javascript" |
|
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 80 sub handler {
|
Line 82 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); |
|
|
&startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page. |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
|
my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname, |
|
"$londocroot/priv/$udom/$uname"); # expressed in kB |
|
my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom, |
|
$cstr,$crstype); # expressed in MB |
|
|
|
# Put out the start of page. |
|
&startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor); |
|
|
if (!-d $fn) { |
if (!-d $fn) { |
if (-e $fn) { |
if (-e $fn) { |
Line 108 sub handler {
|
Line 129 sub handler {
|
return OK; |
return OK; |
} |
} |
|
|
&dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory, |
# Put out actions for directory, browse/upload + new file page. |
# browse/upload + new file page. |
&dircontrols($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota); |
&resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc. |
&resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc. |
|
|
my $numdir = 0; |
my $numdir = 0; |
Line 332 my $result = "<script type=\"text/javasc
|
Line 353 my $result = "<script type=\"text/javasc
|
# - The HTML header |
# - The HTML header |
# - The H1/H3 stuff which includes the directory. |
# - The H1/H3 stuff which includes the directory. |
# |
# |
# startpage($r, $uame, $udom, $thisdisfn); |
# startpage($r, $uame, $udom, $thisdisfn, $current_disk_usage, $disk_quota); |
# $r - The apache request object. |
# $r - The apache request object. |
# $uname - User name. |
# $uname - User name. |
# $udom - Domain name the user is logged in under. |
# $udom - Domain name the user is logged in under. |
# $thisdisfn - Displayable version of the filename. |
# $thisdisfn - Displayable version of the filename. |
|
# $current_disk_usage - User's current disk usage (in kB). |
|
# $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) = @_; |
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 |
# in start_page->bodytag->innerregister |
# in start_page->bodytag->innerregister |
|
|
$env{'request.noversionuri'}=$formaction; |
$env{'request.noversionuri'}=$formaction; |
$r->print(&Apache::loncommon::start_page('Authoring Space')); |
my $js = '<script type="text/javascript" |
|
src="/res/adm/includes/file_upload.js"></script>'; |
|
$r->print(&Apache::loncommon::start_page($title, $js)); |
|
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
$disk_quota = 1024 * $disk_quota; # convert from MB to kB |
my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,"$londocroot/priv/$udom/$uname"); |
|
my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in MB |
|
$disk_quota = 1000 * $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 483 ENDPUBDIRSCRIPT
|
Line 514 ENDPUBDIRSCRIPT
|
} |
} |
|
|
sub dircontrols { |
sub dircontrols { |
my ($r,$uname,$udom,$thisdisfn) = @_; |
my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_; |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
cnpd => 'Cannot publish directory', |
cnpd => 'Cannot publish directory', |
cnrd => 'Cannot retrieve directory', |
cnrd => 'Cannot retrieve directory', |
Line 522 sub dircontrols {
|
Line 553 sub dircontrols {
|
pick => 'Please select an action to perform using the new filename', |
pick => 'Please select an action to perform using the new filename', |
); |
); |
my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript |
my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript |
|
# Calculate free space in bytes. |
|
# $disk_quota is in MB and $current_disk_usage is in kB |
|
my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage); |
$r->printf(<<END,&Apache::loncommon::help_open_topic('Quicksearch')); |
$r->printf(<<END,&Apache::loncommon::help_open_topic('Quicksearch')); |
<div class="LC_columnSection"> |
<div class="LC_columnSection"> |
<div> |
<div> |
Line 547 sub dircontrols {
|
Line 581 sub dircontrols {
|
</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" target="_parent"> |
<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" size="20" /> |
<input type="file" name="upfile" class="LC_flUpload testclass" size="20" /> |
|
<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> |
Line 586 sub dircontrols {
|
Line 621 sub dircontrols {
|
<option value="newtaskfile">$lt{'nbt'}:</option> |
<option value="newtaskfile">$lt{'nbt'}:</option> |
<option value="newlibraryfile">$lt{'nlib'}:</option> |
<option value="newlibraryfile">$lt{'nlib'}:</option> |
<option value="newdir">$lt{'nsub'}:</option> |
<option value="newdir">$lt{'nsub'}:</option> |
</select> <input type="text" name="newfilename" value="$lt{'type'}" onfocus="if (this.value == '$mytype') this.value=''" /> <input type="button" value="Go" onclick="validate_go();" /> |
</select> <input type="text" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" /> <input type="button" value="Go" onclick="validate_go();" /> |
|
<br /> |
|
<span>Quickactions: |
|
<input type="hidden" name="mode"/> |
|
<a href="javascript:void(0)" onclick="javascript:validate_action('blank')"> |
|
<img src="/adm/lonIcons/unknown.gif" title="Create blank problem file"></a> |
|
<a href="javascript:void(0)" onclick="javascript:validate_action('problemtempl')"> |
|
<img src="/adm/lonIcons/problem.gif" title="Create new problem from template"></a> |
|
<a href="javascript:void(0)" onclick="javascript:validate_action('blankhtml')"> |
|
<img src="/adm/lonIcons/html.gif" title="Create new blank HTML file"></a> |
|
<a href="javascript:void(0)" onclick="javascript:validate_action('folder')"> |
|
<img src="/adm/lonIcons/navmap.folder.closed.gif" title="Create new subdirectory"></a> |
|
</span> |
|
<script type="text/javascript"> |
|
function validate_action(action){ |
|
|
|
if (document.getElementsByName(\'newfilename\')[0].value != \'\'){ |
|
if (action == "blank") { |
|
document.fileaction.action.value=\'newproblemfile\'; |
|
document.fileaction.mode.value=\'blank\'; |
|
} else if (action == "problemtempl") { |
|
document.fileaction.action.value=\'newproblemfile\'; |
|
validate_go(); |
|
} else if (action == "blankhtml") { |
|
document.fileaction.action.value=\'newhtmlfile\'; |
|
validate_go(); |
|
} else if (action == "folder") { |
|
document.fileaction.action.value=\'newdir\'; |
|
document.fileaction.mode.value=\'folder\'; |
|
} |
|
fileaction.submit(); |
|
} else { |
|
alert(\'Please specify file name.\'); |
|
// TODO: ask for filename? if so, do some refactoring |
|
|
|
} |
|
} |
|
</script> |
</span> |
</span> |
</fieldset> |
</fieldset> |
</form> |
</form> |
Line 864 sub putresource {
|
Line 936 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.'" target="_parent">'.&mt('Clean Up').')</a>'; |
} |
} |