[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface londocs.pm
raeburn
raeburn at source.lon-capa.org
Thu Aug 4 13:20:45 EDT 2016
raeburn Thu Aug 4 17:20:45 2016 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface londocs.pm
Log:
- For 2.11
Backport 1.594
-------------- next part --------------
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.60 loncom/interface/londocs.pm:1.484.2.61
--- loncom/interface/londocs.pm:1.484.2.60 Tue Mar 24 10:05:45 2015
+++ loncom/interface/londocs.pm Thu Aug 4 17:20:44 2016
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.484.2.60 2015/03/24 10:05:45 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.61 2016/08/04 17:20:44 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1353,29 +1353,34 @@
}
sub paste_popup_js {
- my %lt = &Apache::lonlocal::texthash(
+ my %html_js_lt = &Apache::lonlocal::texthash(
show => 'Show Options',
hide => 'Hide Options',
+ );
+ my %js_lt = &Apache::lonlocal::texthash(
none => 'No items selected from clipboard.',
);
+ &html_escape(\%html_js_lt);
+ &js_escape(\%html_js_lt);
+ &js_escape(\%js_lt);
return <<"END";
function showPasteOptions(suffix) {
document.getElementById('pasteoptions_'+suffix).style.display='block';
- document.getElementById('pasteoptionstext_'+suffix).innerHTML = ' <a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$lt{'hide'}</a>';
+ document.getElementById('pasteoptionstext_'+suffix).innerHTML = ' <a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$html_js_lt{'hide'}</a>';
return;
}
function hidePasteOptions(suffix) {
document.getElementById('pasteoptions_'+suffix).style.display='none';
- document.getElementById('pasteoptionstext_'+suffix).innerHTML =' <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$lt{'show'}</a>';
+ document.getElementById('pasteoptionstext_'+suffix).innerHTML =' <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
return;
}
function showOptions(caller,suffix) {
if (document.getElementById('pasteoptionstext_'+suffix)) {
if (caller.checked) {
- document.getElementById('pasteoptionstext_'+suffix).innerHTML =' <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$lt{'show'}</a>';
+ document.getElementById('pasteoptionstext_'+suffix).innerHTML =' <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
} else {
document.getElementById('pasteoptionstext_'+suffix).innerHTML ='';
}
@@ -1404,7 +1409,7 @@
if (numchk > 0) {
return true;
} else {
- alert("$lt{'none'}");
+ alert("$js_lt{'none'}");
return false;
}
}
@@ -5794,7 +5799,7 @@
sub editing_js {
my ($udom,$uname,$supplementalflag) = @_;
- my %lt = &Apache::lonlocal::texthash(
+ my %js_lt = &Apache::lonlocal::texthash(
p_mnf => 'Name of New Folder',
t_mnf => 'New Folder',
p_mnp => 'Name of New Page',
@@ -5833,6 +5838,7 @@
noac => 'No actions selected.',
);
+ &js_escape(\%js_lt);
my $crstype = &Apache::loncommon::course_type();
my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');
my $main_container_page;
@@ -5877,7 +5883,7 @@
return <<ENDNEWSCRIPT;
function makenewfolder(targetform,folderseq) {
- var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
+ var foldername=prompt('$js_lt{{"p_mnf"}','$js_lt{{"t_mnf"}');
if (foldername) {
targetform.importdetail.value=escape(foldername)+"="+folderseq;
targetform.submit();
@@ -5885,7 +5891,7 @@
}
function makenewpage(targetform,folderseq) {
- var pagename=prompt('$lt{"p_mnp"}','$lt{"t_mnp"}');
+ var pagename=prompt('$js_lt{"p_mnp"}','$js_lt{"t_mnp"}');
if (pagename) {
targetform.importdetail.value=escape(pagename)+"="+folderseq;
targetform.submit();
@@ -5893,7 +5899,7 @@
}
function makeexamupload() {
- var title=prompt('$lt{"p_mxu"}');
+ var title=prompt('$js_lt{"p_mxu"}');
if (title) {
this.document.forms.newexamupload.importdetail.value=
escape(title)+'=/res/lib/templates/examupload.problem';
@@ -5902,7 +5908,7 @@
}
function makesmppage() {
- var title=prompt('$lt{"p_msp"}');
+ var title=prompt('$js_lt{"p_msp"}');
if (title) {
this.document.forms.newsmppg.importdetail.value=
escape(title)+'=/adm/$udom/$uname/new/smppg';
@@ -5911,7 +5917,7 @@
}
function makewebpage(type) {
- var title=prompt('$lt{"p_mwp"}');
+ var title=prompt('$js_lt{"p_mwp"}');
var formname;
if (type == 'supp') {
formname = this.document.forms.supwebpage;
@@ -5926,7 +5932,7 @@
}
function makesmpproblem() {
- var title=prompt('$lt{"p_msb"}');
+ var title=prompt('$js_lt{"p_msb"}');
if (title) {
this.document.forms.newsmpproblem.importdetail.value=
escape(title)+'=/res/lib/templates/simpleproblem.problem';
@@ -5935,7 +5941,7 @@
}
function makedropbox() {
- var title=prompt('$lt{"p_mdb"}');
+ var title=prompt('$js_lt{"p_mdb"}');
if (title) {
this.document.forms.newdropbox.importdetail.value=
escape(title)+'=/res/lib/templates/DropBox.problem';
@@ -5944,7 +5950,7 @@
}
function makebulboard() {
- var title=prompt('$lt{"p_mbb"}');
+ var title=prompt('$js_lt{"p_mbb"}');
if (title) {
this.document.forms.newbul.importdetail.value=
escape(title)+'=/adm/$udom/$uname/new/bulletinboard';
@@ -5953,20 +5959,20 @@
}
function makeabout() {
- var user=prompt("$lt{'p_mab'}");
+ var user=prompt("$js_lt{'p_mab'}");
if (user) {
var comp=new Array();
comp=user.split(':');
if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
if ((comp[0]) && (comp[1])) {
this.document.forms.newaboutsomeone.importdetail.value=
- '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
+ '$js_lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
this.document.forms.newaboutsomeone.submit();
} else {
- alert("$lt{'p_mab_alrt1'}");
+ alert("$js_lt{'p_mab_alrt1'}");
}
} else {
- alert("$lt{'p_mab_alrt2'}");
+ alert("$js_lt{'p_mab_alrt2'}");
}
}
}
@@ -6004,11 +6010,11 @@
function makeims(imsform) {
if ((imsform.uploaddoc.value == '') || (!imsform.uploaddoc.value)) {
- alert("$lt{'imsfile'}");
+ alert("$js_lt{'imsfile'}");
return;
}
if (imsform.source.selectedIndex == 0) {
- alert("$lt{'imscms'}");
+ alert("$js_lt{'imscms'}");
return;
}
newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes");
@@ -6016,7 +6022,7 @@
}
function changename(folderpath,index,oldtitle) {
-var title=prompt('$lt{"p_chn"}',oldtitle);
+var title=prompt('$js_lt{"p_chn"}',oldtitle);
if (title) {
this.document.forms.renameform.markcopy.value='';
this.document.forms.renameform.title.value=title;
@@ -6040,7 +6046,7 @@
picknumtext = document.getElementById('randompicknum_'+index);
}
if (pickitem.checked) {
- var picknum=prompt('$lt{"rpck"}',picknumitem.value);
+ var picknum=prompt('$js_lt{"rpck"}',picknumitem.value);
if (picknum == '' || picknum == null) {
if (caller == 'check') {
pickitem.checked=false;
@@ -6228,14 +6234,14 @@
targetform.markcopy.value=idx+':'+param;
targetform.copyfolder.value=folder+'.'+container;
if (param == 'remove') {
- if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
+ if (skip_confirm || confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'" $js_lt{"p_rmr2b"}')) {
targetform.markcopy.value='';
targetform.copyfolder.value='';
targetform.submit();
}
}
if (param == 'cut') {
- if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
+ if (skip_confirm || confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr2a"} "'+oldtitle+'" $js_lt{"p_ctr2b"}')) {
targetform.submit();
return;
}
@@ -6414,7 +6420,7 @@
}
document.getElementById('multi'+caller).style.display=disp;
if (value == 1) {
- document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$lt{'more'}</a>';
+ document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>';
} else {
document.getElementById('more'+caller).innerHTML = '';
}
@@ -6440,10 +6446,10 @@
function toggleCheckUncheck(caller,more) {
if (more == 1) {
- document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$lt{'less'}</a>';
+ document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$js_lt{'less'}</a>';
document.getElementById('allfields'+caller).style.display='block';
} else {
- document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$lt{'more'}</a>';
+ document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>';
document.getElementById('allfields'+caller).style.display='none';
}
resize_scrollbox('contentscroll','1','1');
@@ -6599,12 +6605,12 @@
if (numchanges > 0) {
if ((cutwarnings > 0) || (remwarnings > 0)) {
if (remwarnings > 0) {
- if (!confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr3a"} '+remwarnings+' $lt{"p_rmr3b"}')) {
+ if (!confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr3a"} '+remwarnings+' $js_lt{"p_rmr3b"}')) {
return false;
}
}
if (cutwarnings > 0) {
- if (!confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr3a"} '+cutwarnings+' $lt{"p_ctr3b"}')) {
+ if (!confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr3a"} '+cutwarnings+' $js_lt{"p_ctr3b"}')) {
return false;
}
}
@@ -6620,12 +6626,12 @@
}
}
if ((dosettings == 1) && (doactions == 1)) {
- alert("$lt{'noor'}");
+ alert("$js_lt{'noor'}");
} else {
if (dosettings == 1) {
- alert("$lt{'noch'}");
+ alert("$js_lt{'noch'}");
} else {
- alert("$lt{'noac'}");
+ alert("$js_lt{'noac'}");
}
}
return false;
@@ -6740,13 +6746,19 @@
sub dump_switchserver_js {
my @hosts = @_;
- my %lt = &Apache::lonlocal::texthash(
+ my %js_lt = &Apache::lonlocal::texthash(
dump => 'Copying content to Authoring Space requires switching server.',
swit => 'Switch server?',
+ );
+ my %html_js_lt = &Apache::lonlocal::texthash(
+ swit => 'Switch server?',
duco => 'Copying Content to Authoring Space',
yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.',
chos => 'Choose server',
);
+ &js_escape(\%js_lt);
+ &html_escape(\%html_js_lt);
+ &js_escape(\%html_js_lt);
my $role = $env{'request.role'};
my $js = <<"ENDSWJS";
<script type="text/javascript">
@@ -6787,7 +6799,7 @@
function dump_needs_switchserver(url) {
if (url!='' && url!= null) {
- if (confirm("$lt{'dump'}\\n$lt{'swit'}")) {
+ if (confirm("$js_lt{'dump'}\\n$js_lt{'swit'}")) {
go(url);
}
}
@@ -6798,13 +6810,13 @@
newWindow = window.open('','ChooseServer','height=400,width=500,scrollbars=yes')
newWindow.document.open();
newWindow.document.writeln('$startpage');
- newWindow.document.write('<h3>$lt{'duco'}<\\/h3>\\n'+
- '<p>$lt{'yone'}<\\/p>\\n'+
- '<div class="LC_left_float"><fieldset><legend>$lt{'chos'}<\\/legend>\\n'+
+ newWindow.document.write('<h3>$html_js_lt{'duco'}<\\/h3>\\n'+
+ '<p>$html_js_lt{'yone'}<\\/p>\\n'+
+ '<div class="LC_left_float"><fieldset><legend>$html_js_lt{'chos'}<\\/legend>\\n'+
'<form name="setserver" method="post" action="" \\/>\\n'+
'$hostpicker\\n'+
'<br \\/><br \\/>\\n'+
- '<input type="button" name="makeswitch" value="$lt{'swit'}" '+
+ '<input type="button" name="makeswitch" value="$html_js_lt{'swit'}" '+
'onclick="write_switchserver();" \\/>\\n'+
'<\\/form><\\/fieldset><\\/div><br clear="all" \\/>\\n');
newWindow.document.writeln('$endpage');
More information about the LON-CAPA-cvs
mailing list