[BACK]Return to lonmenu.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmenu.pm between versions 1.501 and 1.504

version 1.501, 2020/02/17 23:04:18 version 1.504, 2021/01/02 21:07:36
Line 1098  if ($env{'browser.mobile'}) { Line 1098  if ($env{'browser.mobile'}) {
 }  }
   
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {              unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
  if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/}) && ($env{'request.noversionuri'} !~ m{^/adm/.+/ext\.tool$})) {   if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) &&
                       ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)}) &&
                       ($env{'request.noversionuri'} !~ m{^/adm/.+/ext\.tool$})) {
     $menuitems.=(<<ENDREALRES);      $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.png&Info&info[_1]&catalog_info(currentURL,'$is_mobile')&Show Metadata  s&6&3&catalog.png&Info&info[_1]&catalog_info(currentURL,'$is_mobile')&Show Metadata
 ENDREALRES  ENDREALRES
                 }                  }
                 unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) ||                  unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)}) ||
                         ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/}) ||                          ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/}) ||
                         ($env{'request.noversionuri'} =~ m{^/adm/.+/ext\.tool$})) {                          ($env{'request.noversionuri'} =~ m{^/adm/.+/ext\.tool$})) {
                     $menuitems.=(<<ENDREALRES);                      $menuitems.=(<<ENDREALRES);
Line 1281  sub prepare_functions { Line 1283  sub prepare_functions {
 # Determine whether or not to display 'Edit' or 'View Source' icon/button  # Determine whether or not to display 'Edit' or 'View Source' icon/button
 #  #
     if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {      if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
           my $blocked = &Apache::loncommon::blocking_status('about',$2,$1);
         my $file=&Apache::lonnet::declutter($env{'request.filename'});          my $file=&Apache::lonnet::declutter($env{'request.filename'});
         ($cfile,$home,$switchserver,$forceedit,$forceview) =          ($cfile,$home,$switchserver,$forceedit,$forceview) =
             &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,              &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
                 &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);                  &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
         if (($cfile) && ($home ne '') && ($home ne 'no_host')) {          if (($cfile) && ($home ne '') && ($home ne 'no_host') && (!$blocked)) {
             $editbutton = &get_editbutton($cfile,$home,$switchserver,              $editbutton = &get_editbutton($cfile,$home,$switchserver,
                                           $forceedit,$forceview,$forcereg);                                            $forceedit,$forceview,$forcereg);
         }          }
Line 1398  sub prepare_functions { Line 1401  sub prepare_functions {
         if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {          if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
             my ($sdom,$sname) = ($1,$2);              my ($sdom,$sname) = ($1,$2);
             unless (&Apache::lonnet::is_course($sdom,$sname)) {              unless (&Apache::lonnet::is_course($sdom,$sname)) {
                 &switch('','',6,4,'mail-message-new-22x22.png','Message to user',                  my $blocked = &Apache::loncommon::blocking_status('about',$sname,$sdom);
                         '',                  unless ($blocked) {
                         "go('/adm/email?compose=individual&amp;recname=$sname&amp;recdom=$sdom')",                      &switch('','',6,4,'mail-message-new-22x22.png','Message to user',
                             'Send message to specific user');                              '',
                               "go('/adm/email?compose=individual&amp;recname=$sname&amp;recdom=$sdom')",
                                   'Send message to specific user');
                   }
             }              }
             my $hideprivileged = 1;              my $hideprivileged = 1;
             if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef,              if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef,
Line 1907  sub done_button_js { Line 1913  sub done_button_js {
                  key      => 'Key:',                   key      => 'Key:',
                  nokey    => 'A proctor key is required',                    nokey    => 'A proctor key is required', 
     );      );
       my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($env{'request.symb'}));
     my $navmap = Apache::lonnavmaps::navmap->new();       my $navmap = Apache::lonnavmaps::navmap->new(); 
     my ($missing,$tried) = (0,0);      my ($missing,$tried) = (0,0);
     if (ref($navmap)) {      if (ref($navmap)) {
Line 1969  sub done_button_js { Line 1976  sub done_button_js {
 <form method="post" name="LCdoneButton" action="">  <form method="post" name="LCdoneButton" action="">
     <input type="hidden" name="LC_interval_done" value="" />      <input type="hidden" name="LC_interval_done" value="" />
     <input type="hidden" name="LC_interval_done_proctorpass" value="" />      <input type="hidden" name="LC_interval_done_proctorpass" value="" />
       <input type="hidden" name="symb" value="$shownsymb" />
     <button id="LC_done-confirm-opener" type="button">$donebuttontext</button>      <button id="LC_done-confirm-opener" type="button">$donebuttontext</button>
 </form>  </form>
   
Line 2050  END Line 2058  END
   
 <form method="post" name="LCdoneButton" action="">  <form method="post" name="LCdoneButton" action="">
     <input type="hidden" name="LC_interval_done" value="" />      <input type="hidden" name="LC_interval_done" value="" />
       <input type="hidden" name="symb" value="$shownsymb" />
     <button id="LC_done-confirm-opener" type="button">$donebuttontext</button>      <button id="LC_done-confirm-opener" type="button">$donebuttontext</button>
 </form>  </form>
   
Removed from v.1.501  
changed lines
  Added in v.1.504

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