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.427 and 1.437

version 1.427, 2010/05/03 16:41:51	version 1.437, 2010/08/25 00:12:38
Line 1607 sub editor {	Line 1607 sub editor {
my $shown=0;	my $shown=0;
if (($ishidden) \|\| ($isencrypted) \|\| ($randompick>=0) \|\| ($is_random_order)) {	if (($ishidden) \|\| ($isencrypted) \|\| ($randompick>=0) \|\| ($is_random_order)) {
$r->print('<div class="LC_Box">'.	$r->print('<div class="LC_Box">'.
'<p>'.&mt('Parameters:').	'<ol class="LC_docs_parameters"><li class="LC_docs_parameters_title">'.&mt('Parameters:').'</li>'.
'<ul>'.
($randompick>=0?'<li>'.&mt('randomly pick [quant,_1,resource]',$randompick).'</li>':'').	($randompick>=0?'<li>'.&mt('randomly pick [quant,_1,resource]',$randompick).'</li>':'').
($ishidden?'<li>'.&mt('contents hidden').'</li>':'').	($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').	($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
($is_random_order?'<li>'.&mt('random order').'</li>':'').	($is_random_order?'<li>'.&mt('random order').'</li>':'').
'</ul></p>');	'</ol>');
if ($randompick>=0) {	if ($randompick>=0) {
$r->print('<p class="LC_warning">'	$r->print('<p class="LC_warning">'
.&mt('Caution: this folder is set to randomly pick a subset'	.&mt('Caution: this folder is set to randomly pick a subset'
Line 2482 ENDHEADERS	Line 2481 ENDHEADERS
# Set version	# Set version
$r->print(&Apache::loncommon::select_form($setversions{$linkurl},	$r->print(&Apache::loncommon::select_form($setversions{$linkurl},
'set_version_'.$linkurl,	'set_version_'.$linkurl,
('select_form_order' =>	{'select_form_order' =>
['',1..$currentversion,'mostrecent'],	['',1..$currentversion,'mostrecent'],
'' => '',	'' => '',
'mostrecent' => &mt('most recent'),	'mostrecent' => &mt('most recent'),
map {$_,$_} (1..$currentversion))));	map {$_,$_} (1..$currentversion)}));
$r->print('</span></td></tr><tr><td></td>');	$r->print('</span></td></tr><tr><td></td>');
my $lastold=1;	my $lastold=1;
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {	for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
Line 2719 sub handler {	Line 2718 sub handler {
$env{'form.pagename'}=&unescape(pop(@pagepath));	$env{'form.pagename'}=&unescape(pop(@pagepath));
$env{'form.folder'}=pop(@pagepath);	$env{'form.folder'}=pop(@pagepath);
$containertag = '<input type="hidden" name="pagepath" value="" />'.	$containertag = '<input type="hidden" name="pagepath" value="" />'.
'<input type="hidden" name="pagesymb" value="" />';	'<input type="hidden" name="pagesymb" value="" />';
$uploadtag = '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.	$uploadtag =
'<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />';	'<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
	'<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.
	'<input type="hidden" name="folderpath" value="" />';
	} else {
	my $folderpath=$env{'form.folderpath'};
	if (!$folderpath) {
	if ($env{'form.folder'} eq '' \|\|
	$env{'form.folder'} eq 'supplemental') {
	$folderpath='default&'.
	&escape(&mt('Main '.$crstype.' Documents'));
	}
	}
	$containertag = '<input type="hidden" name="folderpath" value="" />';
	$uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
}	}
if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {	if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
$showdoc='/'.$1;	$showdoc='/'.$1;
Line 2908 sub create_form_ul {	Line 2920 sub create_form_ul {
'upld' => 'Import Document',	'upld' => 'Import Document',
'srch' => 'Search',	'srch' => 'Search',
'impo' => 'Import',	'impo' => 'Import',
'book' => 'Import Bookmarks',	'wish' => 'Import from Wishlist',
'selm' => 'Select Map',	'selm' => 'Select Map',
'load' => 'Load Map',	'load' => 'Load Map',
'reco' => 'Recover Deleted Documents',	'reco' => 'Recover Deleted Documents',
Line 2981 SEDFFORM	Line 2993 SEDFFORM
my @simpleeditdefaultforma = (	my @simpleeditdefaultforma = (
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'" onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'" onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/vbkm.png" alt="'.$lt{book}.'" onclick="javascript:groupopen(0,1,1);" />' => "<a class='LC_menubuttons_link' href='javascript:groupopen(0,1,1);'>$lt{'book'}</a>" },	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{wish}.'" onclick="javascript:open_Wishlist_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_Wishlist_Import();'>$lt{'wish'}</a>" },
);	);
$simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));	$simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));
$simpleeditdefaultform .=(<<SEDFFORM);	$simpleeditdefaultform .=(<<SEDFFORM);
Line 3014 ERFORM	Line 3026 ERFORM
'sl' => 'Show Log'	'sl' => 'Show Log'
);	);

my $folderpath=$env{'form.folderpath'};
if (!$folderpath) {
if ($env{'form.folder'} eq '' \|\|
$env{'form.folder'} eq 'supplemental') {
$folderpath='default&'.
&escape(&mt('Main '.$crstype.' Documents'));
}
}
unless ($env{'form.pagepath'}) {
$containertag = '<input type="hidden" name="folderpath" value="" />';
$uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
}
$r->print(<<HIDDENFORM);	$r->print(<<HIDDENFORM);
<form name="renameform" method="post" action="/adm/coursedocs">	<form name="renameform" method="post" action="/adm/coursedocs">
<input type="hidden" name="title" />	<input type="hidden" name="title" />
Line 3062 HIDDENFORM	Line 3062 HIDDENFORM
$activeClass = 0;	$activeClass = 0;
}	}
}	}
$r->print('<li '.$active.' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.$tabtitles{'main'}{$crstype}.'</b></a></li>');	$r->print('<li '.$active
	. ' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.$tabtitles{'main'}{$crstype}.'</b></a></li>');
$active = '';	$active = '';
if (!$forcestandard \|\| ($env{'form.folderpath'}=~/^supplemental/)) {	if (!$forcestandard \|\| ($env{'form.folderpath'}=~/^supplemental/)) {
if($activeClass == 1){	if($activeClass == 1){
$active = 'class="active"';	$active = 'class="active"';
}	}
}	}
$r->print('<li '.$active.' onclick="javascript:showPage(this,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.$tabtitles{'supplemental'}{$crstype}.'</b></a></li>');	$r->print('<li '.$active
	.' onclick="javascript:showPage(this,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.$tabtitles{'supplemental'}{$crstype}.'</b></a></li>');
$r->print('</ul>');	$r->print('</ul>');
} else {	} else {
$r->print('<br />');	$r->print('<br />');
Line 3117 HIDDENFORM	Line 3119 HIDDENFORM

my $recoverform=(<<RFORM);	my $recoverform=(<<RFORM);
<form action="/adm/groupsort" method="post" name="recover">	<form action="/adm/groupsort" method="post" name="recover">
<a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1,0)">$lt{'reco'}</a>	<a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1)">$lt{'reco'}</a>
</form>	</form>
RFORM	RFORM

Line 3274 NGFFORM	Line 3276 NGFFORM
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'" onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'" onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},
);	);

}	my @importdoc = (
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},);
	$fileuploadform = create_form_ul(create_list_elements(@importdoc)) . '<hr/>' . $fileuploadform;

push @specialdocumentsforma, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},	push @specialdocumentsforma, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
Line 3288 NGFFORM	Line 3294 NGFFORM
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},);	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},);

$specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));	$specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));
	}

if($env{'form.pagepath'}) {	if($env{'form.pagepath'}) {

Line 3301 if($env{'form.pagepath'}) {	Line 3308 if($env{'form.pagepath'}) {
my @tools = (	my @tools = (
# {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},	# {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},
# {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},	# {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1,0)" />'=>$recoverform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1)" />'=>$recoverform},
);	);

my @importdoc = (
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},
);
$fileuploadform = create_form_ul(create_list_elements(@importdoc)) . '<hr/>' . $fileuploadform;
my %orderhash = (	my %orderhash = (
'00' => ['Newfolder',$newfolderform],
'aa' => ['Import Documents',$fileuploadform],	'aa' => ['Import Documents',$fileuploadform],
'bb' => ['Published Resources',$simpleeditdefaultform],	'bb' => ['Published Resources',$simpleeditdefaultform],
'cc' => ['Special Documents',$specialdocumentsform],	'cc' => ['Special Documents',$specialdocumentsform],
'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options($containertag,$uploadtag,\%help,\%env)],	'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options(\%help,\%env)],
);	);
	unless($env{'form.pagepath'}) {
	$orderhash{'00'} = ['Newfolder',$newfolderform];
	}

my $tid='1';	my $tid='1';
$hadchanges=0;	$hadchanges=0;
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);	my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
Line 3331 $r->print(&generate_edit_table($tid,\%or	Line 3336 $r->print(&generate_edit_table($tid,\%or

$r->print('</div>');	$r->print('</div>');
}	}
if ($env{'form.pagepath'}) {
}
# ----------------------------------------------------- Supplemental documents	# ----------------------------------------------------- Supplemental documents
$active = 'style="display: none;"';	$active = 'style="display: none;"';
if($activeClass == 1){	if($activeClass == 1){
Line 3479 $r->print('</div></div>');	Line 3482 $r->print('</div></div>');
}	}

sub generate_admin_options {	sub generate_admin_options {
my ($containertag,$uploadtag,$help_ref,$env_ref) = @_;	my ($help_ref,$env_ref) = @_;
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'vc' => 'Verify Content',	'vc' => 'Verify Content',
'cv' => 'Check/Set Resource Versions',	'cv' => 'Check/Set Resource Versions',
'ls' => 'List Symbs',	'ls' => 'List Symbs',
Line 3501 sub generate_admin_options {	Line 3504 sub generate_admin_options {
if($dumpbut ne ''){	if($dumpbut ne ''){
push @list, {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dump.png" alt="'.$lt{dcd}.'" />'=>$dumpbut};	push @list, {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dump.png" alt="'.$lt{dcd}.'" />'=>$dumpbut};
}	}
push @list, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/imsexport.png" alt="'.$lt{imse}.'" class="LC_menubuttons_link" href=\'javascript:injectData(document.courseverify, "dummy", "exportcourse", "'.&mt('IMS Export').'")\' />'	push @list, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/imsexport.png" alt="'.$lt{imse}.'" onclick="javascript:injectData(document.courseverify, \'dummy\', \'exportcourse\', \''.&mt('IMS Export').'\');" />'
=>$exportbut},	=>$exportbut},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/symbs.png" alt="'.$lt{ls}.'" onclick=\'javascript:injectData(document.courseverify, "dummy", "listsymbs", "'.$lt{'ls'}.'")\' />'	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/symbs.png" alt="'.$lt{ls}.'" onclick=\'javascript:injectData(document.courseverify, "dummy", "listsymbs", "'.$lt{'ls'}.'")\' />'
=>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"listsymbs\", \"$lt{'ls'}\")'>$lt{'ls'}</a><input type='hidden' name='folder' value='$env{'form.folder'}' />"},	=>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"listsymbs\", \"$lt{'ls'}\")'>$lt{'ls'}</a><input type='hidden' name='folder' value='$env{'form.folder'}' />"},
Line 3532 sub generate_edit_table {	Line 3535 sub generate_edit_table {
}elsif($activetab eq $name){	}elsif($activetab eq $name){
$active = 'class="active"';	$active = 'class="active"';
}	}
$form .= '<li '.$active.' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"><a href="javascript:;"><b>'.&mt(${$orderhash{$name}}[0]).'</b></a></li>';	$form .= '<li '.$active
	.' onmouseover="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"'
	.' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"><a href="javascript:;"><b>'.&mt(${$orderhash{$name}}[0]).'</b></a></li>';
} else {	} else {
$form .= '<li '.$active.'>'.${$orderhash{$name}}[1].'</li>';	$form .= '<li '.$active.'>'.${$orderhash{$name}}[1].'</li>';

Line 3584 sub editing_js {	Line 3589 sub editing_js {
p_ctr2b => '?[_98]'	p_ctr2b => '?[_98]'
);	);

	my $crstype = &Apache::loncommon::course_type();
	my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');
	my $docs_pagepath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.pagepath'},'<>&"');
	my $main_container_page;
	if ($docs_folderpath eq '') {
	if ($docs_pagepath ne '') {
	$main_container_page = 1;
	}
	}
	my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents';
	my $toplevelsupp = 'supplemental&Supplemental%20'.$crstype.'%20Documents';

return <<ENDNEWSCRIPT;	return <<ENDNEWSCRIPT;
function makenewfolder(targetform,folderseq) {	function makenewfolder(targetform,folderseq) {
var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');	var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
Line 3812 function showPage(current, pageId, nav,	Line 3829 function showPage(current, pageId, nav,
current.className = 'active';	current.className = 'active';
currentData = document.getElementById(pageId);	currentData = document.getElementById(pageId);
currentData.style.display = 'block';	currentData.style.display = 'block';
	if (nav == 'mainnav') {
	var storedpath = "$docs_folderpath";
	if (storedpath == '') {
	storedpath = "$docs_pagepath";
	}
	var storedpage = "$main_container_page";
	var reg = new RegExp("^supplemental");
	if (pageId == 'mainCourseDocuments') {
	if (storedpage == 1) {
	document.simpleedit.folderpath.value = '';
	document.uploaddocument.folderpath.value = '';
	} else {
	if (reg.test(storedpath)) {
	document.simpleedit.folderpath.value = '$toplevelmain';
	document.uploaddocument.folderpath.value = '$toplevelmain';
	document.newext.folderpath.value = '$toplevelmain';
	} else {
	document.simpleedit.folderpath.value = storedpath;
	document.uploaddocument.folderpath.value = storedpath;
	document.newext.folderpath.value = storedpath;
	}
	}
	} else {
	if (reg.test(storedpath)) {
	document.simpleedit.folderpath.value = storedpath;
	document.supuploaddocument.folderpath.value = storedpath;
	document.supnewext.folderpath.value = storedpath;
	} else {
	document.simpleedit.folderpath.value = '$toplevelsupp';
	document.supuploaddocument.folderpath.value = '$toplevelsupp';
	document.supnewext.folderpath.value = '$toplevelsupp';
	}
	}
	}
return false;	return false;
}	}

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

Removed from v.1.427
changed lines
	Added in v.1.437