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.484.2.20 and 1.521

version 1.484.2.20, 2013/01/04 00:17:48	version 1.521, 2012/12/05 13:50:32
Line 651 sub print_paste_buffer {	Line 651 sub print_paste_buffer {
$is_external = 1;	$is_external = 1;
}	}

my ($canpaste,$nopaste,$othercrs,$areachange);	my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map);
if ($folder =~ /^supplemental/) {	if ($folder =~ /^supplemental/) {
$canpaste = &supp_pasteable($env{'docs.markedcopy_url'});	$canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
unless ($canpaste) {	unless ($canpaste) {
Line 1543 sub apply_fixups {	Line 1543 sub apply_fixups {
if ($folder !~ /^supplemental/) {	if ($folder !~ /^supplemental/) {
$report = 1;	$report = 1;
}	}
(my $outtext,$errtext) =	my ($outtext,$errtext) =
&LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report);	&LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report);
if ($errtext) {	if ($errtext) {
return &mt('Paste failed: an error occurred saving the folder or page.');	return &mt('Paste failed: an error occurred saving the folder or page.');
Line 2443 $form_common.'	Line 2443 $form_common.'
$forceedit,	$forceedit,
undef,$symb,	undef,$symb,
&escape($env{'form.folderpath'}),	&escape($env{'form.folderpath'}),
$renametitle,'','',1);	$renametitle);
if ($jscall) {	if ($jscall) {
$editlink = '<a class="LC_docs_ext_edit" href="javascript:'.	$editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
$jscall.'" >'.&mt('Edit').'</a> '."\n";	$jscall.'" >'.&mt('Edit').'</a> '."\n";
Line 3068 sub startContentScreen {	Line 3068 sub startContentScreen {
if (($mode eq 'navmaps') \|\| ($mode eq 'supplemental')) {	if (($mode eq 'navmaps') \|\| ($mode eq 'supplemental')) {
$output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>    '.&mt('Content Overview').'    </b></a></li>'."\n";	$output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>    '.&mt('Content Overview').'    </b></a></li>'."\n";
$output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>     '.&mt('Content Search').'     </b></a></li>'."\n";	$output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>     '.&mt('Content Search').'     </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('Content Editor').'      </b></a></li>'."\n";
Line 3213 sub handler {	Line 3214 sub handler {
if ($env{'form.command'} eq 'direct') {	if ($env{'form.command'} eq 'direct') {
my ($mapurl,$id,$resurl);	my ($mapurl,$id,$resurl);
if ($env{'form.symb'} ne '') {	if ($env{'form.symb'} ne '') {
$env{'form.folderpath'}=	($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
&Apache::loncommon::symb_to_docspath($env{'form.symb'});	if ($resurl=~/\.(sequence\|page)$/) {
	$mapurl=$resurl;
	} elsif ($resurl eq 'adm/navmaps') {
	$mapurl=$env{'course.'.$env{'request.course.id'}.'.url'};
	}
	my $mapresobj;
	my $navmap = Apache::lonnavmaps::navmap->new();
	if (ref($navmap)) {
	$mapresobj = $navmap->getResourceByUrl($mapurl);
	}
	$mapurl=~s{^.*/([^/]+)\.(\w+)$}{$1};
	my $type=$2;
	my $path;
	if (ref($mapresobj)) {
	my $pcslist = $mapresobj->map_hierarchy();
	if ($pcslist ne '') {
	foreach my $pc (split(/,/,$pcslist)) {
	next if ($pc <= 1);
	my $res = $navmap->getByMapPc($pc);
	if (ref($res)) {
	my $thisurl = $res->src();
	$thisurl=~s{^.*/([^/]+)\.\w+$}{$1};
	my $thistitle = $res->title();
	$path .= '&'.
	&Apache::lonhtmlcommon::entity_encode($thisurl).'&'.
	&Apache::lonhtmlcommon::entity_encode($thistitle).
	':'.$res->randompick().
	':'.$res->randomout().
	':'.$res->encrypted().
	':'.$res->randomorder().
	':'.$res->is_page();
	}
	}
	}
	$path =~ s/^\&//;
	my $maptitle = $mapresobj->title();
	if ($mapurl eq 'default') {
	$maptitle = 'Main Course Documents';
	}
	$path .= (($path ne '')? '&' : '').
	&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
	&Apache::lonhtmlcommon::entity_encode($maptitle).
	':'.$mapresobj->randompick().
	':'.$mapresobj->randomout().
	':'.$mapresobj->encrypted().
	':'.$mapresobj->randomorder().
	':'.$mapresobj->is_page();
	} else {
	my $maptitle = &Apache::lonnet::gettitle($mapurl);
	my $ispage = (($type eq 'page')? 1 : '');
	if ($mapurl eq 'default') {
	$maptitle = 'Main Course Documents';
	}
	$path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
	&Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage;
	}
	unless ($mapurl eq 'default') {
	$path = 'default&'.
	&Apache::lonhtmlcommon::entity_encode('Main Course Documents').
	':::::&'.$path;
	}
	$env{'form.folderpath'}=$path;
} elsif ($env{'form.supppath'} ne '') {	} elsif ($env{'form.supppath'} ne '') {
$env{'form.folderpath'}=$env{'form.supppath'};	$env{'form.folderpath'}=$env{'form.supppath'};
}	}
Line 3237 sub handler {	Line 3299 sub handler {
if ((!$env{'form.folderpath'}) && $allowed) {	if ((!$env{'form.folderpath'}) && $allowed) {
&Apache::loncommon::restore_course_settings($stored_folderpath,	&Apache::loncommon::restore_course_settings($stored_folderpath,
{'folderpath' => 'scalar'});	{'folderpath' => 'scalar'});
unless (&unescape($env{'form.folderpath'}) =~ m{^(default\|supplemental)&}) {
undef($env{'form.folderpath'});
}
}	}

# If we are not allowed to make changes, all we can see are supplemental docs	# If we are not allowed to make changes, all we can see are supplemental docs
Line 4219 sub generate_edit_table {	Line 4278 sub generate_edit_table {
my $form;	my $form;
my $activetab;	my $activetab;
my $active;	my $active;
if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) {	if($env{'form.active'} ne ''){
$activetab = $env{'form.active'};	$activetab = $env{'form.active'};
}	}
my $backicon = $iconpath.'clickhere.gif';	my $backicon = $iconpath.'clickhere.gif';

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

Removed from v.1.484.2.20
changed lines
	Added in v.1.521