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

[raeburn]

raeburn		Mon Aug 12 20:51:29 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/auth	lonroles.pm 
  Log:
  - For 2.11
    - Backport 1.290
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.269.2.11 loncom/auth/lonroles.pm:1.269.2.12
--- loncom/auth/lonroles.pm:1.269.2.11	Thu Aug  8 01:59:42 2013
+++ loncom/auth/lonroles.pm	Mon Aug 12 20:51:29 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269.2.11 2013/08/08 01:59:42 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.12 2013/08/12 20:51:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2740,11 +2740,14 @@
     }
     if ($env{'user.adv'}) {
         if ($env{'form.display'} eq 'showall') {
-            push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired roles')]);
+            push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired')]);
         } else {
-            push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired roles')]);
+            push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired')]);
         }
     }
+    if (&Apache::loncommon::designparm('login.coursecatalog',$env{'user.domain'})) {
+        push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course Catalog')]);
+    }
     my $funcs = &Apache::lonhtmlcommon::start_funclist();
     foreach my $link (@links) {
         $funcs .= &Apache::lonhtmlcommon::add_item_funclist(