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

Diff for /loncom/auth/lonroles.pm between versions 1.240.2.18 and 1.240.2.19

version 1.240.2.18, 2010/10/06 18:46:53 version 1.240.2.19, 2010/12/05 16:15:02
Line 593  ENDENTERKEY Line 593  ENDENTERKEY
   
     my ($crumbtext,$pagetitle,$recent,$show_course);      my ($crumbtext,$pagetitle,$recent,$show_course);
     $show_course=&Apache::loncommon::show_course();      $show_course=&Apache::loncommon::show_course();
     my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';      my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
     if ($custommenu) {      if ($custommenu) {
         my $brcrum = {'bread_crumbs' => 1};          my $start_page = &Apache::loncommon::start_page('Main Menu');
         if ($env{'form.destinationurl'} eq '/adm/gci_info') {  
             undef($brcrum);   
         }  
         my $start_page = &Apache::loncommon::start_page('Main Menu',undef,$brcrum);  
         $r->print(<<"ENDCUSTOM");          $r->print(<<"ENDCUSTOM");
 $start_page  $start_page
 <br />  
 <noscript>  <noscript>
 $noscript  $noscript
 </noscript>  </noscript>
Line 622  ENDCUSTOM Line 617  ENDCUSTOM
                          text    => $crumbtext,},                           text    => $crumbtext,},
                      ];                       ];
         my $args;          my $args;
         if (($env{'user.domain'} eq 'gcitest') && (!$numdc)) {          if ($numdc) {
             $args = {bread_crumbs        => $brcrum,  
                      bread_crumbs_nomenu => 1};  
         } else {  
             $args = {bread_crumbs => $brcrum};              $args = {bread_crumbs => $brcrum};
           } else {
               $args = {bread_crumbs          => $brcrum,
                        bread_crumbs_menulink => '_nomenu'};
         }          }
         my $start_page=&Apache::loncommon::start_page($pagetitle,undef,$args);          my $start_page=&Apache::loncommon::start_page($pagetitle,undef,$args);
         my $swinfo=&Apache::lonmenu::rawconfig();          my $swinfo=&Apache::lonmenu::rawconfig();
         $standby=~s/\n/\\n/g;          $standby=~s/\n/\\n/g;
         $r->print(<<ENDHEADER);          $r->print(<<ENDHEADER);
 $start_page  $start_page
 <br />  
 <noscript>  <noscript>
 $noscript  $noscript
 </noscript>  </noscript>
Line 766  ENDHEADER Line 760  ENDHEADER
                 $current = 'cc./'.$env{'course.'.$env{'request.course.id'}.'.domain'}.                  $current = 'cc./'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
                            '/'.$env{'course.'.$env{'request.course.id'}.'.num'};                             '/'.$env{'course.'.$env{'request.course.id'}.'.num'};
             }              }
             my $switcher_js = &Apache::loncommon::gcitest_switcher_js($current,$numcourses);  
             $r->print(<<"ENDSCRIPT");  
 <script type="text/javascript">  
 // <![CDATA[  
 $switcher_js  
 // ]]>  
 </script>  
 ENDSCRIPT  
         }          }
         $r->print(&Apache::lonmenu::inlinemenu('gcicustom',$switcher).          $r->print(&Apache::lonmenu::inlinemenu('gcicustom',$switcher).
                   &Apache::loncommon::end_page());                    &Apache::loncommon::end_page());
Line 820  ENDSCRIPT Line 806  ENDSCRIPT
             if ($show_course) {              if ($show_course) {
                 if ($env{'user.domain'} eq 'gcitest') {                  if ($env{'user.domain'} eq 'gcitest') {
                     $r->print('<h2>'.&mt('Currently no active Concept Tests').'</h2>');                      $r->print('<h2>'.&mt('Currently no active Concept Tests').'</h2>');
                 } else {                   } elsif ($env{'user.domain'} eq 'gci') {
                     $r->print('<h2>'.&mt('Currently no active courses or communities').'</h2>');                      $r->print('<h2>'.&mt('Currently not assigned as a GCI contributor').'</h2>');
                 }                  }
             } else {              } else {
         $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');          $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
Line 993  ENDSCRIPT Line 979  ENDSCRIPT
   
 sub gci_info_page {  sub gci_info_page {
     return <<"END";      return <<"END";
   <br clear="all">
   <div>
 <h2>Welcome to the Geoscience Concept Inventory WebCenter</h2>  <h2>Welcome to the Geoscience Concept Inventory WebCenter</h2>
 <p>  <p>
 Use the tabs to navigate the WebCenter and...  Use the tabs to navigate the WebCenter and...
Line 1005  Use the tabs to navigate the WebCenter a Line 993  Use the tabs to navigate the WebCenter a
 </p>  </p>
 <p>For more information about writing and reviewing Concept Inventory questions  <p>For more information about writing and reviewing Concept Inventory questions
 please refer to the <a href="/res/gci/gci/internal/pdfs/GCIWorkbook.pdf">GCI Workbook</a>.  please refer to the <a href="/res/gci/gci/internal/pdfs/GCIWorkbook.pdf">GCI Workbook</a>.
   </div>
 END  END
 }  }
   
Line 1311  sub findcourse_advice { Line 1299  sub findcourse_advice {
     } else {      } else {
         $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');          $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');
     }      }
     $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.      my $queued = &Apache::loncoursequeueadmin::queued_selfenrollment();
               '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');      if ($queued) {
     $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'.          $r->print($queued);
               &Apache::loncoursequeueadmin::queued_selfenrollment());      } else {
           $r->print(&mt('You have no request for contributor access pending approval by the GCI WebCenter team.').'<ul>'.
               '<li>'.&mt('This may mean that action was taken on your request in the time since your most recent log-in.[_1]View [_2]Message[_3] to see if this is the case.','<br />','<a href="/adm/communicate">','</a>').'</li>'.
               '<li>'.&mt('If you logout and log-in again you may find you now have access to the Geoscience Concept Inventory, as a contributor.').'</li>'.
              '</ul>');
       }
     return;      return;
 }  }
   
Removed from v.1.240.2.18  
changed lines
  Added in v.1.240.2.19

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