--- loncom/interface/lonmenu.pm	2009/08/20 20:49:59	1.280
+++ loncom/interface/lonmenu.pm	2010/05/26 19:50:46	1.315.2.1
@@ -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.315.2.1 2010/05/26 19:50:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,17 +42,72 @@ Coordinates the response to clicking an
 This is part of the LearningOnline Network with CAPA project
 described at http://www.lon-capa.org.
 
+=head1 GLOBAL VARIABLES
+
+=over
+
+=item @desklines
+
+Each element of this array contains a line of mydesk.tab that doesn't start with
+cat, prim or scnd. 
+It gets filled in the BEGIN block of this module.
+
+=item %category_names
+
+The keys of this hash are the abbreviations used in mydesk.tab in those lines that 
+start with cat, the values are strings representing titles. 
+It gets filled in the BEGIN block of this module.
+
+=item %category_members
+
+TODO 
+
+=item %category_positions
+
+The keys of this hash are the abbreviations used in mydesk.tab in those lines that
+start with cat, its values are position vectors (column, row). 
+It gets filled in the BEGIN block of this module.
+
+=item $readdesk
+
+Indicates that mydesk.tab has been read. 
+It is set to 'done' in the BEGIN block of this module.
+
+=item @primary_menu
+
+The elements of this array reference arrays that are made up of the components
+of those lines of mydesk.tab that start with prim.
+It is used by primary_menu() to generate the corresponding menu.
+It gets filled in the BEGIN block of this module.
+
+=item @secondary_menu
+
+The elements of this array reference arrays that are made up of the components
+of those lines of mydesk.tab that start with scnd.
+It is used by secondary_menu() to generate the corresponding menu.
+It gets filled in the BEGIN block of this module.
+
+=back
+
 =head1 SUBROUTINES
 
 =over
 
-Little texts
+=item prep_menuitems(\@menuitem)
+
+This routine wraps a menuitem in proper HTML. It is used by primary_menu() and 
+secondary_menu().
 
-=item initlittle()
+=item primary_menu()
 
-=item menubuttons()
+This routine evaluates @primary_menu and returns XHTML for the menu
+that contains following links: About, Message, Roles, Help, Logout
+@primary_menu is filled within the BEGIN block of this module with 
+entries from mydesk.tab 
 
-This gets called at the top of the body section
+=item secondary_menu()
+
+Same as primary_menu() but operates on @secondary_menu.
 
 =item show_return_link()
 
@@ -113,11 +168,6 @@ The javascript is usually similar to "go
 
 =item get_nav_status()
 
-=item convert_menu_function()
-
-FIXME this needs to move into mydesktab and the other locations 
-the text is generated
-
 =item hidden_button_check()
 
 =item roles_selector()
@@ -137,200 +187,165 @@ use Apache::loncommon();
 use Apache::lonenc();
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities();
 
-use vars qw(@desklines %category_names %category_members %category_positions $readdesk);
-
+use vars qw(@desklines %category_names %category_members %category_positions 
+            $readdesk @primary_menu @secondary_menu);
 
 my @inlineremote;
 
-#
-# This routine returns a translated hash for the menu items in the top inline menu row
-# Probably should be in mydesk.tab
+sub prep_menuitem {
+    my ($menuitem) = @_;
+    return '' unless(ref($menuitem) eq 'ARRAY');
+    my $link;
+    if ($$menuitem[1]) { # graphical Link
+        $link = "<img class=\"LC_noBorder\""
+              . " src=\"" . &Apache::loncommon::lonhttpdurl($$menuitem[1]) . "\"" 
+              . " alt=\"" . &mt($$menuitem[2]) . "\" />";
+    } else {             # textual Link
+        $link = &mt($$menuitem[3]);
+    }
+    if($$menuitem[4] eq 'newmsg'){   #special style for New Messages
+        return '<li><a href="'.$$menuitem[0].'"><span class="LC_new_message">'.$link.'</span></a></li>';
+    }
+    return '<li><a href="'.$$menuitem[0].'">'.$link.'</a></li>';
+}
+
+# primary_menu() evaluates @primary_menu and returns XHTML for the menu
+# that contains following links:
+# About, Message, Roles, Help, Logout
+# @primary_menu is filled within the BEGIN block of this module with 
+# entries from mydesk.tab
+sub primary_menu {
+    my $menu;
+    # each element of @primary contains following array:
+    # (link url, icon path, alt text, link text, condition)
+    my $public;
+    if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
+        || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
+        $public = 1;
+    }
+    foreach my $menuitem (@primary_menu) {
+        # evaluate conditions 
+        next if    ref($menuitem)       ne 'ARRAY';    #
+        next if    $$menuitem[4]        eq 'nonewmsg'  # show links depending on
+                && &Apache::lonmsg::mynewmail();       # whether a new msg 
+        next if    $$menuitem[4]        eq 'newmsg'    # arrived or not
+                && !&Apache::lonmsg::mynewmail();      # 
+        next if    $$menuitem[4]        !~ /public/    ##we've a public user,
+                && $public;                            ##who should not see all
+                                                       ##links
+        next if    $$menuitem[4]        eq 'onlypublic'# hide links which are
+                && !$public;                           # only visible to public
+                                                       # users
+        next if    $$menuitem[4]        eq 'roles'     ##show links depending on
+                && &Apache::loncommon::show_course();  ##term 'Courses' or
+        next if    $$menuitem[4]        eq 'courses'   ##'Roles' wanted
+                && !&Apache::loncommon::show_course(); ##
 
-sub initlittle {
-    return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
-				       'nav' => 'Navigate Contents',
-				       'main' => 'Main Menu',
-                                       'roles' => (&Apache::loncommon::show_course()?
-                                                    'Courses':'Roles'),
-                                       'other' => 'Other Roles',
-                                       'docs' => 'Edit Course',
-                                       'exit' => 'Logout',
-                                       'login' => 'Log In',
-				       'launch' => 'Launch Remote Control',
-                                       'groups' => 'Groups',
-                                       'gdoc' => 'Group Documents',
-                                       );
-}
-
-sub menubuttons {
-    my $forcereg=shift;
-    my $titletable=shift;
-#
-# Early-out for pages that should not have a menu, triggered by query string "inhibitmenu=yes"
-#
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-					    ['inhibitmenu']);
-    if (($env{'form.inhibitmenu'} eq 'yes') ||
-        ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; }
 
-    if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
+        if ($$menuitem[3] eq 'Help') { # special treatment for helplink
+            $menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
+        } else {
+            my @items = @{$menuitem};
+            $items[0] = 'javascript:'.$menuitem->[0].';';
+            $menu .= &prep_menuitem(\@items);
+        }
+    }
 
-    my %lt=&initlittle();
-    my $navmaps='';
-    my $reloadlink='';
-    my $docs='';
-    my $groups='';
-    my $roles='<a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a>';
-    my $role_selector;
-    my $showgroups=0;
-    my ($cnum,$cdom);
-#
-# if the URL is hidden, symbs and the non-versioned version of the URL would be encrypted
-#
-    my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
-    my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
+    return "<ol class=\"LC_primary_menu LC_right\">$menu</ol>";
+}
 
-    my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
-    $logo = '<a href="/adm/about.html"><img src="'.
-	$logo.'" alt="LON-CAPA Logo" class="LC_noBorder" /></a>';
 
-    if ($env{'request.state'} eq 'construct') {
-#
-# We are in construction space
-#
-        if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
-            my $returnurl = $env{'request.filename'};
-            $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:;
-            $escurl = &escape($returnurl);
-        }
-    }
-    if ($env{'request.course.id'}) {
-#
-# We are in a course
-#
-        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my %coursegroups;
-        my $viewgrps_permission =
-	    &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
-        if (!$viewgrps_permission) {
-            %coursegroups = &Apache::lonnet::get_active_groups($env{'user.domain'},$env{'user.name'},$cdom,$cnum);
-	}
-        if ((keys(%coursegroups) > 0) || ($viewgrps_permission)) {
-            $showgroups = 1;
-        }
-        $role_selector = &roles_selector($cdom,$cnum);
-        if ($role_selector) {
-            $roles = '<span class="LC_nobreak">'.$role_selector.'&nbsp;&nbsp;<a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></span>';
+sub secondary_menu {
+    my $menu;
+
+    my $crstype = &Apache::loncommon::course_type();
+    my $canedit = &Apache::lonnet::allowed('mdc', $env{'request.course.id'});
+    my $canviewgrps = &Apache::lonnet::allowed('vcg', $env{'request.course.id'}
+                   . ($env{'request.course.sec'} ? "/$env{'request.course.sec'}"
+                                                 : '')); 
+    my $showlink = &show_return_link();
+    my %groups = &Apache::lonnet::get_active_groups(
+                     $env{'user.domain'}, $env{'user.name'},
+                     $env{'course.' . $env{'request.course.id'} . '.domain'},
+                     $env{'course.' . $env{'request.course.id'} . '.num'});
+    foreach my $menuitem (@secondary_menu) {
+        # evaluate conditions 
+        next if    ref($menuitem)  ne 'ARRAY';
+        next if    $$menuitem[4]   ne 'always'
+                && !$env{'request.course.id'};
+        next if    $$menuitem[4]   eq 'showreturn'
+                && !$showlink
+                && !($env{'request.state'} eq 'construct');
+        next if    $$menuitem[4]   =~ /^mdc/
+                && !$canedit;
+        next if    $$menuitem[4]  eq 'mdcCourse'
+                && $crstype eq 'Community';
+        next if    $$menuitem[4]  eq 'mdcCommunity'
+                && $crstype ne 'Community';
+        next if    $$menuitem[4]  =~ /^remotenav/
+                && $env{'environment.remotenavmap'} ne 'on';
+        next if    $$menuitem[4]  =~ /noremotenav/
+                && $env{'environment.remotenavmap'} eq 'on';
+        next if $$menuitem[4] =~ /^(no|)remotenav$/ 
+                && $crstype eq 'Community';
+        next if $$menuitem[4] =~ /^(no|)remotenavCommunity$/ 
+                && $crstype ne 'Community';
+        next if    $$menuitem[4]   =~ /showgroups$/
+                && !$canviewgrps
+                && !%groups;
+
+        if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
+            # special treatment for role selector
+            my $roles_selector = &roles_selector(
+                        $env{'course.' . $env{'request.course.id'} . '.domain'},
+                        $env{'course.' . $env{'request.course.id'} . '.num'}  );
+
+            $menu .= $roles_selector ? "<li>$roles_selector</li>"
+                                     : '';
+        } elsif ($env{'environment.remotenavmap'} eq 'on') {
+            # open link using javascript when remote navmap is activated
+            my @items = @{$menuitem}; 
+            if ($menuitem->[4] eq 'remotenav') {
+                $items[0] = "javascript:gonav('$menuitem->[0]');";
+            } else {
+                $items[0] = "javascript:go('$menuitem->[0]');";
+            }
+            $menu .= &prep_menuitem(\@items);
+        } else {
+            $menu .= &prep_menuitem(\@$menuitem);
         }
     }
+    if ($menu =~ /\[url\].*\[symb\]/) {
+        my $escurl  = &escape( &Apache::lonenc::check_encrypt(
+                             $env{'request.noversionuri'}));
 
-    if ($env{'environment.remote'} eq 'off') {
-# Remote Control is switched off
-# figure out colors
-        my %lt=&initlittle();
-
-        my $domain=&Apache::loncommon::determinedomain();
-        my $function =&Apache::loncommon::get_users_function();
-        my $link=&Apache::loncommon::designparm($function.'.link',$domain);
-        my $alink=&Apache::loncommon::designparm($function.'.alink',$domain);
-        my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain);
-        my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
-
-        if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
-            return (<<ENDINLINEMENU);
-            <ol class="LC_smallMenu LC_right">
-                <li>$logo</li>
-                <li><a href="/adm/roles" target="_top">$lt{'login'}</a></li>
-            </ol>
-            <hr />
-ENDINLINEMENU
-        }
-        $roles = '<a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a>';
-# Do we have a NAV link?
-        if ($env{'request.course.id'}) {
-	    my $link='/adm/navmaps?postdata='.$escurl.'&amp;postsymb='.
-		$escsymb;
-	    if ($env{'environment.remotenavmap'} eq 'on') {
-		$link="javascript:gonav('".$link."')";
-	    }
-	    $navmaps=(<<ENDNAV);
-<li><a href="$link" target="_top">$lt{'nav'}</a></li>
-ENDNAV
-            my $is_group = (&Apache::loncommon::course_type() eq 'Group');
-	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'};
-		$docs=(<<ENDDOCS);
-<li><a href="/adm/coursedocs" target="_top">$text</a></li>
-ENDDOCS
-            }
-            if ($showgroups) {
-                $groups =(<<ENDGROUPS);
-<li><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></li>
-ENDGROUPS
-            }
-	    if (&show_return_link()) {
-                my $escreload=&escape('return:');
-                $reloadlink=(<<ENDRELOAD);
-<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>
-ENDRELOAD
-            }
-            if ($role_selector) {
-            	#$roles = '<td>'.$role_selector.'</td><td><a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></td>';
-				$role_selector = '<li>'.$role_selector.'</li>';
-            }
-        }
-	if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
-	    my $escreload=&escape('return:');
-	    $reloadlink=(<<ENDCRELOAD);
-<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>
-ENDCRELOAD
-        }
-    my $reg     = $forcereg ? &innerregister($forcereg,$titletable) : '';
-    my $form    = &serverform();
-    my $utility = &utilityfunctions();
-
-    #Prepare the message link that indicates the arrival of new mail
-    my $messagelink = Apache::lonmsg::mynewmail() ? "Message (new)" : "Message";
-       $messagelink = '<a href="javascript:go(\'/adm/communicate\');">'
-                      . mt($messagelink) .'</a>';
+        my $escsymb = &escape( &Apache::lonenc::check_encrypt(
+                             $env{'request.symb'})); 
 
-    my $helplink = &Apache::loncommon::top_nav_help('Help');
-	return (<<ENDINLINEMENU);
-<script type="text/javascript">
-// <![CDATA[
-// BEGIN LON-CAPA Internal
-$utility
-// ]]>
-</script>
-<ol class="LC_smallMenu LC_right">
-	<li>$logo</li>
-	<li>$messagelink</li>
-	<li>$roles</li>
-	<li>$helplink</li>
-	<li><a href="/adm/logout" target="_top">$lt{'exit'}</a></li>
-</ol>
-<ul id="LC_TabMainMenuContent">
-<li><a href="/adm/menu" target="_top">$lt{'main'}</a></li>
-$reloadlink
-$navmaps
-$docs
-$groups
-$role_selector
-</ul>
-$form
-<script type="text/javascript">
-// END LON-CAPA Internal
-</script>
-$reg
-ENDINLINEMENU
-    } else {
-	return '';
+        if (    $env{'request.state'} eq 'construct'
+            and (   $env{'request.noversionuri'} eq '' 
+                 || !defined($env{'request.noversionuri'}))) 
+        {
+            ($escurl = $env{'request.filename'}) =~ 
+                s{^/home/([^/]+)/public_html/(.*)$}{/priv/$1/$2};
+
+            $escurl  = &escape($escurl);
+        }    
+        $menu =~ s/\[url\]/$escurl/g;
+        $menu =~ s/\[symb\]/$escsymb/g;
     }
+
+    return "<ul id=\"LC_secondary_menu\">$menu</ul>";
 }
 
 sub show_return_link {
+    if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
+        || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
+
+        return if ($env{'form.register'});
+    }
     return (($env{'request.noversionuri'}=~m{^/(res|public)/} &&
 	     $env{'request.symb'} eq '')
 	    ||
@@ -339,7 +354,7 @@ sub show_return_link {
 	    (($env{'request.noversionuri'}=~/^\/adm\//) &&
 	     ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
 	     ($env{'request.noversionuri'}!~
-	      m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
+	      m[^/adm/.*/(smppg|bulletinboard)($|\?)])
 	     ));
 }
 
@@ -373,7 +388,7 @@ sub registerurl {
 }
 
 sub innerregister {
-    my ($forcereg, $titletable) = @_;
+    my ($forcereg,$titletable,$bread_crumbs) = @_;
     my $result = '';
     my ($uname,$thisdisfn);
     my $const_space = ($env{'request.state'} eq 'construct');
@@ -396,7 +411,7 @@ sub innerregister {
         $newmail= 'swmenu.setstatus("you have","messages");';
     } 
 
-    my $breadcrumb;
+    my ($breadcrumb,$separator);
     if ($noremote
 	     && ($env{'request.symb'}) 
 	     && ($env{'request.course.id'})) {
@@ -406,10 +421,22 @@ sub innerregister {
 
         my $maptitle = &Apache::lonnet::gettitle($mapurl);
         my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());
-        my @crumbs = ({text  => "Course Content", 
-                       href  => "Javascript:gonav('/adm/navmaps')"}, 
-                      {text  => '...',
-                       no_mt => 1});
+        my $contentstext;
+        if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
+            $contentstext = &mt('Community Contents');
+        } else {
+            $contentstext = &mt('Course Contents');
+        }
+        my @crumbs;
+        unless (($forcereg) && ($env{'request.noversionuri'} eq '/adm/navmaps')
+                && ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
+            @crumbs = ({text  => $contentstext,
+                        href  => "Javascript:gopost('/adm/navmaps','')"});
+        }
+        if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
+            push(@crumbs, {text  => '...',
+                           no_mt => 1});
+        }
 
         push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle 
                                                    && $maptitle ne 'default.sequence' 
@@ -417,9 +444,14 @@ sub innerregister {
 
         push @crumbs, {text => $restitle, no_mt => 1} if $restitle; 
 
-        Apache::lonhtmlcommon::clear_breadcrumbs();
-        Apache::lonhtmlcommon::add_breadcrumb(@crumbs);
-        $breadcrumb .= Apache::lonhtmlcommon::breadcrumbs(undef,undef,0);
+        &Apache::lonhtmlcommon::clear_breadcrumbs();
+        &Apache::lonhtmlcommon::add_breadcrumb(@crumbs);
+        #$breadcrumb .= &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0);
+	unless (($env{'request.state'} eq 'edit') || ($newmail) ||
+		($env{'request.state'} eq 'construct') ||
+		($env{'form.register'})) {
+            $separator = &Apache::loncommon::head_subbox();
+        }
         #
     }
     if ($env{'request.state'} eq 'construct') {
@@ -430,7 +462,7 @@ sub innerregister {
     my $tableend   = ( $noremote ? '</table>' : '');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
-    if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) {
+    if (($env{'request.noversionuri'}!~m{^/(res/)*adm/}) || ($forcereg)) {
 # -- This applies to homework problems for users with grading privileges
 	my $crs='/'.$env{'request.course.id'};
 	if ($env{'request.course.sec'}) {
@@ -536,10 +568,22 @@ sub innerregister {
             }
             # Finally, turn the button on or off
             if ($cfile && !$const_space) {
-                $editbutton=&switch
-                    ('','',6,1,'pcstr.gif','edit[_1]','resource[_2]',
+                my $nocrsedit;
+                # Suppress display where CC has switched to student role.
+                if ($env{'request.course.id'}) {
+                    unless(&Apache::lonnet::allowed('mdc',
+                                                    $env{'request.course.id'})) {
+                        $nocrsedit = 1;
+                    }
+                }
+                if ($nocrsedit) {
+                    $editbutton=&clear(6,1);
+                } else {
+                    $editbutton=&switch
+                       ('','',6,1,'pcstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
-                $noeditbutton = 0;
+                    $noeditbutton = 0;
+                }
             } elsif ($editbutton eq '') {
                 $editbutton=&clear(6,1);
             }
@@ -588,6 +632,14 @@ s&7&1&del.gif&delete[_1]&resource[_2]&go
 s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document
 ENDMENUITEMS
             }
+            if ($noremote) {
+                if (ref($bread_crumbs) eq 'ARRAY') {
+                    &Apache::lonhtmlcommon::clear_breadcrumbs();
+                    foreach my $crumb (@{$bread_crumbs}){
+                        &Apache::lonhtmlcommon::add_breadcrumb($crumb);
+                    }
+                }
+            }
         } elsif ( defined($env{'request.course.id'}) && 
 		 $env{'request.symb'} ne '' ) {
 #
@@ -624,8 +676,8 @@ $menuitems.="Make notes and annotations
                                 "&go('/adm/requestcourse')&Course requests\n";
                 }
             }
-            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
-		if (!$env{'request.enc'}) {
+            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
+		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) {
 		    $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata
 ENDREALRES
@@ -664,50 +716,78 @@ ENDMENUITEMS
 	    my $addremote=0;
 	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
 	    my $inlinebuttons='';
-	    if ($addremote) {
-            # Registered, textual output
-                    if ($env{'environment.icons'} eq 'iconsonly') {
-                        $inlinebuttons=(<<ENDARROWSINLINE);
-<tr><td>
-$inlineremote[21] $inlineremote[23]
-ENDARROWSINLINE
-                        if (&hidden_button_check() ne 'yes') {
-                            $inlinebuttons .= (<<ENDINLINEICONS);
-$inlineremote[61] $inlineremote[63]
-$inlineremote[71] $inlineremote[72] $inlineremote[73]
-$inlineremote[81] $inlineremote[82] $inlineremote[83]
-$inlineremote[91] $inlineremote[92] $inlineremote[93]</td></tr>
-ENDINLINEICONS
-                        }
-                    } else {
-			if ($inlineremote[21] ne '' || $inlineremote[23] ne '') {
-			    $inlinebuttons=(<<ENDFIRSTLINE);
-<tr><td>$inlineremote[21]</td><td>&nbsp;</td><td>$inlineremote[23]</td></tr>
-ENDFIRSTLINE
-                        }
-                        if (&hidden_button_check() ne 'yes') { 
-			    foreach my $row (6..9) {
-				if ($inlineremote[${row}.'1'] ne ''
-				    || $inlineremote[$row.'2'] ne ''
-				    || $inlineremote[$row.'3'] ne '') {
-				    $inlinebuttons .= <<"ENDLINE";
-<tr><td>$inlineremote["${row}1"]</td><td>$inlineremote["${row}2"]</td><td>$inlineremote["${row}3"]</td></tr>
-ENDLINE
-				}
-			    }
-			}
-		    }
-	    }
+    if ($addremote) {
+
+        Apache::lonhtmlcommon::clear_breadcrumb_tools();
+
+            Apache::lonhtmlcommon::add_breadcrumb_tool(
+                'navigation', @inlineremote[21,23]);
+
+        if(hidden_button_check() ne 'yes') {
+            Apache::lonhtmlcommon::add_breadcrumb_tool(
+                'tools', @inlineremote[93,91,81,82,83]);
+
+            #publish button in construction space
+            if ($env{'request.state'} eq 'construct'){
+                Apache::lonhtmlcommon::add_breadcrumb_tool(
+                     'advtools', @inlineremote[63]);
+            }else{
+                Apache::lonhtmlcommon::add_breadcrumb_tool(
+                     'tools', @inlineremote[63]);
+            }
+
+            unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) {
+                Apache::lonhtmlcommon::add_breadcrumb_tool(
+                    'advtools', @inlineremote[61,71,72,73,92]);
+            }
+        }
+
+#       # Registered, textual output
+#        if ( $env{'environment.icons'} eq 'iconsonly' ) {
+#            $inlinebuttons = (<<ENDARROWSINLINE);
+#<tr><td>
+#$inlineremote[21] $inlineremote[23]
+#ENDARROWSINLINE
+#            if ( &hidden_button_check() ne 'yes' ) {
+#                $inlinebuttons .= (<<ENDINLINEICONS);
+#$inlineremote[61] $inlineremote[63]
+#$inlineremote[71] $inlineremote[72] $inlineremote[73]
+#$inlineremote[81] $inlineremote[82] $inlineremote[83]
+#$inlineremote[91] $inlineremote[92] $inlineremote[93]</td></tr>
+#ENDINLINEICONS
+#            }
+#        } else { # not iconsonly
+#            if ( $inlineremote[21] ne '' || $inlineremote[23] ne '' ) {
+#                $inlinebuttons = (<<ENDFIRSTLINE);
+#<tr><td>$inlineremote[21]</td><td>&nbsp;</td><td>$inlineremote[23]</td></tr>
+#ENDFIRSTLINE
+#            }
+#            if ( &hidden_button_check() ne 'yes' ) {
+#                foreach my $row ( 6 .. 9 ) {
+#                    if (   $inlineremote[ ${row} . '1' ] ne ''
+#                        || $inlineremote[ $row . '2' ] ne ''
+#                        || $inlineremote[ $row . '3' ] ne '' )
+#                    {
+#                        $inlinebuttons .= <<"ENDLINE";
+#<tr><td>$inlineremote["${row}1"]</td><td>$inlineremote["${row}2"]</td><td>$inlineremote["${row}3"]</td></tr>
+#ENDLINE
+#                    }
+#                }
+#            }
+#        }
+    }
+        $breadcrumb = &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0);
 	    $result =(<<ENDREGTEXT);
 <script type="text/javascript">
 // BEGIN LON-CAPA Internal
 </script>
 $timesync
 $breadcrumb
-$tablestart
-$inlinebuttons
-$tableend
+<!-- $tablestart -->
+<!-- $inlinebuttons -->
+<!-- $tableend -->
 $newmail
+<!-- $separator -->
 <script type="text/javascript">
 // END LON-CAPA Internal
 </script>
@@ -1065,7 +1145,7 @@ sub switch {
        my $pic=
 	   '<img alt="'.$text.'" src="'.
 	   &Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img).
-	   '" align="'.($nobreak==3?'right':'left').'" class="LC_noBorder" />';
+	   '" align="'.($nobreak==3?'right':'left').'" class="LC_icon" />';
        if ($env{'browser.interface'} eq 'faketextual') {
 # Main Menu
 	   if ($nobreak==3) {
@@ -1091,7 +1171,7 @@ sub switch {
               $inlineremote[$idx]='<a title="'.$desc.'" href="javascript:'.$act.';">'.$pic.'</a>';
            } else {
 	      $inlineremote[$idx]=
-		   '<a class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.
+		   '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.
 		   '<span class="LC_menubuttons_inline_text">'.$desc.'</span></a>';
            }
        }
@@ -1125,15 +1205,15 @@ sub inlinemenu {
     undef(%category_members);
 # calling rawconfig with "1" will evaluate mydesk.tab, even if there is no active remote control
     &rawconfig(1);
-    my $output='<table id="LC_mainmenu"><tr>';
+    my $output='<table><tr>';
     for (my $col=1; $col<=2; $col++) {
         $output.='<td class="LC_mainmenu_col_fieldset">';
         for (my $row=1; $row<=8; $row++) {
             foreach my $cat (keys(%category_members)) {
                if ($category_positions{$cat} ne "$col,$row") { next; }
                #$output.='<table><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
-               $output.='<div class="LC_Box">';
-	       $output.='<h4 class="LC_hcell">'.&mt($category_names{$cat}).'</h4>';
+               $output.='<div class="LC_Box LC_400Box">';
+	       $output.='<h3 class="LC_hcell">'.&mt($category_names{$cat}).'</h3>';
                $output.='<table>';
                my %active=();
                foreach my $menu_item (split(/\:/,$category_members{$cat})) {
@@ -1175,12 +1255,14 @@ sub rawconfig {
     my $show_course=&Apache::loncommon::show_course();
     my $author=$env{'user.author'};
     my $crs='';
+    my $crstype='';
     if ($env{'request.course.id'}) {
        $crs='/'.$env{'request.course.id'};
        if ($env{'request.course.sec'}) {
 	   $crs.='_'.$env{'request.course.sec'};
        }
        $crs=~s/\_/\//g;
+       $crstype = &Apache::loncommon::course_type();
     }
     my $pub=($env{'request.state'} eq 'published');
     my $con=($env{'request.state'} eq 'construct');
@@ -1190,16 +1272,17 @@ sub rawconfig {
         my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line);
         $prt=~s/\$uname/$uname/g;
         $prt=~s/\$udom/$udom/g;
-        $prt=~s/\$crs/$crs/g; 
+        if ($prt =~ /\$crs/) {
+            next unless ($env{'request.course.id'});
+            next if ($crstype eq 'Community');
+            $prt=~s/\$crs/$crs/g;
+        } elsif ($prt =~ /\$cmty/) {
+            next unless ($env{'request.course.id'});
+            next if ($crstype ne 'Community');
+            $prt=~s/\$cmty/$crs/g;
+        }
         $prt=~s/\$requested_domain/$requested_domain/g;
         if ($category_names{$cat}!~/\w/) { $cat='oth'; }
-        my $type = &Apache::loncommon::course_type();
-#
-# I don't think we support this
-#
-#        if ($type eq 'Group') {
-#            $desc = &convert_menu_function($desc,$type);
-#        }
         if ($pro eq 'clear') {
 	    $output.=&clear($row,$col);
         } elsif ($pro eq 'any') {
@@ -1226,26 +1309,69 @@ sub rawconfig {
 	  $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
             }
         } elsif (($pro=~/^p(\w+)/) && ($prt)) {
-	    if (&Apache::lonnet::allowed($1,$prt)) {
+            my $priv = $1;
+            if ($priv =~ /^mdc(Course|Community)/) {
+                if ($crstype eq $1) {
+                    $priv = 'mdc';
+                } else {
+                    next;
+                }
+            }
+	    if (&Apache::lonnet::allowed($priv,$prt)) {
                $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
             }
-        } elsif ($pro eq 'course') {
-            if ($env{'request.course.fn'}) {
+        } elsif ($pro eq 'course')  {
+            if (($env{'request.course.fn'}) && ($crstype ne 'Community')) {
                $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
 	    }
+        } elsif ($pro eq 'community')  {
+            if (($env{'request.course.fn'}) && ($crstype eq 'Community')) {
+               $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+            }
         } elsif ($pro =~ /^courseenv_(.*)$/) {
             my $key = $1;
-            if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) {
-                $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+            if ($crstype ne 'Community') {
+                my $coursepref = $env{'course.'.$env{'request.course.id'}.'.'.$key};
+                if ($key eq 'canuse_pdfforms') {
+                    if ($env{'request.course.id'} && $coursepref eq '') {
+                        my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+                        $coursepref = $domdefs{'canuse_pdfforms'};
+                    }
+                }
+                if ($coursepref) { 
+                    $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+                }
+            }
+        } elsif ($pro =~ /^communityenv_(.*)$/) {
+            my $key = $1;
+            if ($crstype eq 'Community') {
+                my $coursepref = $env{'course.'.$env{'request.course.id'}.'.'.$key};
+                if ($key eq 'canuse_pdfforms') {
+                    if ($env{'request.course.id'} && $coursepref eq '') {
+                        my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+                        $coursepref = $domdefs{'canuse_pdfforms'};
+                    }
+                }
+                if ($coursepref) { 
+                    $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+                }
             }
         } elsif ($pro =~ /^course_(.*)$/) {
             # Check for permissions inside of a course
-            if (($env{'request.course.id'}) &&
+            if (($env{'request.course.id'}) && ($crstype ne 'Community') && 
                 (&Apache::lonnet::allowed($1,$env{'request.course.id'}.
             ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
                  )) {
                 $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
 	    }
+        } elsif ($pro =~ /^community_(.*)$/) {
+            # Check for permissions inside of a community
+            if (($env{'request.course.id'}) && ($crstype eq 'Community') &&   
+                (&Apache::lonnet::allowed($1,$env{'request.course.id'}.
+            ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
+                 )) {
+                $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+            }
         } elsif ($pro eq 'author') {
             if ($author) {
                 if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) ||
@@ -1373,6 +1499,31 @@ function gonav(url) {
 NAVCONTROL
 }
 
+sub dc_popup_js {
+    my %lt = &Apache::lonlocal::texthash(
+                                          more => '(More ...)',
+                                          less => '(Less ...)',
+                                        );
+    return <<"END";
+
+function showCourseID() {
+    document.getElementById('dccid').style.display='block';
+    document.getElementById('dccid').style.textAlign='left';
+    document.getElementById('dccid').style.textFace='normal';
+    document.getElementById('dccidtext').innerHTML ='<a href="javascript:hideCourseID();">$lt{'less'}</a>';
+    return;
+}
+
+function hideCourseID() {
+    document.getElementById('dccid').style.display='none';
+    document.getElementById('dccidtext').innerHTML ='<a href="javascript:showCourseID()">$lt{'more'}</a>';
+    return;
+}
+
+END
+
+}
+
 sub utilityfunctions {
     my $caller = shift;
     unless ($env{'environment.remote'} eq 'off' || 
@@ -1380,11 +1531,23 @@ sub utilityfunctions {
             return ''; }
             
     my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
+    if ($currenturl =~ m{^/adm/wrapper/ext/}) {
+        if ($env{'request.external.querystring'}) {
+            $currenturl .= ($currenturl=~/\?/)?'&':'?'.$env{'request.external.querystring'};
+        }
+    }
     $currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
     
     my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
     my $nav_control=&nav_control_js();
 
+    my $dc_popup_cid;
+    if ($env{'user.adv'} && exists($env{'user.role.dc./'.
+                        $env{'course.'.$env{'request.course.id'}.
+                                 '.domain'}.'/'})) {
+        $dc_popup_cid = &dc_popup_js();
+    }
+
     my $start_page_annotate = 
         &Apache::loncommon::start_page('Annotator',undef,
 				       {'only_body' => 1,
@@ -1412,6 +1575,7 @@ return (<<ENDUTILITY)
     var currentSymb="$currentsymb";
 
 $nav_control
+$dc_popup_cid
 
 function go(url) {
    if (url!='' && url!= null) {
@@ -1421,6 +1585,12 @@ function go(url) {
    }
 }
 
+function gotop(url) {
+    if (url!='' && url!= null) {
+        top.location.href = url;
+    }
+}
+
 function gopost(url,postdata) {
    if (url!='') {
       this.document.server.action=url;
@@ -1497,7 +1667,7 @@ function catalog_info() {
 }
 
 function chat_win() {
-   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
+   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no');
 }
 
 function group_chat(group) {
@@ -1510,7 +1680,7 @@ function edit_bookmarks() {
    go('');
    w_BookmarkPal_flag=1;
    bookmarkpal=window.open("/adm/bookmarks",
-               "BookmarkPal", "width=400,height=505,scrollbars=0");
+               "BookmarkPal", "width=500,height=505,scrollbars=0");
 }
 
 function annotate() {
@@ -1591,22 +1761,6 @@ sub get_nav_status {
     return $navstatus;
 }
 
-#FIXME this needs to move into mydesk.tab and the other locations 
-# the text is generated
-#
-# We currently do not support this anyway.
-#
-#sub convert_menu_function {
-#    my ($rolename,$type) = @_;
-#    if ($type eq 'Group') {
-#        $rolename =~ s/student/member/g;
-#        $rolename =~ s/group/team/g;
-#        $rolename =~ s/course/group/g;
-#        $rolename =~ s/Course/Group/g;
-#    }
-#    return $rolename;
-#}
-
 sub hidden_button_check {
     my $hidden;
     if ($env{'request.course.id'} eq '') {
@@ -1621,12 +1775,19 @@ sub hidden_button_check {
 
 sub roles_selector {
     my ($cdom,$cnum) = @_;
+    my $crstype = &Apache::loncommon::course_type();
     my $now = time;
     my (%courseroles,%seccount);
     my $is_cc;
     my $role_selector;
-    if ($env{'user.role.cc./'.$cdom.'/'.$cnum}) {
-        my ($start,$end) = split(/\./,$env{'user.role.cc./'.$cdom.'/'.$cnum});
+    my $ccrole;
+    if ($crstype eq 'Community') {
+        $ccrole = 'co';
+    } else {
+        $ccrole = 'cc';
+    } 
+    if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) {
+        my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum});
         
         if ((($start) && ($start<0)) || 
             (($end) && ($end<$now))  ||
@@ -1670,15 +1831,21 @@ sub roles_selector {
             }
         }
     }
-    my @roles_order = ('cc','in','ta','ep','ad','st');
+    my $switchtext;
+    if ($crstype eq 'Community') {
+        $switchtext = &mt('Switch community role to...')
+    } else {
+        $switchtext = &mt('Switch course role to...')
+    }
+    my @roles_order = ($ccrole,'in','ta','ep','ad','st');
     if (keys(%courseroles) > 1) {
         $role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles);
         $role_selector .= '<form name="rolechooser" method="post" action="/adm/roles">
                           <select name="switchrole" onchange="javascript:adhocRole('."'switchrole'".')">';
-        $role_selector .= '<option value="">'.&mt('Switch course role to...').'</option>';
+        $role_selector .= '<option value="">'.$switchtext.'</option>';
         foreach my $role (@roles_order) {
             if (defined($courseroles{$role})) {
-                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>'; 
+                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>'; 
             }
         }
         foreach my $role (sort(keys(%courseroles))) {
@@ -1688,7 +1855,7 @@ sub roles_selector {
         }
         $role_selector .= '</select>'."\n".
                '<input type="hidden" name="destinationurl" value="'.
-               $ENV{'REQUEST_URI'}.'" />'."\n".
+               &HTML::Entities::encode($ENV{'REQUEST_URI'}).'" />'."\n".
                '<input type="hidden" name="gotorole" value="1" />'."\n".
                '<input type="hidden" name="selectrole" value="" />'."\n".
                '<input type="hidden" name="switch" value="1" />'."\n".
@@ -1866,34 +2033,34 @@ END
 
 BEGIN {
     if (! defined($readdesk)) {
-	{
-	    my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab';
-	    if ( CORE::open( my $config,"<$tabfile") ) {
-		while (my $configline=<$config>) {
-		    $configline=(split(/\#/,$configline))[0];
-		    $configline=~s/^\s+//;
-		    chomp($configline);
+        {
+            my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab';
+            if ( CORE::open( my $config,"<$tabfile") ) {
+                while (my $configline=<$config>) {
+                    $configline=(split(/\#/,$configline))[0];
+                    $configline=~s/^\s+//;
+                    chomp($configline);
                     if ($configline=~/^cat\:/) {
-                       my @entries=split(/\:/,$configline);
-                       $category_positions{$entries[2]}=$entries[1];
-                       $category_names{$entries[2]}=$entries[3];
-		    } elsif ($configline) {
-			push(@desklines,$configline);
-		    }
-		}
-		CORE::close($config);
-	    }
-	}
-	$readdesk='done';
+                        my @entries=split(/\:/,$configline);
+                        $category_positions{$entries[2]}=$entries[1];
+                        $category_names{$entries[2]}=$entries[3];
+                    } elsif ($configline=~/^prim\:/) {
+                        my @entries = (split(/\:/, $configline))[1..5];
+                        push @primary_menu, \@entries;
+                    } elsif ($configline=~/^scnd\:/) {
+                        my @entries = (split(/\:/, $configline))[1..5];
+                        push @secondary_menu, \@entries; 
+                    } elsif ($configline) {
+                        push(@desklines,$configline);
+                    }
+                }
+                CORE::close($config);
+            }
+        }
+        $readdesk='done';
     }
 }
 
 1;
 __END__
 
-
-
-
-
-
-