--- loncom/interface/lonmenu.pm	2009/10/29 16:15:57	1.297
+++ loncom/interface/lonmenu.pm	2009/11/30 21:29:47	1.308
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.297 2009/10/29 16:15:57 raeburn Exp $
+# $Id: lonmenu.pm,v 1.308 2009/11/30 21:29:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -150,7 +150,7 @@ sub prep_menuitem {
     } else {             # textual Link
         $link = &mt($$menuitem[3]);
     }
-    return '<li><a href="'.$$menuitem[0].'" target="_top">'.$link.'</a></li>';
+    return '<li><a href="'.$$menuitem[0].'">'.$link.'</a></li>';
 }
 
 # primary_menu() evaluates @primary_menu and returns XHTML for the menu
@@ -230,12 +230,12 @@ sub secondary_menu {
         next if $$menuitem[4] =~ /^(no|)remotenavCommunity$/ 
                 && $crstype ne 'Community';
         next if    $$menuitem[4]   =~ /showgroups$/
-                && $canviewgrps
+                && !$canviewgrps
                 && !%groups;
 
         if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
             # special treatment for role selector
-            my $roles_selector = roles_selector(
+            my $roles_selector = &roles_selector(
                         $env{'course.' . $env{'request.course.id'} . '.domain'},
                         $env{'course.' . $env{'request.course.id'} . '.num'}  );
 
@@ -512,7 +512,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');
@@ -545,7 +545,13 @@ sub innerregister {
 
         my $maptitle = &Apache::lonnet::gettitle($mapurl);
         my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());
-        my @crumbs = ({text  => "Course Contents", 
+        my $contentstext;
+        if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
+            $contentstext = &mt('Community Contents');
+        } else {
+            $contentstext = &mt('Course Contents');
+        }
+        my @crumbs = ({text  => $contentstext, 
                        href  => "Javascript:gonav('/adm/navmaps')"});
 
         if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
@@ -561,7 +567,7 @@ sub innerregister {
 
         &Apache::lonhtmlcommon::clear_breadcrumbs();
         &Apache::lonhtmlcommon::add_breadcrumb(@crumbs);
-        $breadcrumb .= &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0);
+        #$breadcrumb .= &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0);
 	unless (($env{'request.state'} eq 'edit') || ($newmail) ||
 		($env{'request.state'} eq 'construct') ||
 		($env{'form.register'})) {
@@ -683,10 +689,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);
             }
@@ -735,6 +753,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 '' ) {
 #
@@ -811,51 +837,88 @@ 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) {
+
+        #SD START (work in progress!)
+        Apache::lonhtmlcommon::clear_breadcrumb_tools();
+        # Arrows for navigation
+        Apache::lonhtmlcommon::add_breadcrumb_tool( 'A', $inlineremote[21] );
+        Apache::lonhtmlcommon::add_breadcrumb_tool( 'A', $inlineremote[23] );
+        if(hidden_button_check() ne 'yes'){
+            # notes
+            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[93]);
+            # bookmark
+            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[91]);
+            # evaluate
+            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[81]);
+            # feedback
+            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[82]);
+            # print
+            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[83]);
+            # metadata
+            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[63]);
+
+            # ?
+            Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[61]);
+            # ?
+            Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[71]);
+            # ?
+            Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[72]);
+            # ?
+            Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[73]);
+            # ?
+            Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[92]);
+
+        }
+
+        #SD END
+#       # 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
+#                    }
+#                }
+#            }
+#        }
+    }
+        #SD see below
+        $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
+<!-- $separator -->
 <script type="text/javascript">
 // END LON-CAPA Internal
 </script>
@@ -1213,7 +1276,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) {
@@ -1239,7 +1302,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>';
            }
        }
@@ -1398,15 +1461,31 @@ sub rawconfig {
             }
         } elsif ($pro =~ /^courseenv_(.*)$/) {
             my $key = $1;
-            if (($env{'course.'.$env{'request.course.id'}.'.'.$key}) && 
-                ($crstype ne 'Community')) {
-                $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 (($env{'course.'.$env{'request.course.id'}.'.'.$key}) && 
-                ($crstype eq 'Community')) {
-                $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
+            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
@@ -1551,6 +1630,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' || 
@@ -1568,6 +1672,13 @@ sub utilityfunctions {
     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,
@@ -1595,6 +1706,7 @@ return (<<ENDUTILITY)
     var currentSymb="$currentsymb";
 
 $nav_control
+$dc_popup_cid
 
 function go(url) {
    if (url!='' && url!= null) {
@@ -1794,16 +1906,19 @@ sub hidden_button_check {
 
 sub roles_selector {
     my ($cdom,$cnum) = @_;
-    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
-    if ($crstype eq '') {
-        $crstype = 'Course';
-    }
+    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))  ||
@@ -1853,7 +1968,7 @@ sub roles_selector {
     } else {
         $switchtext = &mt('Switch course role to...')
     }
-    my @roles_order = ('cc','in','ta','ep','ad','st');
+    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">
@@ -1861,7 +1976,7 @@ sub roles_selector {
         $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))) {