loncom/interface/londocs.pm - diff

Return to londocs.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.546 and 1.552

version 1.546, 2013/05/19 15:33:54	version 1.552, 2013/07/09 00:17:22
Line 488 sub docs_change_log {	Line 488 sub docs_change_log {
}	}
my $folderpath=$env{'form.folderpath'};	my $folderpath=$env{'form.folderpath'};
if ($folderpath eq '') {	if ($folderpath eq '') {
$folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Content').':::::');	$folderpath = 'default&'.&escape(&mt('Main Content').':::::');
}	}
$pathitem = '<input type="hidden" name="folderpath" value="'.	$pathitem = '<input type="hidden" name="folderpath" value="'.
&HTML::Entities::encode($folderpath,'<>&"').'" />';	&HTML::Entities::encode($folderpath,'<>&"').'" />';
Line 2704 sub editor {	Line 2704 sub editor {
}	}
$to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')	$to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
.'<div class="LC_info" id="contentlist">'	.'<div class="LC_info" id="contentlist">'
.&mt('Currently no documents.')	.&mt('Currently empty')
.'</div>'	.'</div>'
.&Apache::loncommon::end_scrollbox();	.&Apache::loncommon::end_scrollbox();
}	}
Line 2717 sub editor {	Line 2717 sub editor {
.'</div>';	.'</div>';
} else {	} else {
$to_show = '<div class="LC_info" id="contentlist">'	$to_show = '<div class="LC_info" id="contentlist">'
.&mt('Currently no documents.')	.&mt('Currently empty')
.'</div>'	.'</div>'
}	}
}	}
Line 2802 sub multiple_check_form {	Line 2802 sub multiple_check_form {
}	}

sub process_file_upload {	sub process_file_upload {
my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd) = @_;	my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd,$crstype) = @_;
# upload a file, if present	# upload a file, if present
	my $filesize = length($env{'form.uploaddoc'});
	if (!$filesize) {
	$$upload_output = '<div class="LC_error">'.
	&mt('Unable to upload [_1]. (size = [_2] bytes)',
	'<span class="LC_filename">'.$env{'form.uploaddoc.filename'}.'</span>',
	$filesize).'<br />'.
	&mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').'<br />'.
	'</div>';
	return;
	}
	my $quotatype = 'unofficial';
	if ($crstype eq 'Community') {
	$quotatype = 'community';
	} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.instcode'}) {
	$quotatype = 'official';
	}
	if (&Apache::loncommon::get_user_quota($coursenum,$coursedom,'course',$quotatype)) {
	$filesize = int($filesize/1000); #expressed in kb
	$$upload_output = &Apache::loncommon::excess_filesize_warning($coursenum,$coursedom,'course',
	$env{'form.uploaddoc.filename'},$filesize,'upload');
	return if ($$upload_output);
	}
my ($parseaction,$showupload,$nextphase,$mimetype);	my ($parseaction,$showupload,$nextphase,$mimetype);
if ($env{'form.parserflag'}) {	if ($env{'form.parserflag'}) {
$parseaction = 'parse';	$parseaction = 'parse';
Line 3123 ENDREM	Line 3145 ENDREM
push(@{$filtersref->{'canremove'}},$orderidx);	push(@{$filtersref->{'canremove'}},$orderidx);
}	}
}	}
unless ($isexternal) {	$renamelink=(<<ENDREN);
$renamelink=(<<ENDREN);
<a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a>	<a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a>
ENDREN	ENDREN
}
$line.=(<<END);	$line.=(<<END);
<td>	<td>
<div class="LC_docs_entry_move">	<div class="LC_docs_entry_move">
Line 3651 sub list_symbs {	Line 3671 sub list_symbs {
sub verifycontent {	sub verifycontent {
my ($r) = @_;	my ($r) = @_;
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
$r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));	$r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Content'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Content'));
$r->print(&startContentScreen('tools'));	$r->print(&startContentScreen('tools'));
$r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>');	$r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>');
$hashtied=0;	$hashtied=0;
Line 3754 sub checkversions {	Line 3774 sub checkversions {
&changewarning($r,'');	&changewarning($r,'');
if ($env{'form.timerange'} eq 'all') {	if ($env{'form.timerange'} eq 'all') {
# show all documents	# show all documents
$header=&mt('All Documents in '.$crstype);	$header=&mt('All content in '.$crstype);
$allsel=' selected="selected"';	$allsel=' selected="selected"';
foreach my $key (keys(%hash)) {	foreach my $key (keys(%hash)) {
if ($key=~/^ids\_(\/res\/.+)$/) {	if ($key=~/^ids\_(\/res\/.+)$/) {
Line 4032 sub startContentScreen {	Line 4052 sub startContentScreen {
$output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>      '.&mt('Content Index').'      </b></a></li>'."\n";	$output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>      '.&mt('Content Index').'      </b></a></li>'."\n";
$output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';	$output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';
} else {	} else {
$output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>      '.&mt('Content Editor').'      </b></a></li>'."\n";	$output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>      '.&mt('Main Content Editor').'      </b></a></li>'."\n";
$output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/coursedocs?forcesupplement=1"><b>'.&mt('Supplemental Content Editor').'</b></a></li>'."\n";	$output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/coursedocs?forcesupplement=1"><b>'.&mt('Supplemental Content Editor').'</b></a></li>'."\n";
$output .= '<li '.(($mode eq 'tools')?' class="active"':'').'><a href="/adm/coursedocs?tools=1"><b>      '.&mt('Content Utilities').'      </b></a></li>'."\n";	$output .= '<li '.(($mode eq 'tools')?' class="active"':'').'><a href="/adm/coursedocs?tools=1"><b>      '.&mt('Content Utilities').'      </b></a></li>'."\n";
'><a href="/adm/coursedocs?tools=1"><b>      '.&mt('Content Utilities').'      </b></a></li>';	'><a href="/adm/coursedocs?tools=1"><b>      '.&mt('Content Utilities').'      </b></a></li>';
Line 4053 sub endContentScreen {	Line 4073 sub endContentScreen {
}	}

sub supplemental_base {	sub supplemental_base {
return 'supplemental&'.&escape(&mt('Supplemental '.&Apache::loncommon::course_type().' Content'));	return 'supplemental&'.&escape(&mt('Supplemental Content'));
}	}

sub handler {	sub handler {
Line 4186 sub handler {	Line 4206 sub handler {
}	}
} elsif ($env{'form.command'} eq 'editdocs') {	} elsif ($env{'form.command'} eq 'editdocs') {
$env{'form.folderpath'} = 'default&'.	$env{'form.folderpath'} = 'default&'.
&escape(&mt('Main '.$crstype.' Content').':::::');	&escape(&mt('Main Content').':::::');
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}});	&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}});
} elsif ($env{'form.command'} eq 'editsupp') {	} elsif ($env{'form.command'} eq 'editsupp') {
$env{'form.folderpath'} = 'supplemental&'.	$env{'form.folderpath'} = 'supplemental&'.
Line 4231 sub handler {	Line 4251 sub handler {
if ($supplementalflag) {	if ($supplementalflag) {
$env{'form.folderpath'}=&supplemental_base();	$env{'form.folderpath'}=&supplemental_base();
} else {	} else {
$env{'form.folderpath'}='default'.&escape(&mt('Main '.$crstype.' Content').	$env{'form.folderpath'}='default&'.&escape(&mt('Main Content').
':::::');	':::::');
}	}
}	}
Line 4257 sub handler {	Line 4277 sub handler {
if ($env{'form.folder'} eq '' \|\|	if ($env{'form.folder'} eq '' \|\|
$env{'form.folder'} eq 'supplemental') {	$env{'form.folder'} eq 'supplemental') {
$folderpath='default&'.	$folderpath='default&'.
&escape(&mt('Main '.$crstype.' Content').':::::');	&escape(&mt('Main Content').':::::');
}	}
}	}
$containertag = '<input type="hidden" name="folderpath" value="" />';	$containertag = '<input type="hidden" name="folderpath" value="" />';
Line 4360 sub handler {	Line 4380 sub handler {
# Process file upload - phase one - upload and parse primary file.	# Process file upload - phase one - upload and parse primary file.
undef($hadchanges);	undef($hadchanges);
$uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,	$uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,
\%allfiles,\%codebase,$context);	\%allfiles,\%codebase,$context,$crstype);
if ($hadchanges) {	if ($hadchanges) {
&mark_hash_old();	&mark_hash_old();
}	}
Line 4582 HIDDENFORM	Line 4602 HIDDENFORM
if ($folder eq '' \|\| $supplementalflag) {	if ($folder eq '' \|\| $supplementalflag) {
$folder='default';	$folder='default';
$savefolderpath = $env{'form.folderpath'};	$savefolderpath = $env{'form.folderpath'};
$env{'form.folderpath'}='default&'.&escape(&mt('Content'));	$env{'form.folderpath'}='default&'.&escape(&mt('Main Content'));
$pathitem = '<input type="hidden" name="folderpath" value="'.	$pathitem = '<input type="hidden" name="folderpath" value="'.
&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';	&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
}	}
Line 5366 sub editing_js {	Line 5386 sub editing_js {
$main_container_page = 1;	$main_container_page = 1;
}	}
my $toplevelmain =	my $toplevelmain =
&escape(&mt('Main '.$crstype.' Content').':::::');	&escape(&mt('Main Content').':::::');
my $toplevelsupp = &supplemental_base();	my $toplevelsupp = &supplemental_base();

my $backtourl;	my $backtourl;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.546
changed lines
	Added in v.1.552