');
+ var lenienttypes = ['Correct (checked)','Correct (unchecked)','Incorrect (checked)','Incorrect (unchecked)'];
+ for (var i=0; i
'+lenienttypes[i]+'
'+
+ '
');
+ }
+ choicewrite('
');
}
if (pscat=='discussvote') {
tablestart('Discussion Voting');
@@ -1022,7 +1141,7 @@ function draw() {
if (pscat=='ip') {
var currallow = new Array;
var currdeny = new Array;
- if ((svalue != '') && (svalue != null)) {
+ if ((svalue != '') && (typeof(svalue) != 'undefined')) {
var patternComma = /,/;
var patternAllow = /^([\[\]a-zA-Z\.\d\*\-]+)$/;
var patternDeny = /^\!([\[\]a-zA-Z\.\d\*\-]+)$/;
@@ -1104,18 +1223,22 @@ function draw() {
' type="radio" '+callradiostringeval('map_map'));
if (svalue=='map_map') { choicewrite(' checked="checked"'); }
choicewrite(' /> Yes, and the scope of the slot is the enclosing map/folder. When checking in, all resources in the map/folder are checked in. ');
- choicewrite('
');
- }
+ choicewrite('');
+ }
if (pscat=='deeplink') {
var deeplinkvals = new Array();
var linkprotectparts = new Array();
- var ltikeyRegExp = /^(ltic|ltid|key):(\w+)$/;
+ var ltikeyRegExp = /^(ltic:\d+|ltid:\d+|key:[a-zA-Z\d_.!@#$%^&*()+=-]+)$/;
+ var linkexitparts = new Array();
+ var dlinkexitRegExp = /^(yes|url|no)(|:[^:,;'"]+)$/;
var dlinkkeysty = 'hidden';
var dlinkkeyval = '';
var dlinklticdivsty = 'none';
var dlinkltiddivsty = 'none';
var dlinkmenusdivsty = 'none';
- if ((svalue != '') && (svalue != null)) {
+ var dlinkexitdivsty = 'none';
+ var dlinkexittextval = '';
+ if ((svalue != '') && (typeof(svalue) != 'undefined')) {
deeplinkvals = svalue.split(',');
if (ltikeyRegExp.test(deeplinkvals[4])) {
linkprotectparts = deeplinkvals[4].split(':');
@@ -1132,8 +1255,20 @@ function draw() {
if (deeplinkvals[5] >= 1) {
dlinkmenusdivsty = 'inline-block';
}
+ if (dlinkexitRegExp.test(deeplinkvals[7])) {
+ linkexitparts = deeplinkvals[7].split(':');
+ deeplinkvals[7] = linkexitparts[0];
+ if (deeplinkvals[7] != 'no') {
+ dlinkexitdivsty = 'inline-block';
+ if (!linkexitparts[1]) {
+ dlinkexittextval = 'Exit Tool';
+ } else {
+ dlinkexittextval = linkexitparts[1];
+ }
+ }
+ }
} else {
- deeplinkvals = ['off','unhide','full','res','','0'];
+ deeplinkvals = ['off','unhide','full','res','','0','_self','no'];
}
var deeplinkstate = new Array();
deeplinkstate = ['only','off','both'];
@@ -1157,6 +1292,7 @@ function draw() {
deeplinktarget = ['_self','_top'];
var deeplinktargettxt = new Array();
deeplinktargettxt = ['Embedded','Not embedded'];
+ var deeplinkexit = ['yes','url','no'];
tablestart('Deep-linked items');
choicewrite('