version 1.280, 2007/06/29 21:08:07
|
version 1.281, 2007/06/29 23:25:30
|
Line 958 sub breadcrumbs {
|
Line 958 sub breadcrumbs {
|
my $folderpath; |
my $folderpath; |
my $cpinfo=''; |
my $cpinfo=''; |
my $plain=''; |
my $plain=''; |
if ($env{'form.markedcopy_url'}) { |
|
$cpinfo='&markedcopy_url='. |
|
&escape($env{'form.markedcopy_url'}). |
|
'&markedcopy_title='. |
|
&escape($env{'form.markedcopy_title'}); |
|
} |
|
my $randompick=-1; |
my $randompick=-1; |
my $isencrypted=0; |
my $isencrypted=0; |
my $ishidden=0; |
my $ishidden=0; |
Line 1187 sub docs_change_log {
|
Line 1181 sub docs_change_log {
|
$r->print(&Apache::loncommon::end_data_table()); |
$r->print(&Apache::loncommon::end_data_table()); |
} |
} |
|
|
|
sub update_paste_buffer { |
|
my ($coursenum,$coursedom) = @_; |
|
|
|
return if (!defined($env{'form.markcopy'})); |
|
return if (!defined($env{'form.copyfolder'})); |
|
return if ($env{'form.markcopy'} < 0); |
|
|
|
my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
|
$env{'form.copyfolder'}); |
|
|
|
return if ($fatal); |
|
|
|
# Mark for copying |
|
my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]); |
|
if (&is_supplemental_title($title)) { |
|
($title) = &parse_supplemental_title($title); |
|
} |
|
&Apache::lonnet::appenv('docs.markedcopy_title' => $title, |
|
'docs.markedcopy_url' => $url); |
|
delete($env{'form.markcopy'}); |
|
} |
|
|
|
sub print_paste_buffer { |
|
my ($r,$container) = @_; |
|
return if (!defined($env{'docs.markedcopy_url'})); |
|
|
|
$r->print(<<ENDPASTE); |
|
<p><form name="pasteform" action="/adm/coursedocs" method="post"> |
|
ENDPASTE |
|
$r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '); |
|
|
|
my $type; |
|
if ($env{'docs.markedcopy_url'} =~ m{^/adm/wrapper/ext}) { |
|
$type = &mt('External Resource'); |
|
$r->print($type.': '.&Apache::map::qtescape($env{'docs.markedcopy_title'})); |
|
} else { |
|
my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1]; |
|
my $type = &Apache::loncommon::filedescription($extension); |
|
my $icon = '<img src="'.&Apache::loncommon::icon($extension). |
|
'" class="LC_icon" />'; |
|
$r->print($icon.$type.': '. &parse_supplemental_title($env{'docs.markedcopy_title'})); |
|
} |
|
if ($container eq 'page') { |
|
$r->print(<<PAGEINFO); |
|
<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" /> |
|
<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" /> |
|
PAGEINFO |
|
} else { |
|
$r->print(<<FOLDERINFO); |
|
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> |
|
FOLDERINFO |
|
} |
|
$r->print('</form></p>'); |
|
} |
|
|
sub editor { |
sub editor { |
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_; |
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_; |
my $errtext=''; |
my $errtext=''; |
my $fatal=0; |
my $fatal=0; |
my $container='sequence'; |
my $container='sequence'; |
if ($env{'form.pagepath'}) { |
if ($env{'form.pagepath'}) { |
$container='page'; |
$container='page'; |
} |
} |
($errtext,$fatal)= |
($errtext,$fatal) = &mapread($coursenum,$coursedom,$folder.'.'.$container); |
&mapread($coursenum,$coursedom,$folder.'.'.$container); |
|
if ($#LONCAPA::map::order<1) { |
if ($#LONCAPA::map::order<1) { |
my $idx=&LONCAPA::map::getresidx(); |
my $idx=&LONCAPA::map::getresidx(); |
if ($idx<=0) { $idx=1; } |
if ($idx<=0) { $idx=1; } |
$LONCAPA::map::order[0]=$idx; |
$LONCAPA::map::order[0]=$idx; |
$LONCAPA::map::resources[$idx]=''; |
$LONCAPA::map::resources[$idx]=''; |
} |
} |
if (defined($env{'form.markcopy'})) { |
|
# Mark for copying |
|
my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]); |
|
$env{'form.markedcopy_title'}=$title; |
|
$env{'form.markedcopy_url'}=$url; |
|
} |
|
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder); |
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder); |
$r->print($breadcrumbtrail); |
$r->print($breadcrumbtrail); |
if ($fatal) { |
if ($fatal) { |
Line 1297 sub editor {
|
Line 1340 sub editor {
|
return; |
return; |
} |
} |
} |
} |
|
|
if ($env{'form.pastemarked'}) { |
if ($env{'form.pastemarked'}) { |
# paste resource to end of list |
# paste resource to end of list |
my $url=$env{'form.markedcopy_url'}; |
my $url=$env{'docs.markedcopy_url'}; |
my $title=$env{'form.markedcopy_title'}; |
my $title=$env{'docs.markedcopy_title'}; |
# Maps need to be copied first |
# Maps need to be copied first |
if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) { |
if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) { |
$title=&mt('Copy of').' '.$title; |
$title=&mt('Copy of').' '.$title; |
Line 1429 sub editor {
|
Line 1472 sub editor {
|
} |
} |
} |
} |
&log_differences($plain); |
&log_differences($plain); |
} |
} |
# ---------------------------------------------------------------- End commands |
# ---------------------------------------------------------------- End commands |
# ---------------------------------------------------------------- Print screen |
# ---------------------------------------------------------------- Print screen |
my $idx=0; |
my $idx=0; |
Line 1460 sub editor {
|
Line 1503 sub editor {
|
$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>'); |
$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>'); |
} |
} |
$r->print("\n</table>\n"); |
$r->print("\n</table>\n"); |
if ($env{'form.markedcopy_url'}) { |
|
$r->print(<<ENDPASTE); |
|
<p><form name="pasteform" action="/adm/coursedocs" method="post"> |
|
<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" /> |
|
<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" /> |
|
ENDPASTE |
|
$r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '); |
|
|
|
my $type; |
&print_paste_buffer($r,$container); |
if ($env{'form.markedcopy_url'} =~ m{^/adm/wrapper/ext}) { |
|
$type = &mt('External Resource'); |
|
$r->print($type.': '. $env{'form.markedcopy_title'}); |
|
} else { |
|
my $extension = (split(/\./,$env{'form.markedcopy_url'}))[-1]; |
|
my $type = &Apache::loncommon::filedescription($extension); |
|
my $icon = '<img src="'.&Apache::loncommon::icon($extension). |
|
'" class="LC_icon" />'; |
|
$r->print($icon.$type.': '. $env{'form.markedcopy_title'}); |
|
} |
|
if ($container eq 'page') { |
|
$r->print(<<PAGEINFO); |
|
<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" /> |
|
<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" /> |
|
PAGEINFO |
|
} else { |
|
$r->print(<<FOLDERINFO); |
|
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> |
|
FOLDERINFO |
|
} |
|
$r->print('</form></p>'); |
|
} |
|
} |
} |
} |
} |
|
|
Line 1650 sub process_secondary_uploads {
|
Line 1665 sub process_secondary_uploads {
|
return $filename; |
return $filename; |
} |
} |
|
|
|
sub is_supplemental_title { |
|
my ($title) = @_; |
|
return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/); |
|
} |
|
|
|
sub parse_supplemental_title { |
|
my ($title) = @_; |
|
|
|
my ($foldertitle,$renametitle); |
|
if ($title =~ /&&&/) { |
|
$title = &HTML::Entites::decode($title); |
|
} |
|
if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) { |
|
$renametitle=$4; |
|
my ($time,$uname,$udom) = ($1,$2,$3); |
|
$foldertitle=&Apache::lontexconvert::msgtexconverted($4); |
|
my $name = &Apache::loncommon::plainname($uname,$udom); |
|
$name = &HTML::Entities::encode($name,'"<>&\''); |
|
$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '. |
|
$name.': <br />'.$foldertitle; |
|
} |
|
if (wantarray) { |
|
return ($title,$foldertitle,$renametitle); |
|
} |
|
return $title; |
|
} |
|
|
# --------------------------------------------------------------- An entry line |
# --------------------------------------------------------------- An entry line |
|
|
sub entryline { |
sub entryline { |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_; |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_; |
$title=&HTML::Entities::encode($title,'"<>&\''); |
|
my $renametitle=$title; |
my ($foldertitle,$pagetitle,$renametitle); |
my $foldertitle=$title; |
if (&is_supplemental_title($title)) { |
my $pagetitle=$title; |
($title,$foldertitle,$renametitle) = &parse_supplemental_title($title); |
my $orderidx=$LONCAPA::map::order[$index]; |
$pagetitle = $foldertitle; |
if ($title=~ /^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/ ) { |
} else { |
$foldertitle=&Apache::lontexconvert::msgtexconverted($4); |
$title=&HTML::Entities::encode($title,'"<>&\''); |
$renametitle=$4; |
$renametitle=$title; |
$title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '. |
$foldertitle=$title; |
&Apache::loncommon::plainname($2,$3).': <br />'. |
$pagetitle=$title; |
$foldertitle; |
|
} |
} |
|
|
|
my $orderidx=$LONCAPA::map::order[$index]; |
|
|
|
|
$renametitle=~s/\\/\\\\/g; |
$renametitle=~s/\\/\\\\/g; |
$renametitle=~s/\"\;/\\\"/g; |
$renametitle=~s/\"\;/\\\"/g; |
my $line='<tr>'; |
my $line='<tr>'; |
Line 1684 sub entryline {
|
Line 1729 sub entryline {
|
$symb=&escape($env{'form.pagesymb'}); |
$symb=&escape($env{'form.pagesymb'}); |
} |
} |
my $cpinfo=''; |
my $cpinfo=''; |
if ($env{'form.markedcopy_url'}) { |
|
$cpinfo='&markedcopy_url='. |
|
&escape($env{'form.markedcopy_url'}). |
|
'&markedcopy_title='. |
|
&escape($env{'form.markedcopy_title'}); |
|
} |
|
if ($allowed) { |
if ($allowed) { |
my $incindex=$index+1; |
my $incindex=$index+1; |
my $selectbox=''; |
my $selectbox=''; |
Line 1740 sub entryline {
|
Line 1779 sub entryline {
|
|
|
if (!$nocopy) { |
if (!$nocopy) { |
$copylink=(<<ENDCOPY); |
$copylink=(<<ENDCOPY); |
<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb");'> |
<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");'> |
<font size="-2" color="#000099">$lt{'cp'}</font></a> |
<font size="-2" color="#000099">$lt{'cp'}</font></a> |
ENDCOPY |
ENDCOPY |
} |
} |
if (!$nocut) { |
if (!$nocut) { |
$cutlink=(<<ENDCUT); |
$cutlink=(<<ENDCUT); |
<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb");'> |
<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder");'> |
<font size="-2" color="#550044">$lt{'ct'}</font></a> |
<font size="-2" color="#550044">$lt{'ct'}</font></a> |
ENDCUT |
ENDCUT |
} |
} |
Line 1754 ENDCUT
|
Line 1793 ENDCUT
|
<form name="entry_$index" action="/adm/coursedocs" method="post"> |
<form name="entry_$index" action="/adm/coursedocs" method="post"> |
<input type="hidden" name="${type}path" value="$path" /> |
<input type="hidden" name="${type}path" value="$path" /> |
<input type="hidden" name="${type}symb" value="$symb" /> |
<input type="hidden" name="${type}symb" value="$symb" /> |
<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" /> |
|
<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" /> |
|
<input type="hidden" name="setparms" value="$orderidx" /> |
<input type="hidden" name="setparms" value="$orderidx" /> |
<input type="hidden" name="changeparms" value="0" /> |
<input type="hidden" name="changeparms" value="0" /> |
<td> |
<td> |
Line 2443 sub handler {
|
Line 2480 sub handler {
|
my $uploadtag; |
my $uploadtag; |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['folderpath','pagepath', |
['folderpath','pagepath', |
'pagesymb','markedcopy_url', |
'pagesymb']); |
'markedcopy_title']); |
|
if ($env{'form.folderpath'}) { |
if ($env{'form.folderpath'}) { |
my (@folderpath)=split('&',$env{'form.folderpath'}); |
my (@folderpath)=split('&',$env{'form.folderpath'}); |
$env{'form.foldername'}=&unescape(pop(@folderpath)); |
$env{'form.foldername'}=&unescape(pop(@folderpath)); |
Line 2619 sub handler {
|
Line 2655 sub handler {
|
); |
); |
# ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
if ($allowed) { |
if ($allowed) { |
|
&update_paste_buffer($coursenum,$coursedom); |
my $dumpbut=&dumpbutton(); |
my $dumpbut=&dumpbutton(); |
my $exportbut=&exportbutton(); |
my $exportbut=&exportbutton(); |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
Line 2646 sub handler {
|
Line 2683 sub handler {
|
<input type="hidden" name="title" /> |
<input type="hidden" name="title" /> |
<input type="hidden" name="cmd" /> |
<input type="hidden" name="cmd" /> |
<input type="hidden" name="markcopy" /> |
<input type="hidden" name="markcopy" /> |
|
<input type="hidden" name="copyfolder" /> |
$containertag |
$containertag |
</form> |
</form> |
<form name="simpleedit" method="post" action="/adm/coursedocs"> |
<form name="simpleedit" method="post" action="/adm/coursedocs"> |
Line 3130 function finishpick() {
|
Line 3168 function finishpick() {
|
function changename(folderpath,index,oldtitle,container,pagesymb) { |
function changename(folderpath,index,oldtitle,container,pagesymb) { |
var title=prompt('New Title',oldtitle); |
var title=prompt('New Title',oldtitle); |
if (title) { |
if (title) { |
|
this.document.forms.renameform.markcopy.value=-1; |
this.document.forms.renameform.title.value=title; |
this.document.forms.renameform.title.value=title; |
this.document.forms.renameform.cmd.value='rename_'+index; |
this.document.forms.renameform.cmd.value='rename_'+index; |
if (container == 'sequence') { |
if (container == 'sequence') { |
Line 3145 function changename(folderpath,index,old
|
Line 3184 function changename(folderpath,index,old
|
|
|
function removeres(folderpath,index,oldtitle,container,pagesymb) { |
function removeres(folderpath,index,oldtitle,container,pagesymb) { |
if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) { |
if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) { |
|
this.document.forms.renameform.markcopy.value=-1; |
this.document.forms.renameform.cmd.value='del_'+index; |
this.document.forms.renameform.cmd.value='del_'+index; |
if (container == 'sequence') { |
if (container == 'sequence') { |
this.document.forms.renameform.folderpath.value=folderpath; |
this.document.forms.renameform.folderpath.value=folderpath; |
Line 3157 function removeres(folderpath,index,oldt
|
Line 3197 function removeres(folderpath,index,oldt
|
} |
} |
} |
} |
|
|
function cutres(folderpath,index,oldtitle,container,pagesymb) { |
function cutres(folderpath,index,oldtitle,container,pagesymb,folder) { |
if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) { |
if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) { |
this.document.forms.renameform.cmd.value='cut_'+index; |
this.document.forms.renameform.cmd.value='cut_'+index; |
this.document.forms.renameform.markcopy.value=index; |
this.document.forms.renameform.markcopy.value=index; |
|
this.document.forms.renameform.copyfolder.value=folder+'.'+container; |
if (container == 'sequence') { |
if (container == 'sequence') { |
this.document.forms.renameform.folderpath.value=folderpath; |
this.document.forms.renameform.folderpath.value=folderpath; |
} |
} |
Line 3172 function cutres(folderpath,index,oldtitl
|
Line 3213 function cutres(folderpath,index,oldtitl
|
} |
} |
} |
} |
|
|
function markcopy(folderpath,index,oldtitle,container,pagesymb) { |
function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) { |
this.document.forms.renameform.markcopy.value=index; |
this.document.forms.renameform.markcopy.value=index; |
|
this.document.forms.renameform.copyfolder.value=folder+'.'+container; |
if (container == 'sequence') { |
if (container == 'sequence') { |
this.document.forms.renameform.folderpath.value=folderpath; |
this.document.forms.renameform.folderpath.value=folderpath; |
} |
} |