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

Diff for /loncom/interface/lonmenu.pm between versions 1.309.2.4 and 1.309.2.15

version 1.309.2.4, 2009/12/15 05:25:07 version 1.309.2.15, 2010/09/03 19:20:47
Line 131  use Apache::lonhtmlcommon(); Line 131  use Apache::lonhtmlcommon();
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonenc();  use Apache::lonenc();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::loncoursequeueadmin;
 use LONCAPA qw(:DEFAULT :match);  use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities();  use HTML::Entities();
   
Line 286  sub gci_secondary_menu { Line 287  sub gci_secondary_menu {
     my %courses = (      my %courses = (
         'review' => 'gci_9615072b469884921gcil1',          'review' => 'gci_9615072b469884921gcil1',
         'submit' => 'gci_1H96711d710194bfegcil1',          'submit' => 'gci_1H96711d710194bfegcil1',
           'tutorial' => 'gci_5422913620b814c90gcil1',
     );      );
     my %linktext = (      my %linktext = (
         'review'      => 'Review Questions',          'review'      => 'Review Questions',
         'submit'      => 'Submit Questions',          'submit'      => 'Submit Questions',
         'managetest'  => 'Manage Tests',          'managetest'  => 'Manage Tests',
           'tutorial'    => 'Tutorials',
     );      );
     my %links = (      my %links = (
                   'managetest' => '/adm/menu',                    'managetest' => '/adm/menu',
                 );                  );
     my $current = 'managetest';      my $current = 'managetest';
       if ($env{'form.destinationurl'} eq '/adm/gci_info') {
           undef($current);
       }
     foreach my $key (keys(%courses)) {      foreach my $key (keys(%courses)) {
         $links{$key} = "javascript:switchpage('$key');";          $links{$key} = "javascript:switchpage('$key');";
         if ($env{'request.course.id'} eq $courses{$key}) {          if ($env{'request.course.id'} eq $courses{$key}) {
Line 304  sub gci_secondary_menu { Line 310  sub gci_secondary_menu {
             $links{'managetest'} = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2fmenu';              $links{'managetest'} = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2fmenu';
         }          }
     }      }
     my @menutabs = ('review','submit','managetest');      my @menutabs = ('review','submit','managetest','tutorial');
     my $tabs;      my $tabs;
     foreach my $item (@menutabs) {      foreach my $item (@menutabs) {
         if ($item eq $current) {          if ($item eq $current) {
Line 1377  sub inlinemenu { Line 1383  sub inlinemenu {
     undef(@inlineremote);      undef(@inlineremote);
     undef(%category_members);      undef(%category_members);
     my $output;      my $output;
     if ($context eq 'gcicustom') {      if (($context eq 'gcicustom') || ($context eq 'gcistudent') ||
         my $createtext = &mt('Create Concept Test');          ($context eq 'gcinorole')) {
         if ($switcher) {  
             $createtext = &mt('Create New Test');  
         }  
         $output='<table><tr>'.          $output='<table><tr>'.
                 '<td class="LC_mainmenu_col_fieldset">'.                  '<td class="LC_mainmenu_col_fieldset">'.
                 '<div class="LC_Box LC_400Box">'.                  '<div class="LC_Box LC_400Box">'.
                 '<h3 class="LC_hcell">'.&mt('Utilities').'</h3>'.                  '<h3 class="LC_hcell">'.&mt('Utilities').'</h3>'.
                 '<table><tr><td align="left"><a href="javascript:switchpage('."'createtest'".');"><img alt="choose role" src="/res/adm/pages/rcrs.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:switchpage('."'createtest'".');"><span class="LC_menubuttons_inline_text">'.$createtext.'</span></a></td></tr>';                  '<table>';
           if ($context eq 'gcicustom') {
               my $createtext = &mt('Create Concept Test');
               if ($switcher) {
                   $createtext = &mt('Create New Test');
               }
               $output .= '<tr><td align="left"><a href="javascript:switchpage('."'createtest'".');"><img alt="choose role" src="/res/adm/pages/rcrs.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:switchpage('."'createtest'".');"><span class="LC_menubuttons_inline_text">'.$createtext.'</span></a></td></tr>';
           }
         if ($switcher) {          if ($switcher) {
             $output .= '<tr><td align="left"><a href="javascript:courseswitcher('."'icon'".');"><img alt="choose role" src="/res/adm/pages/roles.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="2">'.$switcher.'</td></tr>';              $output .= '<tr><td align="left"><a href="javascript:courseswitcher('."'icon'".');"><img alt="choose role" src="/res/adm/pages/roles.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="2">'.$switcher.'</td></tr>';
         }          }
         $output .= '<tr><td align="left"><a href="javascript:go('."'/adm/communicate'".');"><img alt="communication" src="/res/adm/pages/com.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/communicate'".');"><span class="LC_menubuttons_inline_text">'.&mt('Send/Display Messages').'</span></a></td></tr></table></div></td>';          $output .= '<tr><td align="left"><a href="javascript:go('."'/adm/communicate'".');"><img alt="communication" src="/res/adm/pages/com.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/communicate'".');"><span class="LC_menubuttons_inline_text">'.&mt('Send/Display Messages').'</span></a></td></tr>'.
         if (($env{'request.course.id'}) &&  '<tr><td align="left"><a href="javascript:go('."'/adm/preferences'".');"><img alt="user preferences" src="/res/adm/pages/pref.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/preferences'".');"><span class="LC_menubuttons_inline_text">'.&mt('Set my user preferences').'</span></a></td></tr>';
             (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {          if ($env{'request.course.id'}) {
             $output.= '<td class="LC_mainmenu_col_fieldset">'.              if (($context eq 'gcicustom') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
                       '<div class="LC_Box LC_400Box">'.                  $output.= '</td></tr></table></div></td>'.
                       '<h3 class="LC_hcell">'.&mt('Test Management').'</h3>'.                            '<td class="LC_mainmenu_col_fieldset">'.
                       '<table><tr><td align="left"><a href="javascript:gonav('."'/adm/navmaps'".');"><img alt="course contents" src="/res/adm/pages/nav.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:gonav('."'/adm/navmaps'".');"><span class="LC_menubuttons_inline_text">Concept Test Contents</span></a></td></tr>'."\n".                            '<div class="LC_Box LC_400Box">'.
                       '<tr><td align="left"><a href="javascript:go('."'/adm/coursedocs'".');"><img alt="assemble test" src="/res/adm/pages/docs.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/coursedocs'".');"><span class="LC_menubuttons_inline_text">Assemble Concept Test</span></a></td></tr>'."\n".                            '<h3 class="LC_hcell">'.&mt('Test Management').'</h3>'.
                       '<tr><td align="left"><a href="javascript:go('."'/adm/createuser'".');"><img alt="user privs" src="/res/adm/pages/cprv.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/createuser'".');"><span class="LC_menubuttons_inline_text">'.&mt('Manage Enrollment').'</span></a></td></tr>'."\n".                            '<table><tr><td align="left"><a href="javascript:gonav('."'/adm/navmaps'".');"><img alt="course contents" src="/res/adm/pages/nav.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:gonav('."'/adm/navmaps'".');"><span class="LC_menubuttons_inline_text">Concept Test Contents</span></a></td></tr>'."\n".
                 '<tr><td align="left"><a href="javascript:go('."'/adm/whatsnew'".');"><img alt="what is new" src="/res/adm/pages/new.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/whatsnew'".');"><span class="LC_menubuttons_inline_text">'.&mt("What's New?").'</span></a></td></tr></table></div></td>';                            '<tr><td align="left"><a href="javascript:go('."'/adm/coursedocs'".');"><img alt="assemble test" src="/res/adm/pages/docs.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/coursedocs'".');"><span class="LC_menubuttons_inline_text">Assemble Concept Test</span></a></td></tr>'."\n".
                             '<tr><td align="left"><a href="javascript:go('."'/adm/createuser'".');"><img alt="user privs" src="/res/adm/pages/cprv.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/createuser'".');"><span class="LC_menubuttons_inline_text">'.&mt('Enrollment and Student Activity').'</span></a></td></tr>'."\n".
                            '<tr><td align="left"><a href="javascript:go('."'/adm/whatsnew'".');"><img alt="what is new" src="/res/adm/pages/new.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/whatsnew'".');"><span class="LC_menubuttons_inline_text">'.&mt("What's New?").'</span></a></td></tr>'.
                            '<tr><td align="left"><a href="javascript:go('."'/adm/printout'".');"><img alt="print concept test" src="/res/adm/pages/prnt.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/printout'".');"><span class="LC_menubuttons_inline_text">'.&mt("Prepare Printable Concept Test").'</span></a></td></tr>'.
                            '<tr><td align="left"><a href="javascript:go('."'/adm/statistics'".');"><img alt="Test Statistics" src="/res/adm/pages/chrt.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/statistics'".');"><span class="LC_menubuttons_inline_text">'.&mt("Concept Test Statistics").'</span></a></td></tr></table></div></td>';
               } else {
                   my $navtext = &mt('Table of Contents');
                   if ($env{'request.role.domain'} eq 'gcitest') {
                       $navtext = &mt('Display Test Contents');
                   }
                   $output .= '<tr><td align="left"><a href="javascript:gonav('."'/adm/navmaps'".');"><img alt="course contents" src="/res/adm/pages/nav.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:gonav('."'/adm/navmaps'".');"><span class="LC_menubuttons_inline_text">'.$navtext.'</span></a></td></tr></table></div></td>';
               }
           } else {
               $output.='</td></tr></table></div></td>';
           }
           if ($context eq 'gcinorole') {
               my $queued =  &Apache::loncoursequeueadmin::queued_selfenrollment('notitle');
               if ($queued) {
                   $output .= '<td class="LC_mainmenu_col_fieldset">'.
                              '<div class="LC_Box LC_400Box">'.
                              '<h3 class="LC_hcell">'.&mt('Pending Enrollment Requests').'</h3>'.
                              $queued.
                              '</td></tr></table></div></td>';
               }
         }          }
         $output.='</tr></table>';          $output.='</tr></table>';
     } else {      } else {
Line 1733  sub utilityfunctions { Line 1766  sub utilityfunctions {
             
     my $gcimenujs;      my $gcimenujs;
     if ($custommenu) {      if ($custommenu) {
         my %concepttests = &Apache::loncommon::existing_gcitest_courses();          my %concepttests = &Apache::loncommon::existing_gcitest_courses('cc');
         my $managetesturl = '/adm/menu';          my $managetesturl = '/adm/menu';
         my $createtesturl = '/adm/requestcourse';          my $createtesturl = '/adm/requestcourse';
         if (($env{'request.course.id'}) &&          if (($env{'request.course.id'}) &&
Line 1765  function switchpage(caller) { Line 1798  function switchpage(caller) {
     if (caller == 'managetest') {      if (caller == 'managetest') {
         document.location.href = '$managetesturl';          document.location.href = '$managetesturl';
     }      }
       if (caller == 'tutorial') {
           document.location.href = '/adm/roles?selectrole=1&st./gci/5422913620b814c90gcil1=1';
       }
   
     return;      return;
 }  }
   
Line 2010  sub hidden_button_check { Line 2047  sub hidden_button_check {
         return;          return;
     }      }
     if ($env{'request.role.adv'}) {      if ($env{'request.role.adv'}) {
         return;          unless (&Apache::loncommon::needs_gci_custom()) {
               return;
           }
     }      }
     my $buttonshide = &Apache::lonnet::EXT('resource.0.buttonshide');      my $buttonshide = &Apache::lonnet::EXT('resource.0.buttonshide');
     return $buttonshide;       return $buttonshide; 
Removed from v.1.309.2.4  
changed lines
  Added in v.1.309.2.15

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