[LON-CAPA-cvs] cvs: loncom(GCI_3) /auth lonroles.pm

[raeburn]

raeburn		Mon Oct  4 17:43:24 2010 EDT

  Modified files:              (Branch: GCI_3)
    /loncom/auth	lonroles.pm 
  Log:
  - Customization for GCI_3
    - gctest_switcher() and gcitest_switcher_js() moved from lonmainmenu.pm to loncommon.pm
    - No breadcrumbs for /adm/gci_info
    - Woding change - more than a single question can be submitted to the GCI WebCenter.
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.240.2.16 loncom/auth/lonroles.pm:1.240.2.17
--- loncom/auth/lonroles.pm:1.240.2.16	Fri Sep  3 19:20:51 2010
+++ loncom/auth/lonroles.pm	Mon Oct  4 17:43:24 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.240.2.16 2010/09/03 19:20:51 raeburn Exp $
+# $Id: lonroles.pm,v 1.240.2.17 2010/10/04 17:43:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,7 +138,6 @@
 use Apache::lonlocal;
 use Apache::lonpageflip();
 use Apache::lonnavdisplay();
-use Apache::lonmainmenu();
 use Apache::loncoursequeueadmin;
 use GDBM_File;
 use LONCAPA qw(:DEFAULT :match);
@@ -595,8 +594,11 @@
     my ($crumbtext,$pagetitle,$recent,$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 />';
     if ($custommenu) {
-        my $start_page = &Apache::loncommon::start_page('Main Menu',undef,
-                                                        {'bread_crumbs' => 1});
+        my $brcrum = {'bread_crumbs' => 1};
+        if ($env{'form.destinationurl'} eq '/adm/gci_info') {
+            undef($brcrum); 
+        }
+        my $start_page = &Apache::loncommon::start_page('Main Menu',undef,$brcrum);
         $r->print(<<"ENDCUSTOM");
 $start_page
 <br />
@@ -748,13 +750,13 @@
         my $numcourses = keys(%courses);
         my $switcher;
         if ($numcourses > 0) {
-            $switcher = &Apache::lonmainmenu::gcitest_switcher('cc',%courses);
+            $switcher = &Apache::loncommon::gcitest_switcher('cc',%courses);
             my $current;
             if ($env{'request.course.id'}) {
                 $current = 'cc./'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
                            '/'.$env{'course.'.$env{'request.course.id'}.'.num'};
             }
-            my $switcher_js = &Apache::lonmainmenu::gcitest_switcher_js($current,$numcourses);
+            my $switcher_js = &Apache::loncommon::gcitest_switcher_js($current,$numcourses);
             $r->print(<<"ENDSCRIPT");
 <script type="text/javascript">
 // <![CDATA[
@@ -970,7 +972,7 @@
 Use the tabs to navigate the WebCenter and...
 <ul>
 <li>Review and comment on existing GCI questions</li>
-<li>Submit a GCI question of your own</li>
+<li>Submit GCI questions of your own</li>
 <li>Create an online test for your students</li>
 <li>View tutorials on creating online tests</li>
 </ul>