--- loncom/interface/londocs.pm 2007/01/05 18:45:40 1.267
+++ loncom/interface/londocs.pm 2007/07/12 01:04:36 1.288
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.267 2007/01/05 18:45:40 www Exp $
+# $Id: londocs.pm,v 1.288 2007/07/12 01:04:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -122,16 +122,17 @@ sub dumpbutton {
my ($home,$other,%outhash)=&authorhosts();
my $type = &Apache::loncommon::course_type();
if ($home+$other==0) { return ''; }
- my $output='</td><td bgcolor="#DDDDCC">';
if ($home) {
- return '</td><td bgcolor="#DDDDCC">'.
+ return '<div>'.
'<input type="submit" name="dumpcourse" value="'.
&mt('Dump '.$type.' DOCS to Construction Space').'" />'.
- &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
+ &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').
+ '</div>';
} else {
- return'</td><td bgcolor="#DDDDCC">'.
+ return '<div>'.
&mt('Dump '.$type.
- ' DOCS to Construction Space: available on other servers');
+ ' DOCS to Construction Space: available on other servers').
+ '</div>';
}
}
@@ -199,9 +200,9 @@ sub dumpcourse {
$fail=1;
}
if ($fail) {
- $r->print('<font color="red">fail</font>');
+ $r->print('<span class="LC_error">'.&mt('fail').'</span>');
} else {
- $r->print('<font color="green">ok</font>');
+ $r->print('<span class="LC_success">'.&mt('ok').'</span>');
}
}
} else {
@@ -235,7 +236,6 @@ sub dumpcourse {
my ($ext)=($_=~/\.(\w+)$/);
my $title=$hash{'title_'.$hash{
'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
- $title=~s/:/:/g;
$r->print('<td>'.($title?$title:' ').'</td>');
if (!$title) {
$title=$_;
@@ -258,10 +258,10 @@ sub dumpcourse {
sub exportbutton {
my $type = &Apache::loncommon::course_type();
- return '</td><td bgcolor="#DDDDCC">'.
+ return '<div>'.
'<input type="submit" name="exportcourse" value="'.
&mt('Export '.$type.' to IMS').'" />'.
- &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
+ &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>';
}
sub exportcourse {
@@ -380,7 +380,7 @@ sub exportcourse {
}
$display .= ' />'."\n";
for (my $i=0; $i<$depth; $i++) {
- $display .= '<img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" /><img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" />'."\n";
+ $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\n";
}
if ($curRes->is_sequence()) {
$display .= '<img src="/adm/lonIcons/navmap.folder.open.gif"> '."\n";
@@ -905,15 +905,14 @@ sub store_template {
# Imports the given (name, url) resources into the course
# coursenum, coursedom, and folder must precede the list
sub group_import {
- my $coursenum = shift;
- my $coursedom = shift;
- my $folder = shift;
- my $container = shift;
- my $caller = shift;
- while (@_) {
- my $name = shift;
- my $url = shift;
- if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) && ($caller eq 'londocs')) {
+ my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
+
+ while (@files) {
+ my ($name, $url, $residx) = @{ shift(@files) };
+ if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
+ && ($caller eq 'londocs')
+ && (!&Apache::lonnet::stat_file($url))) {
+
my $errtext = '';
my $fatal = 0;
my $newmapstr = '<map>'."\n".
@@ -933,14 +932,17 @@ sub group_import {
}
}
if ($url) {
- my $idx = &LONCAPA::map::getresidx($url);
- $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
+ if (!$residx
+ || defined($LONCAPA::map::zombies[$residx])) {
+ $residx = &LONCAPA::map::getresidx($url,$residx);
+ push(@LONCAPA::map::order, $residx);
+ }
my $ext = 'false';
if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
- $url =~ s/:/\:/g;
- $name =~ s/:/\:/g;
- $LONCAPA::map::resources[$idx] =
- join ':', ($name, $url, $ext, 'normal', 'res');
+ $url = &LONCAPA::map::qtunescape($url);
+ $name = &LONCAPA::map::qtunescape($name);
+ $LONCAPA::map::resources[$residx] =
+ join(':', ($name, $url, $ext, 'normal', 'res'));
}
}
return &storemap($coursenum, $coursedom, $folder.'.'.$container);
@@ -958,12 +960,6 @@ sub breadcrumbs {
my $folderpath;
my $cpinfo='';
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 $isencrypted=0;
my $ishidden=0;
@@ -1155,7 +1151,7 @@ sub docs_change_log {
for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
- if ($oldname ne $newname) {
+ if ($oldname ne '' && $oldname ne $newname) {
$r->print(&LONCAPA::map::qtescape($newname));
}
}
@@ -1185,35 +1181,87 @@ sub docs_change_log {
|| $shown<=$env{'form.show'})) { last; }
}
$r->print(&Apache::loncommon::end_data_table());
- $r->print(&Apache::loncommon::end_page());
+}
+
+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);
+ }
+ $url=~s{http(:|:)//https(:|:)//}{https$2//};
+
+ &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);
+<form name="pasteform" action="/adm/coursedocs" method="post"><p>
+ENDPASTE
+ $r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ');
+
+ my $type;
+ if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) {
+ $type = &mt('External Resource');
+ $r->print($type.': '.
+ &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
+ &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
+ } else {
+ my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
+ my $type = &Apache::loncommon::filedescription($extension);
+ my $icon = '<img src="'.&Apache::loncommon::icon($extension).
+ '" alt="" class="LC_icon" />';
+ $r->print($icon.$type.': '. &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
+ }
+ if ($container eq 'page') {
+ $r->print('
+ <input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
+ <input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
+');
+ } else {
+ $r->print('
+ <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
+');
+ }
+ $r->print('</p></form>');
}
sub editor {
- my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_;
+ my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_;
my $errtext='';
my $fatal=0;
my $container='sequence';
if ($env{'form.pagepath'}) {
$container='page';
}
- ($errtext,$fatal)=
- &mapread($coursenum,$coursedom,$folder.'.'.$container);
+ ($errtext,$fatal) = &mapread($coursenum,$coursedom,$folder.'.'.$container);
if ($#LONCAPA::map::order<1) {
my $idx=&LONCAPA::map::getresidx();
if ($idx<=0) { $idx=1; }
$LONCAPA::map::order[0]=$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);
$r->print($breadcrumbtrail);
if ($fatal) {
- $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
} else {
# ------------------------------------------------------------ Process commands
@@ -1254,7 +1302,7 @@ sub editor {
# store the changed version
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
if ($fatal) {
- $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;
}
}
@@ -1294,15 +1342,15 @@ sub editor {
# store the changed version
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
if ($fatal) {
- $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;
}
}
-
+
if ($env{'form.pastemarked'}) {
# paste resource to end of list
- my $url=$env{'form.markedcopy_url'};
- my $title=$env{'form.markedcopy_title'};
+ my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
+ my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
# Maps need to be copied first
if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) {
$title=&mt('Copy of').' '.$title;
@@ -1316,12 +1364,10 @@ sub editor {
&Apache::lonnet::getfile($url));
$url=$newurl;
}
- $title=~s/\</\<\;/g;
- $title=~s/\>/\>\;/g;
- $title=~s/\:/\:/g;
+ $title = &LONCAPA::map::qtunescape($title);
my $ext='false';
- if ($url=~/^http\:\/\//) { $ext='true'; }
- $url=~s/\:/\:/g;
+ if ($url=~m{^http(|s)://}) { $ext='true'; }
+ $url = &LONCAPA::map::qtunescape($url);
# Now insert the URL at the bottom
my $newidx=&LONCAPA::map::getresidx($url);
$LONCAPA::map::resources[$newidx]=
@@ -1330,7 +1376,7 @@ sub editor {
# Store the result
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
if ($fatal) {
- $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;
}
@@ -1373,46 +1419,39 @@ sub editor {
my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
my ($rtitle,@rrest)=split(/\:/,
$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
- my $comment=
- &HTML::Entities::decode($env{'form.title'});
- $comment=~s/\</\<\;/g;
- $comment=~s/\>/\>\;/g;
- $comment=~s/\:/\:/g;
+ my $comment=$env{'form.title'};
+ $comment = &LONCAPA::map::qtunescape($comment);
if ($comment=~/\S/) {
$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
$comment.':'.join(':',@rrest);
}
# Devalidate title cache
- my $renamed_url=$rrest[0];
-# Has the :-escaping
- $renamed_url=~s/\&colon\;/\:/g;
+ my $renamed_url=&LONCAPA::map::qtescape($rrest[0]);
&Apache::lonnet::devalidate_title_cache($renamed_url);
}
# Store the changed version
($errtext,$fatal)=&storemap($coursenum,$coursedom,
$folder.'.'.$container);
if ($fatal) {
- $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;
}
}
# Group import/search
if ($env{'form.importdetail'}) {
my @imports;
-# &Apache::lonnet::logthis("imp detail ".$env{'form.importdetail'});
foreach (split(/\&/,$env{'form.importdetail'})) {
if (defined($_)) {
- my ($name,$url)=split(/\=/,$_);
- $name=&unescape($name);
- $url=&unescape($url);
- push @imports, $name, $url;
+ my ($name,$url,$residx)=
+ map {&unescape($_)} split(/\=/,$_);
+ push(@imports, [$name, $url, $residx]);
}
}
# Store the changed version
($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
$container,'londocs',@imports);
if ($fatal) {
- $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;
}
}
@@ -1429,15 +1468,16 @@ sub editor {
($errtext,$fatal)=&storemap($coursenum,$coursedom,
$folder.'.'.$container);
if ($fatal) {
- $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;
}
} else {
- $r->print('<p><font color="red">'.&mt('No map selected.').'</font></p>');
+ $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
+
}
}
&log_differences($plain);
- }
+ }
# ---------------------------------------------------------------- End commands
# ---------------------------------------------------------------- Print screen
my $idx=0;
@@ -1452,14 +1492,15 @@ sub editor {
if ($randompick>=0) {
$r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
}
- $r->print('<table>');
- foreach (@LONCAPA::map::order) {
- my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$_]);
+ $r->print('<table class="LC_docs_editor">');
+ foreach my $res (@LONCAPA::map::order) {
+ my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
$name=&LONCAPA::map::qtescape($name);
$url=&LONCAPA::map::qtescape($url);
unless ($name) { $name=(split(/\//,$url))[-1]; }
unless ($name) { $idx++; next; }
- $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
+ $r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
+ $coursenum));
$idx++;
$shown++;
}
@@ -1467,29 +1508,9 @@ sub editor {
$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
}
$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').
- '" /> '.&Apache::loncommon::filedescription(
- (split(/\./,$env{'form.markedcopy_url'}))[-1]).': '.
- $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>');
- }
+
+ &print_paste_buffer($r,$container);
+
}
}
@@ -1538,12 +1559,10 @@ sub process_file_upload {
$parseaction,$allfiles,
$codebase);
my $ext='false';
- if ($url=~/^http\:\/\//) { $ext='true'; }
- $url=~s/\:/\:/g;
+ if ($url=~m{^http://}) { $ext='true'; }
+ $url = &LONCAPA::map::qtunescape($url);
my $comment=$env{'form.comment'};
- $comment=~s/\</\<\;/g;
- $comment=~s/\>/\>\;/g;
- $comment=~s/\:/\:/g;
+ $comment = &LONCAPA::map::qtunescape($comment);
if ($folder=~/^supplemental/) {
$comment=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
$env{'user.domain'}.'___&&&___'.$comment;
@@ -1555,45 +1574,25 @@ sub process_file_upload {
($errtext,$fatal)=&storemap($coursenum,$coursedom,
$folder.'.'.$container);
if ($fatal) {
- $$upload_output .= '<p><font color="red">'.$errtext.'</font></p>';
+ $$upload_output .= '<p><span class="LC_error">'.$errtext.'</span></p>';
return 'failed';
} else {
if ($parseaction eq 'parse') {
my $total_embedded = keys(%{$allfiles});
if ($total_embedded > 0) {
my $num = 0;
- $$upload_output .= 'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />
- <form name="upload_embedded" action="/adm/coursedocs"
- method="post" enctype="multipart/form-data">
- <input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" /> <input type="hidden" name="cmd" value="upload_embedded" />
+ my $state = '
+ <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
+ <input type="hidden" name="cmd" value="upload_embedded" />
<input type="hidden" name="newidx" value="'.$newidx.'" />
<input type="hidden" name="primaryurl" value="'.&escape($url).'" />
<input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';
- $$upload_output .= '<b>Upload embedded files</b>:<br />
- <table>';
- foreach my $embed_file (keys(%{$allfiles})) {
- $$upload_output .= '<tr><td>'.$embed_file.
- '<input name="embedded_item_'.$num.'" type="file" />
- <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
- my $attrib;
- if (@{$$allfiles{$embed_file}} > 1) {
- $attrib = join(':',@{$$allfiles{$embed_file}});
- } else {
- $attrib = $$allfiles{$embed_file}[0];
- }
- $$upload_output .=
- '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.$attrib.'" />';
- if (exists($$codebase{$embed_file})) {
- $$upload_output .=
- '<input name="codebase_'.$num.'" type="hidden" value="'.&escape($$codebase{$embed_file}).'" />';
- }
- $$upload_output .= '</td></tr>';
- $num ++;
- }
- $phase_status = 'phasetwo';
- $$upload_output .= '</table><br />
- <input type ="submit" value="Complete upload" />
- </form>';
+ $phase_status = 'phasetwo';
+
+ $$upload_output .=
+ 'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
+ &ask_for_embedded_content('/adm/coursedocs',
+ $state,$allfiles,$codebase);
} else {
$$upload_output .= 'No embedded items identified<br />';
}
@@ -1603,6 +1602,55 @@ sub process_file_upload {
return $phase_status;
}
+sub ask_for_embedded_content {
+ my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
+ my $upload_output = '
+ <form name="upload_embedded" action="'.$actionurl.'"
+ method="post" enctype="multipart/form-data">';
+ $upload_output .= $state;
+ $upload_output .= '<b>Upload embedded files</b>:<br />'.
+ &Apache::loncommon::start_data_table();
+
+ my $num = 0;
+ foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {
+ $upload_output .= &Apache::loncommon::start_data_table_row().
+ '<td>'.$embed_file.'</td><td>';
+ if ($args->{'ignore_remote_references'}
+ && $embed_file =~ m{^\w+://}) {
+ $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
+ } elsif ($args->{'error_on_invalid_names'}
+ && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
+
+ $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';
+
+ } else {
+
+ $upload_output .='
+ <input name="embedded_item_'.$num.'" type="file" value="bob" />
+ <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
+ my $attrib = join(':',@{$$allfiles{$embed_file}});
+ $upload_output .=
+ "\n\t\t".
+ '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
+ $attrib.'" />';
+ if (exists($$codebase{$embed_file})) {
+ $upload_output .=
+ "\n\t\t".
+ '<input name="codebase_'.$num.'" type="hidden" value="'.
+ &escape($$codebase{$embed_file}).'" />';
+ }
+ }
+ $upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();
+ $num++;
+ }
+ $upload_output .= &Apache::loncommon::end_data_table().'<br />
+ <input type ="hidden" name="number_embedded_items" value="'.$num.'" />
+ <input type ="submit" value="'.&mt('Upload Listed Files').'" />
+ '.&mt('(only files for which a location has been provided will be uploaded)').'
+ </form>';
+ return $upload_output;
+}
+
sub process_secondary_uploads {
my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_;
my $folder=$env{'form.folder'};
@@ -1622,48 +1670,74 @@ sub process_secondary_uploads {
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
sub entryline {
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
- $title=~s/\&colon\;/\:/g;
- $title=&HTML::Entities::encode(&HTML::Entities::decode(
- &unescape($title)),'"<>&\'');
- my $renametitle=$title;
- my $foldertitle=$title;
- my $pagetitle=$title;
- my $orderidx=$LONCAPA::map::order[$index];
- if ($title=~ /^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/ ) {
- $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
- $renametitle=$4;
- $title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
- &Apache::loncommon::plainname($2,$3).': <br />'.
- $foldertitle;
+
+ my ($foldertitle,$pagetitle,$renametitle);
+ if (&is_supplemental_title($title)) {
+ ($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
+ $pagetitle = $foldertitle;
+ } else {
+ $title=&HTML::Entities::encode($title,'"<>&\'');
+ $renametitle=$title;
+ $foldertitle=$title;
+ $pagetitle=$title;
}
+
+ my $orderidx=$LONCAPA::map::order[$index];
+
+
$renametitle=~s/\\/\\\\/g;
$renametitle=~s/\"\;/\\\"/g;
+ $renametitle=~s/ /%20/g;
my $line='<tr>';
+ my ($form_start,$form_end);
# Edit commands
my $container;
- my $folderpath;
+ my ($container, $type, $esc_path, $path, $symb);
if ($env{'form.folderpath'}) {
+ $type = 'folder';
$container = 'sequence';
- $folderpath=&escape($env{'form.folderpath'});
+ $esc_path=&escape($env{'form.folderpath'});
+ $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"');
}
- my ($pagepath,$pagesymb);
if ($env{'form.pagepath'}) {
- $container = 'page';
- $pagepath=&escape($env{'form.pagepath'});
- $pagesymb=&escape($env{'form.pagesymb'});
+ $type = $container = 'page';
+ $esc_path=&escape($path = $env{'form.pagepath'});
+ $path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
+ $symb=&escape($env{'form.pagesymb'});
}
my $cpinfo='';
- if ($env{'form.markedcopy_url'}) {
- $cpinfo='&markedcopy_url='.
- &escape($env{'form.markedcopy_url'}).
- '&markedcopy_title='.
- &escape($env{'form.markedcopy_title'});
- }
if ($allowed) {
my $incindex=$index+1;
my $selectbox='';
@@ -1695,6 +1769,7 @@ sub entryline {
'rn' => 'Rename',
'cp' => 'Copy');
my $nocopy=0;
+ my $nocut=0;
if ($url=~/\.(page|sequence)$/) {
foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {
my ($title,$url,$ext,$type)=split(/\:/,$_);
@@ -1704,81 +1779,59 @@ sub entryline {
}
}
}
- if ($url=~/^\/res\/lib\/templates\//) { $nocopy=1; }
+ if ($url=~/^\/res\/lib\/templates\//) {
+ $nocopy=1;
+ $nocut=1;
+ }
my $copylink=' ';
my $cutlink=' ';
- if ($env{'form.pagepath'}) {
- unless ($nocopy) {
- $copylink=(<<ENDCOPY);
-<a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+
+ if (!$nocopy) {
+ $copylink=(<<ENDCOPY);
+<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_copy">$lt{'cp'}</a>
ENDCOPY
- $cutlink=(<<ENDCUT);
-<a href='javascript:cutres("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#550044">$lt{'ct'}</font></a>
+ }
+ if (!$nocut) {
+ $cutlink=(<<ENDCUT);
+<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_cut">$lt{'ct'}</a>
ENDCUT
- }
- $line.=(<<END);
-<form name="entry_$index" action="/adm/coursedocs" method="post">
-<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
-<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
-<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="changeparms" value="0" />
-<td><table border='0' cellspacing='2' cellpadding='0'>
-<tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
-<img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
-<tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
-<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
-</table></td>
-<td>$selectbox
-</td><td bgcolor="#DDDDDD">
-<a href='javascript:removeres("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#990000">$lt{'rm'}</font></a>
-$cutlink
-<a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#009900">$lt{'rn'}</font></a>
-$copylink
+ }
+ $form_start = (<<END);
+ <form action="/adm/coursedocs" method="post">
+ <input type="hidden" name="${type}path" value="$path" />
+ <input type="hidden" name="${type}symb" value="$symb" />
+ <input type="hidden" name="setparms" value="$orderidx" />
+ <input type="hidden" name="changeparms" value="0" />
END
- } else {
- unless ($nocopy) {
- $copylink=(<<ENDCOPY);
-<a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
-ENDCOPY
- $cutlink=(<<ENDCUT);
-<a href='javascript:cutres("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#550044">$lt{'ct'}</font></a>
-ENDCUT
- }
- $line.=(<<END);
-<form name="entry_$index" action="/adm/coursedocs" method="post">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
-<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="changeparms" value="0" />
-<td><table border='0' cellspacing='2' cellpadding='0'>
-<tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath$cpinfo'>
-<img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
-<tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath$cpinfo'>
-<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
-</table></td>
-<td>$selectbox
-</td><td bgcolor="#DDDDDD">
-<a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#990000">$lt{'rm'}</font></a>
+ $form_end = '</form>';
+ $line.=(<<END);
+<td>
+ <table class="LC_docs_entry_move">
+ <tr>
+ <td>
+ <a href='/adm/coursedocs?cmd=up_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /></a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href='/adm/coursedocs?cmd=down_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a>
+ </td>
+ </tr>
+ </table>
+</td>
+<td>
+ $form_start
+ $selectbox
+ $form_end
+</td>
+<td class="LC_docs_entry_commands">
+ <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_remove">$lt{'rm'}</a>
$cutlink
-<a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#009900">$lt{'rn'}</font></a>
+ <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
$copylink
+</td>
END
- }
+
}
# Figure out what kind of a resource this is
my ($extension)=($url=~/\.(\w+)$/);
@@ -1806,7 +1859,9 @@ END
&Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
}
}
- $url=~s-^http(\&colon\;|:)//-/adm/wrapper/ext/-;
+
+ my $orig_url = $url;
+ my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/});
if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
my $symb=&Apache::lonnet::symbclean(
&Apache::lonnet::declutter('uploaded/'.
@@ -1829,6 +1884,7 @@ END
}
} elsif ($url=~m|^/ext/|) {
$url='/adm/wrapper'.$url;
+ $external = 1;
}
if (&Apache::lonnet::symbverify($symb,$url)) {
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
@@ -1861,7 +1917,7 @@ END
(&LONCAPA::map::getparameter($orderidx,
'parameter_randompick'))[0].
'" />'.
-'<font size="-2"><a href="javascript:void(0)">'.&mt('Store').'</a></font></label>';
+'<a href="javascript:void(0)">'.&mt('Save').'</a></label>';
}
if ($ispage) {
@@ -1880,12 +1936,21 @@ END
$path.$pagearg.'.page');
}
$url.='pagepath='.&escape($pagepath).
- '&pagesymb='.&escape($symb).$cpinfo;
+ '&pagesymb='.&escape($symb).$cpinfo;
}
- $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
- '" border="0"></a></td>'.
- "<td bgcolor='#FFFFBB'>".($url?"<a href=\"$url\">":'').$title.
- ($url?'</a>':' <font size="-2">'.&mt('(re-initialize course to access)').'</font>')."</td>";
+ if ($external) {
+ my $form = ($folder =~ /^default/)? 'newext' : 'supnewext';
+ $external = ' <a class="LC_docs_ext_edit" href="javascript:edittext(\''.$form.'\',\''.$residx.'\',\''.&escape($title).'\',\''.&escape($orig_url).'\');" >'.&mt('Edit').'</a>';
+ } else {
+ undef($external);
+ }
+ $line.='
+ <td class="LC_docs_entry_icon">
+ '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
+ </td>
+ <td class="LC_docs_entry_title">
+ '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>').$external."
+ </td>";
if (($allowed) && ($folder!~/^supplemental/)) {
my %lt=&Apache::lonlocal::texthash(
'hd' => 'Hidden',
@@ -1895,14 +1960,20 @@ END
my $hidtext=
((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
$line.=(<<ENDPARMS);
-<td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td>
-<td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td>
-<td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
+ <td class="LC_docs_entry_parameter">
+ $form_start
+ <label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
+ $form_end
+ </td>
+ <td class="LC_docs_entry_parameter">
+ $form_start
+ <label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+ $form_end
+ </td>
+ <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td>
ENDPARMS
}
- $line.="</form></tr>";
+ $line.="</tr>";
return $line;
}
@@ -1968,17 +2039,17 @@ sub checkonthis {
if (($errorcount) ||
($warningcount)) {
if ($errorcount) {
- $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.
+ $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
$errorcount.' '.
- &mt('error(s)').'</b></font> ');
+ &mt('error(s)').'</span> ');
}
if ($warningcount) {
- $r->print('<font color="blue">'.
+ $r->print('<span class="LC_warning">'.
$warningcount.' '.
- &mt('warning(s)').'</font>');
+ &mt('warning(s)').'</span>');
}
} else {
- $r->print('<font color="green">'.&mt('ok').'</font>');
+ $r->print('<span class="LC_success">'.&mt('ok').'</span>');
}
$r->rflush();
}
@@ -1990,15 +2061,15 @@ sub checkonthis {
}
}
} elsif ($result eq 'unavailable') {
- $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');
+ $r->print('<span class="LC_error">'.&mt('connection down').'</span>');
} elsif ($result eq 'not_found') {
unless ($url=~/\$/) {
- $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
+ $r->print('<span class="LC_error">'.&mt('not found').'</b></font>');
} else {
- $r->print('<font color="yellow"><b>'.&mt('unable to verify variable URL').'</b></font>');
+ $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
}
} else {
- $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');
+ $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
}
}
}
@@ -2040,9 +2111,9 @@ sub verifycontent {
foreach (keys %hash) {
if ($hash{$_}=~/\.(page|sequence)$/) {
if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) {
- $r->print('<hr /><font color="red">'.
+ $r->print('<hr /><span class="LC_error">'.
&mt('The following sequence or page is included more than once in your '.$type.': ').
- &unescape($hash{$_}).'</font><br />'.
+ &unescape($hash{$_}).'</span><br />'.
&mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
}
}
@@ -2120,9 +2191,9 @@ sub checkversions {
if (&Apache::lonnet::put('resourceversions',\%newsetversions,
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
- $r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>');
+ $r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');
} else {
- $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>');
+ $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
}
&mark_hash_old();
}
@@ -2229,10 +2300,10 @@ ENDHEADERS
'lastrevisiondate')
).
'</td>'.
- '<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '.
+ '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '.
'<font size="+1">'.$currentversion.'</font>'.
- '</nobr></td>'.
- '<td title="'.$lt{'ve'}.'"><nobr>In '.$type.': '.
+ '</span></td>'.
+ '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$type.': '.
'<font size="+1">');
# Used in course
my $usedversion=$hash{'version_'.$linkurl};
@@ -2241,8 +2312,8 @@ ENDHEADERS
} else {
$r->print($currentversion);
}
- $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'.
- '<nobr>Use: ');
+ $r->print('</font></span></td><td title="'.$lt{'vu'}.'">'.
+ '<span class="LC_nobreak">Use: ');
# Set version
$r->print(&Apache::loncommon::select_form($setversions{$linkurl},
'set_version_'.$linkurl,
@@ -2251,7 +2322,7 @@ ENDHEADERS
'' => '',
'mostrecent' => 'most recent',
map {$_,$_} (1..$currentversion))));
- $r->print('</nobr></td></tr><tr><td></td>');
+ $r->print('</span></td></tr><tr><td></td>');
my $lastold=1;
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -2275,7 +2346,7 @@ ENDHEADERS
my $cols_output = 1;
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
my $url=$root.'.'.$prevvers.'.'.$extension;
- $r->print('<nobr><a href="'.&Apache::lonnet::clutter($url).
+ $r->print('<span class="LC_nobreak"><a href="'.&Apache::lonnet::clutter($url).
'">'.&mt('Version').' '.$prevvers.'</a> ('.
&Apache::lonlocal::locallocaltime(
&Apache::lonnet::metadata($url,
@@ -2288,7 +2359,7 @@ ENDHEADERS
'&versionone='.$prevvers.
'">'.&mt('Diffs').'</a>');
}
- $r->print('</nobr><br />');
+ $r->print('</span><br />');
if (++$entries_count % $entries_per_col == 0) {
$r->print('</font></td>');
if ($cols_output != 4) {
@@ -2350,14 +2421,14 @@ sub changewarning {
$message='Changes will become active for your current session after [_1], or the next time you log in.';
}
$r->print("\n\n".
-'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".
+'<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".
'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
'<input type="hidden" name="orgurl" value="'.$url.
-'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
+'" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'.
&mt($message,' <input type="hidden" name="'.
$env{'request.role'}.'" value="1" /><input type="button" value="'.
&mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />').
-$help{'Caching'}.'</font></h3></form>'."\n\n");
+$help{'Caching'}.'</span></h3></form>'."\n\n");
}
# =========================================== Breadcrumbs for special functions
@@ -2439,8 +2510,7 @@ sub handler {
my $uploadtag;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['folderpath','pagepath',
- 'pagesymb','markedcopy_url',
- 'markedcopy_title']);
+ 'pagesymb']);
if ($env{'form.folderpath'}) {
my (@folderpath)=split('&',$env{'form.folderpath'});
$env{'form.foldername'}=&unescape(pop(@folderpath));
@@ -2452,8 +2522,8 @@ sub handler {
$env{'form.folder'}=pop(@pagepath);
$containertag = '<input type="hidden" name="pagepath" value="" />'.
'<input type="hidden" name="pagesymb" value="" />';
- $uploadtag = '<input type="hidden" name="pagepath" value="'.$env{'form.pagepath'}.'" />'.
- '<input type="hidden" name="pagesymb" value="'.$env{'form.pagesymb'}.'" />';
+ $uploadtag = '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
+ '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />';
}
if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
$showdoc='/'.$1;
@@ -2615,6 +2685,7 @@ sub handler {
);
# -----------------------------------------------------------------------------
if ($allowed) {
+ &update_paste_buffer($coursenum,$coursedom);
my $dumpbut=&dumpbutton();
my $exportbut=&exportbutton();
my %lt=&Apache::lonlocal::texthash(
@@ -2634,43 +2705,50 @@ sub handler {
}
unless ($env{'form.pagepath'}) {
$containertag = '<input type="hidden" name="folderpath" value="" />';
- $uploadtag = '<input type="hidden" name="folderpath" value="'.$folderpath.'" />';
+ $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
}
$r->print(<<ENDCOURSEVERIFY);
<form name="renameform" method="post" action="/adm/coursedocs">
-<input type="hidden" name="title" />
-<input type="hidden" name="cmd" />
-<input type="hidden" name="markcopy" />
-$containertag
+ <input type="hidden" name="title" />
+ <input type="hidden" name="cmd" />
+ <input type="hidden" name="markcopy" />
+ <input type="hidden" name="copyfolder" />
+ $containertag
</form>
<form name="simpleedit" method="post" action="/adm/coursedocs">
-<input type="hidden" name="importdetail" value="" />
-$uploadtag
+ <input type="hidden" name="importdetail" value="" />
+ $uploadtag
</form>
<form action="/adm/coursedocs" method="post" name="courseverify">
-<table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
-<tr><td bgcolor="#DDDDCC">
-<input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
-</td><td bgcolor="#DDDDCC">
- <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
-$dumpbut
-$exportbut
-</td><td bgcolor="#DDDDCC">
- <input type="submit" name="listsymbs" value="$lt{'ls'}" />
-</td><td bgcolor="#DDDDCC">
- <input type="hidden" name="folder" value="$env{'form.folder'}" />
- <input type="submit" name="docslog" value="$lt{'sl'}" />
-</td></tr></table>
+ <div class="LC_docs_course_commands">
+
+ <div>
+ <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
+ </div>
+ <div>
+ <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
+ </div>
+ $dumpbut
+ $exportbut
+ <div>
+ <input type="submit" name="listsymbs" value="$lt{'ls'}" />
+ </div>
+ <div>
+ <input type="hidden" name="folder" value="$env{'form.folder'}" />
+ <input type="submit" name="docslog" value="$lt{'sl'}" />
+ </div>
+ </div>
</form>
+<div style="clear: both; height: 0px;"> </div>
ENDCOURSEVERIFY
$r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
&mt('Editing the Table of Contents for your '.$type)));
}
# --------------------------------------------------------- Standard documents
- $r->print('<table border=2 cellspacing=4 cellpadding=4>');
+ $r->print('<table class="LC_docs_documents">');#border=2 cellspacing=4 cellpadding=4>');
if (($standard) && ($allowed) && (!$forcesupplement)) {
- $r->print('<tr><td bgcolor="#BBBBBB">');
+ $r->print('<tr><td class="LC_docs_document">');
# '<h2>'.&mt('Main Course Documents').
# ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
my $folder=$env{'form.folder'};
@@ -2680,7 +2758,7 @@ ENDCOURSEVERIFY
}
my $postexec='';
if ($folder eq 'default') {
- $r->print('<script>this.window.name="loncapaclient";</script>');
+ $r->print('<script type="text/javascript">this.window.name="loncapaclient";</script>');
} else {
#$postexec='self.close();';
}
@@ -2700,54 +2778,56 @@ ENDCOURSEVERIFY
}
my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
$r->print(<<ENDFORM);
-<table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">$lt{'uplm'}</th>
-<th bgcolor="#DDDDDD">$lt{'impp'}</th>
-<th bgcolor="#DDDDDD">$lt{'spec'}</th>
+<table class="LC_docs_adddocs">
+<tr>
+<th>$lt{'uplm'}</th>
+<th>$lt{'impp'}</th>
+<th>$lt{'spec'}</th>
</tr>
-<tr><td bgcolor="#DDDDDD">
+<tr>
+<td>
$lt{'file'}:<br />
<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-<input type="file" name="uploaddoc" size="40">
+<input type="file" name="uploaddoc" size="40" />
<br />
$lt{'title'}:<br />
-<input type="text" size="50" name="comment">
+<input type="text" size="50" name="comment" />
$uploadtag
-<input type="hidden" name="cmd" value="upload_default">
+<input type="hidden" name="cmd" value="upload_default" />
<br />
-<nobr>
+<span class="LC_nobreak">
<label>$lt{'parse'}?
<input type="checkbox" name="parserflag" />
</label>
-</nobr>
+</span>
<br />
<br />
-<nobr>
-<input type="submit" value="$lt{'upld'}">
+<span class="LC_nobreak">
+<input type="submit" value="$lt{'upld'}" />
$help{'Uploading_From_Harddrive'}
-</nobr>
+</span>
</form>
</td>
-<td bgcolor="#DDDDDD">
+<td>
<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
$lt{'pubd'}<br />
$uploadtag
-<input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}" />
+<input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" />
<br />
-<nobr>
-<input type=button onClick="javascript:groupimport();" value="$lt{'impo'}" />
+<span class="LC_nobreak">
+<input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" />
$help{'Importing_LON-CAPA_Resource'}
-</nobr>
+</span>
<br />
-<input type=button onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
-<p>
+<input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
<hr />
+<p>
$lt{'copm'}<br />
-<input type="text" size="40" name="importmap"><br />
-<nobr><input type=button
+<input type="text" size="40" name="importmap" /><br />
+<span class="LC_nobreak"><input type="button"
onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
-value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">
-$help{'Load_Map'}</nobr>
+value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
+$help{'Load_Map'}</span>
</p>
</form>
<hr />
@@ -2761,124 +2841,124 @@ ENDFORM
<form action="/adm/coursedocs" method="post" name="newext">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newext" type="button" onClick="javascript:makenewext('newext');"
value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/imsimportdocs" method="post" name="ims">
<input type="hidden" name="folder" value="$folder" />
<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
-</nobr>
</form>
ENDFORM
}
- $r->print('</td><td bgcolor="#DDDDDD">');
+ $r->print('</td><td>');
unless ($env{'form.pagepath'}) {
+ my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
$r->print(<<ENDFORM);
<br /><form action="/adm/coursedocs" method="post" name="newfolder">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newfolder" type="button"
onClick="javascript:makenewfolder(this.form,'$folderseq');"
value="$lt{'newf'}" />$help{'Adding_Folders'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newpage">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newpage" type="button"
onClick="javascript:makenewpage(this.form,'$pageseq');"
value="$lt{'newp'}" />$help{'Adding_Pages'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newsyl">
$uploadtag
<input type="hidden" name="importdetail"
value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-<nobr>
+<span class="LC_nobreak">
<input name="newsyl" type="submit" value="$lt{'syll'}" />
$help{'Syllabus'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newnav">
$uploadtag
<input type="hidden" name="importdetail"
value="Navigate Content=/adm/navmaps" />
-<nobr>
+<span class="LC_nobreak">
<input name="newnav" type="submit" value="$lt{'navc'}" />
$help{'Navigate_Content'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newsmppg">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newsmppg" type="button" value="$lt{'sipa'}"
onClick="javascript:makesmppage();" /> $help{'Simple Page'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newdropbox">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newdropbox" type="button" value="$lt{'drbx'}"
onClick="javascript:makedropbox();" />
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newexamupload">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newexamupload" type="button" value="$lt{'scuf'}"
onClick="javascript:makeexamupload();" />
$help{'Score_Upload_Form'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newbul">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newbulletin" type="button" value="$lt{'bull'}"
onClick="javascript:makebulboard();" />
$help{'Bulletin Board'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newaboutme">
$uploadtag
<input type="hidden" name="importdetail"
value="$plainname=/adm/$udom/$uname/aboutme" />
-<nobr>
+<span class="LC_nobreak">
<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
$help{'My Personal Info'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newaboutsomeone" type="button" value="$lt{'abou'}"
onClick="javascript:makeabout();" />
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
$uploadtag
<input type="hidden" name="importdetail"
value="Group Files=/adm/$coursedom/$coursenum/aboutme" />
-<nobr>
+<span class="LC_nobreak">
<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
$help{'Group Files'}
-</nobr>
+</span>
</form>
ENDFORM
}
@@ -2887,19 +2967,19 @@ ENDFORM
<form action="/adm/coursedocs" method="post" name="newsmpproblem">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="newexamupload">
$uploadtag
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newexamupload" type="button" value="$lt{'scuf'}"
onClick="javascript:makeexamupload();" />
$help{'Score_Upload_Form'}
-</nobr>
+</span>
</form>
ENDBLOCK
}
@@ -2909,7 +2989,7 @@ ENDBLOCK
}
# ----------------------------------------------------- Supplemental documents
if (!$forcestandard) {
- $r->print('<tr><td bgcolor="#BBBBBB">');
+ $r->print('<tr><td class="LC_docs_document">');
# '<h2>'.&mt('Supplemental Course Documents').
# ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
my $folder=$env{'form.folder'};
@@ -2923,91 +3003,98 @@ ENDBLOCK
}
&editor($r,$coursenum,$coursedom,$folder,$allowed);
if ($allowed) {
- my $folderseq=
- '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
- '.sequence';
-
- $r->print(<<ENDSUPFORM);
-<table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">$lt{'upls'}</th>
-<th bgcolor="#DDDDDD">$lt{'spec'}</th>
+ my $folderseq=
+ '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
+ '.sequence';
+
+ my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+ $r->print(<<ENDSUPFORM);
+<table class="LC_docs_adddocs"><tr>
+<th>$lt{'upls'}</th>
+<th>$lt{'spec'}</th>
</tr>
-<tr><td bgcolor="#DDDDDD">
+<tr><td>
<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-<input type="file" name="uploaddoc" size="40">
+<input type="file" name="uploaddoc" size="40" />
<br />
<br />
-<nobr>
+<span class="LC_nobreak">
<label>$lt{'parse'}?
<input type="checkbox" name="parserflag" />
</label>
-</nobr>
+</span>
<br /><br />
$lt{'comment'}:<br />
<textarea cols=50 rows=4 name='comment'>
</textarea>
<br />
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
-<input type="hidden" name="cmd" value="upload_supplemental">
-<nobr>
-<input type="submit" value="$lt{'upld'}">
+<input type="hidden" name="folderpath" value="$path" />
+<input type="hidden" name="cmd" value="upload_supplemental" />
+<span class="LC_nobreak">
+<input type="submit" value="$lt{'upld'}" />
$help{'Uploading_From_Harddrive'}
-</nobr>
+</span>
</form>
</td>
-<td bgcolor="#DDDDDD">
+<td>
<form action="/adm/coursedocs" method="post" name="supnewfolder">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newfolder" type="button"
onClick="javascript:makenewfolder(this.form,'$folderseq');"
value="$lt{'newf'}" /> $help{'Adding_Folders'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="supnewext">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
<input name="newext" type="button"
onClick="javascript:makenewext('supnewext');"
value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail"
value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-<nobr>
+<span class="LC_nobreak">
<input name="newsyl" type="submit" value="$lt{'syll'}" />
$help{'Syllabus'}
-</nobr>
+</span>
</form>
<br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail"
value="$plainname=/adm/$udom/$uname/aboutme" />
-<nobr>
+<span class="LC_nobreak">
<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
$help{'My Personal Info'}
-</nobr>
+</span>
</form>
</td></tr>
</table></td></tr>
ENDSUPFORM
}
}
+ $r->print('</table>');
if ($allowed) {
- $r->print('<form method="POST" name="extimport" action="/adm/coursedocs"><input type="hidden" name="title" /><input type="hidden" name="url" /><input type="hidden" name="useform" /></form>');
+ $r->print('
+<form method="post" name="extimport" action="/adm/coursedocs">
+ <input type="hidden" name="title" />
+ <input type="hidden" name="url" />
+ <input type="hidden" name="useform" />
+ <input type="hidden" name="residx" />
+</form>');
}
- $r->print('</table>');
} else {
unless ($upload_result eq 'phasetwo') {
# -------------------------------------------------------- This is showdoc mode
$r->print("<h1>".&mt('Uploaded Document').' - '.
&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
-&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>".
- &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
+&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>".
+ &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
}
}
}
@@ -3039,6 +3126,17 @@ function makenewpage(targetform,folderse
function makenewext(targetname) {
this.document.forms.extimport.useform.value=targetname;
+ this.document.forms.extimport.title.value='';
+ this.document.forms.extimport.url.value='';
+ this.document.forms.extimport.residx.value='';
+ window.open('/adm/rat/extpickframe.html');
+}
+
+function edittext(targetname,residx,title,url) {
+ this.document.forms.extimport.useform.value=targetname;
+ this.document.forms.extimport.residx.value=residx;
+ this.document.forms.extimport.url.value=url;
+ this.document.forms.extimport.title.value=title;
window.open('/adm/rat/extpickframe.html');
}
@@ -3118,14 +3216,14 @@ function finishpick() {
var title=this.document.forms.extimport.title.value;
var url=this.document.forms.extimport.url.value;
var form=this.document.forms.extimport.useform.value;
- eval
- ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+
- '";this.document.forms.'+form+'.submit();');
+ var residx=this.document.forms.extimport.residx.value;
+ eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
}
function changename(folderpath,index,oldtitle,container,pagesymb) {
var title=prompt('New Title',oldtitle);
if (title) {
+ this.document.forms.renameform.markcopy.value=-1;
this.document.forms.renameform.title.value=title;
this.document.forms.renameform.cmd.value='rename_'+index;
if (container == 'sequence') {
@@ -3141,6 +3239,7 @@ function changename(folderpath,index,old
function removeres(folderpath,index,oldtitle,container,pagesymb) {
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;
if (container == 'sequence') {
this.document.forms.renameform.folderpath.value=folderpath;
@@ -3153,10 +3252,11 @@ 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+'"?')) {
this.document.forms.renameform.cmd.value='cut_'+index;
this.document.forms.renameform.markcopy.value=index;
+ this.document.forms.renameform.copyfolder.value=folder+'.'+container;
if (container == 'sequence') {
this.document.forms.renameform.folderpath.value=folderpath;
}
@@ -3168,8 +3268,9 @@ 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.copyfolder.value=folder+'.'+container;
if (container == 'sequence') {
this.document.forms.renameform.folderpath.value=folderpath;
}