'; + . $title . ''; $menu .= '
$link
-ENDREMOTEFORM -} - -sub get_menu_name { - my $hostid = $Apache::lonnet::perlvar{'lonHostID'}; - $hostid =~ s/\W//g; - return 'LCmenu'.$hostid; -} - - -sub reopenmenu { - unless ($env{'environment.remote'} eq 'on') { return ''; } - my $menuname = &get_menu_name(); - my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); - return('window.open('.$nothing.',"'.$menuname.'","",false);'); -} - - -sub open { - my $returnval=''; - unless ($env{'environment.remote'} eq 'on') { - return - ''; - } - my $menuname = &get_menu_name(); - -# unless (shift eq 'unix') { -# resizing does not work on linux because of virtual desktop sizes -# $returnval.=(<'; - if ($type eq 'map') { - $lt{'miss'} .= &mt('Submissions are missing for [quant,_1,question part,question parts] in this folder.',$missing); - } else { - $lt{'miss'} .= &mt('Submissions are missing for [quant,_1,part] in this question.',$missing); - } - if ($missing > 1) { - $lt{'miss'} .= ' '.&mt('If you confirm you are done you will be unable to submit answers for them.').''; - } else { - $lt{'miss'} .= ' '.&mt('If you confirm you are done you will be unable to submit an answer for it.').'
'; - } - } - $donebuttontext = &HTML::Entities::encode($donebuttontext,'<>&"'); - if ($proctor) { - if ($height !~ /^\d+$/) { - $height = 400; - if ($missing) { - $height += 60; - } - } - if ($width !~ /^\d+$/) { - $width = 400; - if ($missing) { - $width += 60; - } - } - return <$lt{'preamble'} $lt{$type}
- $lt{'miss'}$lt{'proctor'}
- @@ -2453,8 +1636,8 @@ sub done_button_js { click: function() { var proctorkey = \$( '[name="LC_interval_done_proctorkey"]' )[0].value; if ((proctorkey == '') || (proctorkey == null)) { - alert("$lt{'nokey'}"); - } else { + alert("$lt{'nokey'}"); + } else { \$( '[name="LC_interval_done"]' )[0].value = 'true'; \$( '[name="LC_interval_done_proctorpass"]' )[0].value = proctorkey; \$( '[name="LCdoneButton"]' )[0].submit(); @@ -2484,32 +1667,22 @@ sub done_button_js { END - } else { - if ($height !~ /^\d+$/) { - $height = 320; - if ($missing) { - $height += 60; + } else { + if ($height !~ /^\d+$/) { + $height = 320; } - } - if ($width !~ /^\d+$/) { - $width = 320; - if ($missing) { - $width += 60; + if ($width !~ /^\d+$/) { + $width = 320; } - } - if ($missing) { - $lt{'miss'} = ''.$lt{'miss'}.'';
- }
- return < $lt{'preamble'} $lt{$type} $lt{'miss'} $lt{'okdone'} $lt{'cancel'} $lt{'preamble'} $lt{$type} $lt{'okdone'} $lt{'cancel'}
-
END
+ }
+ } else {
+ return;
}
}
sub utilityfunctions {
my ($httphost) = @_;
my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
- my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
- if ($currenturl =~ m{^/adm/wrapper/ext/}) {
- if ($env{'request.external.querystring'}) {
+ if ($currenturl =~ m{^/adm/wrapper/ext/}
+ && $env{'request.external.querystring'} ) {
$currenturl .= ($currenturl=~/\?/)?'&':'?'.$env{'request.external.querystring'};
- }
- my ($anchor) = ($env{'request.symb'} =~ /(\#[^\#]+)$/);
- if (($anchor) && ($currenturl !~ /\Q$anchor\E$/)) {
- $currenturl .= $1;
- }
}
$currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
+ my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
+
my $dc_popup_cid;
if ($env{'user.adv'} && exists($env{'user.role.dc./'.
$env{'course.'.$env{'request.course.id'}.
@@ -2587,15 +1759,6 @@ sub utilityfunctions {
my $countdown = &countdown_toggle_js();
- my $deeplinktarget;
- if ($env{'request.deeplink.login'}) {
- $deeplinktarget = $env{'request.deeplink.target'};
- }
-
- my $annotateurl = '/adm/annotation';
- if ($httphost) {
- $annotateurl = '/adm/annotations';
- }
my $hostvar = '
function setLCHost() {
var lcHostname="";
@@ -2610,7 +1773,7 @@ function setLCHost() {
' }'."\n".
' }'."\n";
}
-
+
$hostvar .= ' return lcHostname;'."\n".
'}'."\n";
@@ -2692,22 +1855,17 @@ function golist(url) {
currentURL = null;
currentSymb= null;
var lcHostname = setLCHost();
- var deeplinktarget = '$deeplinktarget';
- if (deeplinktarget == '_self') {
- document.location.href=lcHostname+url;
- } else {
- top.location.href=lcHostname+url;
- }
+ top.location.href=lcHostname+url;
}
}
-function catalog_info(url,isMobile) {
+function catalog_info(isMobile) {
if (isMobile == 1) {
- openMyModal(url+'.meta?modal=1',500,400,'yes');
+ openMyModal(window.location.pathname+'.meta?modal=1',500,400,'yes');
} else {
- loncatinfo=window.open(url+'.meta',"LONcatInfo",'height=500,width=400,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+ loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=500,width=400,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
}
}
@@ -2729,7 +1887,7 @@ function annotate() {
annotator.document.write(
'$start_page_annotate'
+"