[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm lonnavdisplay.pm mydesk.tab

[raeburn]

raeburn		Tue Sep  8 20:56:47 2009 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm lonnavdisplay.pm mydesk.tab 
  Log:
  - Consistent wording.
    - Eliminate the word 'Navigate'.
    - Use 'supplemental docs' more widely.
  - Localization files will require updates.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.280 loncom/interface/lonmenu.pm:1.281
--- loncom/interface/lonmenu.pm:1.280	Thu Aug 20 20:49:59 2009
+++ loncom/interface/lonmenu.pm	Tue Sep  8 20:56:46 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.280 2009/08/20 20:49:59 raeburn Exp $
+# $Id: lonmenu.pm,v 1.281 2009/09/08 20:56:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,7 +149,7 @@
 
 sub initlittle {
     return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
-				       'nav' => 'Navigate Contents',
+				       'nav' => 'Course Contents',
 				       'main' => 'Main Menu',
                                        'roles' => (&Apache::loncommon::show_course()?
                                                     'Courses':'Roles'),
Index: loncom/interface/lonnavdisplay.pm
diff -u loncom/interface/lonnavdisplay.pm:1.12 loncom/interface/lonnavdisplay.pm:1.13
--- loncom/interface/lonnavdisplay.pm:1.12	Tue May 19 13:56:07 2009
+++ loncom/interface/lonnavdisplay.pm	Tue Sep  8 20:56:47 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavdisplay.pm,v 1.12 2009/05/19 13:56:07 droeschl Exp $
+# $Id: lonnavdisplay.pm,v 1.13 2009/09/08 20:56:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -155,12 +155,19 @@
 
     # Header
     my $course_type = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page(#'Navigate '.$course_type.
-                         'Course Contents',
+    my ($title,$breadcrumb_text);
+    if ($course_type eq 'Community') {
+        $title = 'Community Contents';
+        $breadcrumb_text = &mt('Community Contents');
+    } else {
+        $title = 'Course Contents';
+        $breadcrumb_text = &mt('Course Contents');
+    }
+    $r->print(&Apache::loncommon::start_page($title,
                          $js,
                          {'only_body'       => $body_only,
                           'force_register'  => $env{'form.register'},
-                          'bread_crumbs'    => [{text => mt('Course Content') }],}));
+                          'bread_crumbs'    => [{text => $breadcrumb_text }],}));
     $r->print('<script type="text/javascript">window.focus();</script>');
      
     $r->rflush();
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.111 loncom/interface/mydesk.tab:1.112
--- loncom/interface/mydesk.tab:1.111	Wed Aug 12 18:38:04 2009
+++ loncom/interface/mydesk.tab	Tue Sep  8 20:56:47 2009
@@ -67,11 +67,11 @@
 1:1:nsc:any:roles.gif:switch[_2]:role[_1]:go('/adm/roles');:Switch to another user role:rol
 1:1:nsc:rcm:roles.gif:choose[_2]:role[_2]:go('/adm/roles');:Choose the user role:rol
 1:2:clear
-1:2:course:any:docs.gif:course[_3]:docs[_1]:go('/adm/coursedocs');:View documents included in this course:crc
-1:2:pmdc:$crs:docs.gif:edit crs[_1]:docs[_2]:go('/adm/coursedocs');:Edit and view documents included in this course:crc
+1:2:course:any:docs.gif:supplem-[_1]:entaldoc[_1]:go('/adm/coursedocs');:View supplemental course documents:crc
+1:2:pmdc:$crs:docs.gif:edit [_1]:course[_2]:go('/adm/coursedocs');:Edit course contents:crc
 2:1:clear
 2:2:clear
-2:2:course:any:nav.gif:navigate[_1]:contents[_1]:gonav('/adm/navmaps');:Navigate the table of contents for this course:crc
+2:2:course:any:nav.gif:course[_3]:contents[_1]:gonav('/adm/navmaps');:Table of course contents:crc
 2:3:clear
 3:1:clear
 4:1:clear