'
+ .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
+ $disk_quota,'authoring')
+ .'
'
+ .&Apache::loncommon::CSTR_pageheader('','',$headertext)));
my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
- my $doctitle = 'LON-CAPA '.&mt('Construction Space');
+ my $doctitle = 'LON-CAPA '.&mt('Authoring Space');
my $newname = &mt('New Name');
my $pubdirscript=(<'.&mt('Co-Author [_1]',$uname.':'.$udom).'
'); - } } sub dircontrols { - my ($r,$uname,$udom,$thisdisfn) = @_; + my ($r,$uname,$udom,$thisdisfn,$current_disk_usage,$disk_quota) = @_; my %lt=&Apache::lonlocal::texthash( cnpd => 'Cannot publish directory', cnrd => 'Cannot retrieve directory', mcdi => 'Must create new subdirectory inside a directory', pubr => 'Publish this Resource', - pubd => 'Publish this Directory', - dedr => 'Delete Directory', rtrv => 'Retrieve Old Version', list => 'List Directory', uplo => 'Upload file', dele => 'Delete', - edit => 'Edit Metadata', sela => 'Select Action', nfil => 'New file', nhtm => 'New HTML file', @@ -367,55 +484,58 @@ sub dircontrols { copy => 'Copy current file to', type => 'Type Name Here', go => 'Go', - prnt => 'Print contents of directory', - crea => 'Create a new directory or LON-CAPA document', - acti => 'Actions for current directory', + crea => 'Create a new subdirectory or document', updc => 'Upload a new document', pick => 'Please select an action to perform using the new filename', + shcu => 'Shortcuts', ); + my %js_lt = &Apache::lonlocal::texthash( + nanf => 'Name of New File', + nans => 'Name of New Subdirectory', + psfn => 'Please specify file name', + ); + &js_escape(\%js_lt); 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->print("\n".''."\n");
+ my %fileoptions = (
+ none => "$lt{'sela'}:",
+ newfile => "$lt{'nfil'}:",
+ newhtmlfile => "$lt{'nhtm'}:",
+ newproblemfile => "$lt{'nprb'}:",
+ newdir => "$lt{'nsub'}:",
+ newpagefile => "$lt{'npag'}:",
+ newsequencefile => "$lt{'nseq'}:",
+ newrightsfile => "$lt{'ncrf'}:",
+ newstyfile => "$lt{'nsty'}:",
+ newtaskfile => "$lt{'nbt'}:",
+ newlibraryfile => "$lt{'nlib'}:",
+ );
+ $fileoptions{'select_form_order'} = ['none','newfile','newhtmlfile','newproblemfile',
+ 'newpagefile','newsequencefile','newrightsfile',
+ 'newstyfile','newtaskfile','newlibraryfile','newdir'];
+ my $selectbox = &Apache::loncommon::select_form('none','action',\%fileoptions);
$r->print(<
-
END
}
-sub pubbuttons {
- my ($r,$uname,$thisdisfn) = @_;
- $r->print('');
-}
-
sub resourceactions {
my ($r,$uname,$udom,$thisdisfn) = @_;
$r->print(<
-
-
-
-
-
-
-
'.$title. + '
'. + &Apache::loncommon::modal_link( + '/adm/diff?filename='.$linkfilename.'.meta'.'&versiontwo=priv', + &mt('Metadata Diffs'),600,500); + $title.="\n".'
'. + &Apache::loncommon::modal_link( + '/adm/retrieve?filename='.$linkfilename.'.meta&inhibitmenu=yes&add_modal=yes', + &mt('Retrieve Metadata'),600,500); + } + } + # Allow editing metadata of published and unpublished resources + $title .= "\n".'
' if ($title); + $title .= ''. + ($$bombs{&Apache::lonnet::declutter($targetdir.'/'.$filename)}? + '
':
+ &mt('Edit Metadata')).
+ '';
+
+ return ($title, $titleString);
+}
+
+
+sub isMetaSame {
+ my ($cstr_dir, $resdir, $filename) = @_;
+ my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
+ my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
+ return (&Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
+ $cstr_dir.'/'.$filename.'.meta') && $meta_rmtime < $meta_cmtime)
+ ? 0 : 1;
+}
+
+
+sub getStatus {
+ my ($resdir, $targetdir, $cstr_dir, $filename,
+ $linkfilename, $cmtime, $meta_same) = @_;
my $pubstatus = 'unpublished';
- my $status=&mt('Unpublished');
- my $css_class='LC_browser_file';
- my $title=' ';
- my $publish_button=&mt('Publish');
- my $cstr_dir = '/home/'.$uname.'/public_html/'.$thisdisfn.'/';
-# my $action_buttons=
-# ''. -# &mt('Delete').''; + my $status = &mt('Unpublished'); + if (-e $resdir.'/'.$filename) { - my $same=0; - my ($rdev,$rino,$rmode,$rnlink, - $ruid,$rgid,$rrdev,$rsize, - $ratime,$rmtime,$rctime, - $rblksize,$rblocks)=stat($resdir.'/'.$filename); - if ($rmtime>=$cmtime) { - $same=1; + my $same = 0; + if ((stat($resdir.'/'.$filename))[9] >= $cmtime) { + $same = 1; } else { if (&Apache::londiff::are_different_files($resdir.'/'.$filename, $cstr_dir.'/'.$filename)) { - $same=0; + $same = 0; } else { - $same=1; + $same = 1; } } - my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9]; - my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9]; - my $meta_same = 1; - if ($meta_rmtime < $meta_cmtime - && &Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta', - $cstr_dir.'/'.$filename.'.meta')) { - $meta_same = 0; - } - $publish_button=&mt('Re-publish'); - my $rights_status = - &mt(&getCopyRightString($targetdir.'/'.$filename)).' '. - &mt(&getSourceRightString($targetdir.'/'.$filename)); - $title = ''. - &getTitleString($targetdir.'/'.$filename).''; + + my $rights_status = + &mt(&getCopyRightString($targetdir.'/'.$filename)).', '; + + my %lt_SourceRight = &Apache::lonlocal::texthash( + 'open' => 'Source: open', + 'closed' => 'Source: closed', + ); + $rights_status .= + $lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)}; + if ($same) { if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) { $pubstatus = 'obsolete'; @@ -646,52 +820,63 @@ sub putresource { $status=&mt('Published'). '
'. $rights_status; } -# } else { -# $action_buttons=''; -# } } else { $pubstatus = 'modified'; $status=&mt('Modified'). '
'. $rights_status; -# $action_buttons=''; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { - $status.='
'.&mt('Diffs').''; + $status.='
'. + &Apache::loncommon::modal_link( + '/adm/diff?filename='.$linkfilename.'&versiontwo=priv', + &mt('Diffs'),600,500); } } - $title.="\n".'
'. - ($$bombs{$targetdir.'/'.$filename}?'
':&mt('Edit Metadata')).'';
-
- if (!$meta_same) {
- $title = &mt('Metadata Modified').''.$title. - '
'.&mt('Metadata Diffs').''; - $title.="\n".'
'.&mt('Retrieve Metadata').''; - } - $status.="\n".'
'.&mt('Retrieve').''; + $status.="\n".'
'. + &Apache::loncommon::modal_link( + '/adm/retrieve?filename='.$linkfilename.'&inhibitmenu=yes&add_modal=yes',&mt('Retrieve'),600,500); } + + return ($status, $pubstatus); +} + + +# +# Put a table row for a file resource. +# +sub putresource { + my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir, + $linkdir, $cmtime, $size, $numres, $linkfilename, $title, + $status, $pubstatus, $editors) = @_; + &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename); + my $editlink=''; my $editlink2=''; - if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { - $editlink='
('.&mt('Edit').')'; + if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty|txt|css|js)$/) { + $editlink='
('.&mt('Edit').')'; + } + if ($filename=~/$LONCAPA::assess_re/) { + if ($editors->{'xml'}) { + $editlink=' ('.&mt('EditXML').')'; + } + if ($editors->{'edit'}) { + $editlink2='
('.&mt('Edit').')'; + } } - if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { - $editlink=' ('.&mt('EditXML').')'; - $editlink2='
('.&mt('Edit').')'; + if ($filename=~/\.(xml|html|htm|xhtml|xhtm)$/ || $filename=~/$LONCAPA::assess_re/) { + if (($editors->{'daxe'}) && + ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9)) { + my $daxeurl = '/daxepage'.$linkdir.'/'.$filename; + $editlink .= ' (Daxe)'; + } } if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) { - $editlink.=' ('.&mt('Clean Up').')'; + $editlink.=' ('.&mt('Clean Up').')'; } if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { - $editlink=' ('.&mt('Decompress').')'; + $editlink=' ('.&mt('Decompress').')'; } + my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish'); my $pub_select = ''; &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres); $r->print(&Apache::loncommon::start_data_table_row(). @@ -699,16 +884,17 @@ sub putresource { '