[LON-CAPA-cvs] cvs: doc /loncapafiles loncapafiles.lpml loncom/auth lonroles.pm loncom/html/res/adm/pages ccat-22x22.png

[raeburn]

raeburn		Sat Aug 10 20:28:21 2013 EDT

  Added files:                 
    /loncom/html/res/adm/pages	ccat-22x22.png 

  Modified files:              
    /loncom/auth	lonroles.pm 
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - Include link to Course/Community catalog in Functions menu on roles/courses
    screen, if user's domain has log-in page preference to show course catalog
    link.
  - Wording changes to shorten titles of items in Functions menu.
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.289 loncom/auth/lonroles.pm:1.290
--- loncom/auth/lonroles.pm:1.289	Wed Aug  7 00:03:29 2013
+++ loncom/auth/lonroles.pm	Sat Aug 10 20:28:14 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.289 2013/08/07 00:03:29 raeburn Exp $
+# $Id: lonroles.pm,v 1.290 2013/08/10 20:28:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2733,11 +2733,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(
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.847 doc/loncapafiles/loncapafiles.lpml:1.848
--- doc/loncapafiles/loncapafiles.lpml:1.847	Sat Aug 10 04:12:23 2013
+++ doc/loncapafiles/loncapafiles.lpml	Sat Aug 10 20:28:21 2013
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.847 2013/08/10 04:12:23 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.848 2013/08/10 20:28:21 raeburn Exp $ -->
 
 <!--
 
@@ -7685,6 +7685,7 @@
 anonsurveythreshold.png;
 bubblesheet.png;
 ccatconf.png;
+ccat-22x22.png;
 chat.png;
 comblock.png;
 contact-new.png;