version 1.431.2.2, 2015/04/14 21:35:52
|
version 1.438, 2016/01/26 14:30:25
|
Line 288 sub primary_menu {
|
Line 288 sub primary_menu {
|
push(@primsub,$item); |
push(@primsub,$item); |
} |
} |
if (@primsub > 0) { |
if (@primsub > 0) { |
|
if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) { |
|
$title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); |
|
} else { |
|
$title = &mt($title); |
|
} |
$menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1); |
$menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1); |
} elsif ($link) { |
} elsif ($link) { |
$menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>'; |
$menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>'; |
Line 510 sub create_submenu {
|
Line 515 sub create_submenu {
|
if ($target ne '') { |
if ($target ne '') { |
$disptarget = ' target="'.$target.'"'; |
$disptarget = ' target="'.$target.'"'; |
} |
} |
my $name; |
|
if ($title eq 'Personal') { |
|
if ($env{'user.name'} && $env{'user.domain'}) { |
|
$name = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); |
|
} else { |
|
$name = &mt($title); |
|
} |
|
} else { |
|
$name = &mt($title); |
|
} |
|
my $menu = '<li class="LC_hoverable">'. |
my $menu = '<li class="LC_hoverable">'. |
'<a href="'.$link.'"'.$disptarget.'>'. |
'<a href="'.$link.'"'.$disptarget.'>'. |
'<span class="LC_nobreak">'.$name. |
'<span class="LC_nobreak">'.$title. |
'<span class="LC_fontsize_small" style="font-weight:normal;">'. |
'<span class="LC_fontsize_small" style="font-weight:normal;">'. |
' ▼</span></span></a>'. |
' ▼</span></span></a>'. |
'<ul>'; |
'<ul>'; |
Line 639 sub innerregister {
|
Line 634 sub innerregister {
|
&& $maptitle ne $coursetitle); |
&& $maptitle ne $coursetitle); |
|
|
push @crumbs, {text => $restitle, no_mt => 1} if $restitle; |
push @crumbs, {text => $restitle, no_mt => 1} if $restitle; |
|
my @tools; |
|
if ($env{'request.filename'} =~ /\.page$/) { |
|
my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools(); |
|
if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') { |
|
@tools = @{$breadcrumb_tools{'tools'}}; |
|
} |
|
} |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::add_breadcrumb(@crumbs); |
&Apache::lonhtmlcommon::add_breadcrumb(@crumbs); |
|
if (@tools) { |
|
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',@tools); |
|
} |
} else { |
} else { |
$resurl = $env{'request.noversionuri'}; |
$resurl = $env{'request.noversionuri'}; |
my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'}); |
my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'}); |
Line 776 sub innerregister {
|
Line 781 sub innerregister {
|
my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; |
my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; |
if ($currdir =~ m-/$-) { |
if ($currdir =~ m-/$-) { |
$is_const_dir = 1; |
$is_const_dir = 1; |
|
if ($thisdisfn eq '') { |
|
$is_const_dir = 2; |
|
} |
} else { |
} else { |
$currdir =~ s|[^/]+$||; |
$currdir =~ s|[^/]+$||; |
my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); |
my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); |
Line 839 if ($env{'browser.mobile'}) {
|
Line 847 if ($env{'browser.mobile'}) {
|
$is_mobile = 1; |
$is_mobile = 1; |
} |
} |
|
|
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) { |
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio|exttools?)(\?|$)/) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) { |
$menuitems.=(<<ENDREALRES); |
$menuitems.=(<<ENDREALRES); |
s&6&3&catalog.png&Info&info[_1]&catalog_info('$is_mobile')&Show Metadata |
s&6&3&catalog.png&Info&info[_1]&catalog_info('$is_mobile')&Show Metadata |
Line 897 ENDMENUITEMS
|
Line 905 ENDMENUITEMS
|
my $addremote=0; |
my $addremote=0; |
foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } |
foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } |
if ($addremote) { |
if ($addremote) { |
|
my $countdown; |
|
if ($env{'request.filename'} =~ /\.page$/) { |
|
my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools(); |
|
if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') { |
|
$countdown = $breadcrumb_tools{'tools'}[0]; |
|
} |
|
} else { |
|
$countdown = &countdown_timer(); |
|
} |
&Apache::lonhtmlcommon::clear_breadcrumb_tools(); |
&Apache::lonhtmlcommon::clear_breadcrumb_tools(); |
|
|
&Apache::lonhtmlcommon::add_breadcrumb_tool( |
&Apache::lonhtmlcommon::add_breadcrumb_tool( |
'navigation', @inlineremote[21,23]); |
'navigation', @inlineremote[21,23]); |
|
|
my $countdown = &countdown_timer(); |
|
if (&hidden_button_check() eq 'yes') { |
if (&hidden_button_check() eq 'yes') { |
if ($countdown) { |
if ($countdown) { |
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown); |
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown); |
Line 927 ENDMENUITEMS
|
Line 942 ENDMENUITEMS
|
&advtools_crumbs(@inlineremote); |
&advtools_crumbs(@inlineremote); |
} |
} |
} |
} |
|
my ($topic_help,$topic_help_text); |
|
if ($is_const_dir == 2) { |
|
if ((($ENV{'SERVER_PORT'} == 443) || |
|
($Apache::lonnet::protocol{$Apache::lonnet::perlvar{'lonHostID'}} eq 'https')) && |
|
(&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},'webdav'))) { |
|
$topic_help = 'Authoring_WebDAV,Authoring_WebDAV_Mac_10v6,Authoring_WebDAV_Mac_10v10,'. |
|
'Authoring_WebDAV_Windows_v7,Authoring_WebDAV_Linux_Centos'; |
|
$topic_help_text = 'About WebDAV access'; |
|
} |
|
} |
return &Apache::lonhtmlcommon::scripttag('', 'start') |
return &Apache::lonhtmlcommon::scripttag('', 'start') |
. &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) |
. &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text) |
. &Apache::lonhtmlcommon::scripttag('', 'end'); |
. &Apache::lonhtmlcommon::scripttag('', 'end'); |
} |
} |
|
|
Line 1101 sub prepare_functions {
|
Line 1125 sub prepare_functions {
|
if (($env{'form.folderpath'} =~ /^supplemental/) && |
if (($env{'form.folderpath'} =~ /^supplemental/) && |
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) && |
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) && |
(($resurl =~ m{^/adm/wrapper/ext/}) || |
(($resurl =~ m{^/adm/wrapper/ext/}) || |
|
($resurl =~ m{^/adm/$cdom/$cnum/\d+/exttools?$}) || |
($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) || |
($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) || |
($resurl eq '/adm/supplemental') || |
($resurl eq '/adm/supplemental') || |
($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) || |
($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) || |
Line 1536 function toggleCountdown() {
|
Line 1561 function toggleCountdown() {
|
END |
END |
} |
} |
|
|
# This creates a "done button" for timed events. The confirmation box is a jQuerey |
# This creates a "done button" for timed events. The confirmation box is a jQuery |
# dialog widget. Clicking OK will set (done = 'true') which is checked in |
# dialog widget. Clicking OK will set (LC_interval_done = 'true') which is checked in |
# lonhomework.pm. |
# lonhomework.pm. |
sub done_button_js { |
sub done_button_js { |
return <<END; |
my ($type,$height) = @_; |
|
if ($height !~ /^\d+$/) { |
<form method="post" name="doneButton"> |
$height = 320; |
<input type="hidden" name="done" value=""/> |
} |
<button id="done-confirm-opener" type="button">Done</button> |
my %lt = &Apache::lonlocal::texthash( |
</form> |
title => 'WARNING!', |
|
button => 'Done', |
|
preamble => 'You are trying to end this timed event early.', |
|
map => 'Confirming that you are done will cause the time to expire and prevent you from changing any answers in the current folder.', |
|
resource => 'Confirming that you are done will cause the time to expire for this question, and prevent you from changing your answer(s).', |
|
ok => 'Click "OK" if you are completely finished.', |
|
cancel => 'Click "Cancel" to continue working.', |
|
); |
|
my $confirm; |
|
if (($type eq 'map') || ($type eq 'resource')) { |
|
$confirm = $lt{'preamble'}.' '.$lt{$type}.' '.$lt{'ok'}.' '.$lt{'cancel'}; |
|
} |
|
if ($confirm) { |
|
return <<END; |
|
|
|
<form method="post" name="LCdoneButton" action=""> |
|
<input type="hidden" name="LC_interval_done" value="" /> |
|
<button id="LC_done-confirm-opener" type="button">$lt{'button'}</button> |
|
</form> |
|
|
<div id="done-confirm" title="WARNING!"> |
<div id="LC_done-confirm" title="$lt{'title'}"> |
<p></span>You are trying to end this timed event early. Confirming that you are done will cause the time to expire and prevent you from changing any answers in the current folder. Click "OK" if you are completely finished. Click "Cancel" to continue working.</p> |
<p>$confirm</p> |
</div> |
</div> |
|
|
<script> |
<script type="text/javascript"> |
\$( "#done-confirm" ).dialog({ autoOpen: false }); |
// <![CDATA[ |
\$( "#done-confirm-opener" ).click(function() { |
\$( "#LC_done-confirm" ).dialog({ autoOpen: false }); |
\$( "#done-confirm" ).dialog( "open" ); |
\$( "#LC_done-confirm-opener" ).click(function() { |
\$( "#done-confirm" ).dialog({ |
\$( "#LC_done-confirm" ).dialog( "open" ); |
|
\$( "#LC_done-confirm" ).dialog({ |
resizable: false, |
resizable: false, |
height:320, |
height: $height, |
modal: true, |
modal: true, |
buttons: { |
buttons: { |
"OK": function() { |
"OK": function() { |
\$( this ).dialog( "close" ); |
\$( this ).dialog( "close" ); |
\$( '[name="done"]' )[0].value = 'true'; |
\$( '[name="LC_interval_done"]' )[0].value = 'true'; |
\$( '[name="doneButton"]' )[0].submit(); |
\$( '[name="LCdoneButton"]' )[0].submit(); |
}, |
}, |
Cancel: function() { |
Cancel: function() { |
\$( this ).dialog( "close" ); |
\$( this ).dialog( "close" ); |
Line 1571 sub done_button_js {
|
Line 1615 sub done_button_js {
|
} |
} |
}) |
}) |
}); |
}); |
|
// ]]> |
</script> |
</script> |
|
|
END |
END |
|
} else { |
|
return; |
|
} |
} |
} |
|
|
sub utilityfunctions { |
sub utilityfunctions { |
Line 1825 sub roles_selector {
|
Line 1873 sub roles_selector {
|
my $now = time; |
my $now = time; |
my (%courseroles,%seccount,%courseprivs); |
my (%courseroles,%seccount,%courseprivs); |
my $is_cc; |
my $is_cc; |
my ($js,$form,$switcher,$switchtext); |
my ($js,$form,$switcher); |
my $ccrole; |
my $ccrole; |
if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
$ccrole = 'co'; |
$ccrole = 'co'; |
Line 1913 sub roles_selector {
|
Line 1961 sub roles_selector {
|
} |
} |
} |
} |
} |
} |
$switchtext = 'Switch role'; # do not translate here |
|
my @roles_order = ($ccrole,'in','ta','ep','ad','st'); |
my @roles_order = ($ccrole,'in','ta','ep','ad','st'); |
my $numdiffsec; |
my $numdiffsec; |
if (keys(%seccount) == 1) { |
if (keys(%seccount) == 1) { |
Line 1969 sub roles_selector {
|
Line 2016 sub roles_selector {
|
} |
} |
} |
} |
if (@submenu > 0) { |
if (@submenu > 0) { |
$switcher = &create_submenu('','',$switchtext,\@submenu); |
$switcher = &create_submenu('','',&mt('Switch role'),\@submenu); |
} |
} |
} |
} |
return ($js,$form,$switcher); |
return ($js,$form,$switcher); |
Line 2240 sub countdown_timer {
|
Line 2287 sub countdown_timer {
|
} |
} |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
|
my ($timelimit,$usesdone); |
if (@interval > 1) { |
if (@interval > 1) { |
|
($timelimit,$usesdone) = split(/_/,$interval[0]); |
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
if ($first_access > 0) { |
if ($first_access > 0) { |
if ($first_access+$interval[0] > time) { |
if ($first_access+$timelimit > time) { |
$hastimeleft = 1; |
$hastimeleft = 1; |
} |
} |
} |
} |
Line 2256 sub countdown_timer {
|
Line 2305 sub countdown_timer {
|
($type eq 'Task' && $slothastime)) { |
($type eq 'Task' && $slothastime)) { |
$currdisp = 'inline'; |
$currdisp = 'inline'; |
$collapse = '► '; |
$collapse = '► '; |
$donebutton = &done_button_js(); |
if ((@interval > 1) && ($hastimeleft)) { |
|
if ($usesdone eq 'done') { |
|
$donebutton = &done_button_js($interval[1]); |
|
} |
|
} |
} else { |
} else { |
$currdisp = 'none'; |
$currdisp = 'none'; |
$expand = '◄ '; |
$expand = '◄ '; |
Line 2270 sub countdown_timer {
|
Line 2321 sub countdown_timer {
|
my $desc = &mt('Countdown to due date/time'); |
my $desc = &mt('Countdown to due date/time'); |
|
|
return <<END; |
return <<END; |
|
$donebutton |
<a href="javascript:toggleCountdown();" class="LC_menubuttons_link"> |
<a href="javascript:toggleCountdown();" class="LC_menubuttons_link"> |
<span id="ddcountcollapse" class="LC_menubuttons_inline_text"> |
<span id="ddcountcollapse" class="LC_menubuttons_inline_text"> |
$collapse |
$collapse |
Line 2279 $collapse
|
Line 2330 $collapse
|
<a href="javascript:toggleCountdown();" class="LC_menubuttons_link"> |
<a href="javascript:toggleCountdown();" class="LC_menubuttons_link"> |
<span id="ddcountexpand" class="LC_menubuttons_inline_text" >$expand</span> |
<span id="ddcountexpand" class="LC_menubuttons_inline_text" >$expand</span> |
<img src="/res/adm/pages/timer.png" title="$desc" class="LC_icon" alt="$alttxt" /><span class="LC_menubuttons_inline_text">$title</span></a> |
<img src="/res/adm/pages/timer.png" title="$desc" class="LC_icon" alt="$alttxt" /><span class="LC_menubuttons_inline_text">$title</span></a> |
$donebutton |
|
END |
END |
} |
} |
} |
} |