--- loncom/interface/lonmenu.pm	2006/05/15 16:23:58	1.181
+++ loncom/interface/lonmenu.pm	2006/07/18 21:55:24	1.198
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.181 2006/05/15 16:23:58 albertel Exp $
+# $Id: lonmenu.pm,v 1.198 2006/07/18 21:55:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,6 +44,8 @@ use Apache::lonhtmlcommon();
 use Apache::loncommon();
 use Apache::lonenc();
 use Apache::lonlocal;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 use vars qw(@desklines $readdesk);
 
@@ -61,7 +63,9 @@ sub initlittle {
                                        'docs' => 'Course Documents',
                                        'exit' => 'Exit',
 				       'launch' => 'Launch Remote Control',
-                                       'groups' => 'Groups');
+                                       'groups' => 'Groups',
+                                       'gdoc' => 'Group Documents',
+                                       );
 }
 
 # ============================= This gets called at the top of the body section
@@ -83,23 +87,23 @@ sub menubuttons {
     my $docs='';
     my $groups='';
     my $showgroups=0;
-    my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
-    my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
+    my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
+    my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
 
     if ($env{'request.state'} eq 'construct') {
         if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
             my $returnurl = $env{'request.filename'};
             $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:;
-            $escurl = &Apache::lonnet::escape($returnurl);
+            $escurl = &escape($returnurl);
         }
     }
     if ($env{'request.course.id'}) {
         my %coursegroups;
-        my $viewgrps_permission =                                                
-                     &Apache::lonnet::allowed('vcg',$env{'request.course.id'});
+        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'},$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
-        }
+	}
         if ((keys(%coursegroups) > 0) || ($viewgrps_permission)) {
             $showgroups = 1;
         }
@@ -114,7 +118,7 @@ ENDNAV
             if (($env{'request.noversionuri'}=~/^\/adm\//) &&
          ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
          ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
-                my $escreload=&Apache::lonnet::escape('return:');
+                my $escreload=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
 ENDRELOAD
@@ -126,7 +130,7 @@ ENDDOCS
             }
             if ($showgroups) {
                 $groups =(<<ENDGROUPS);
-<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td>
+<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a>
 ENDGROUPS
             }
 	}
@@ -170,11 +174,8 @@ ENDMAINMENU
       <td>
         <a href="/adm/logout" target="_top">$lt{'exit'}</a>
      </td>
-     <td align="right">
-       <img align="right" src="$logo" alt="Logo" />
-       <b>LON-CAPA</b>&nbsp;
-     </td>
-   </tr>
+     <td class="LC_top_nav_logo">LON-CAPA<img src="$logo" alt="Logo" /></td>
+    </tr>
   </table>
 </font>
 ENDINLINEMENU
@@ -189,9 +190,11 @@ ENDINLINEMENU
 	    $navmaps=(<<ENDNAV);
 <td><a href="$link" target="_top">$lt{'nav'}</a></td>
 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);
-<td><a href="/adm/coursedocs" target="_top">$lt{'docs'}</a></td>
+<td><a href="/adm/coursedocs" target="_top">$text</a></td>
 ENDDOCS
             }
             if ($showgroups) {
@@ -209,14 +212,14 @@ ENDGROUPS
 		        m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
 		  )
 		 ) {
-                my $escreload=&Apache::lonnet::escape('return:');
+                my $escreload=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
 ENDRELOAD
             }
         }
 	if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
-	    my $escreload=&Apache::lonnet::escape('return:');
+	    my $escreload=&escape('return:');
 	    $reloadlink=(<<ENDCRELOAD);
 <td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
 ENDCRELOAD
@@ -232,6 +235,8 @@ ENDCRELOAD
 	if ($env{'user.adv'}) {
 	    $remote = '<td><a href="/adm/remote?action=launch&amp;url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>'
 	}
+
+        my $helplink=&Apache::loncommon::top_nav_help('Help');
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
 // BEGIN LON-CAPA Internal
@@ -241,6 +246,8 @@ $utility
 </script>
 <table id="LC_top_nav">
 <tr>
+<td class="LC_top_nav_logo">
+<a href="/adm/about.html"><img src="$logo" alt="LON-CAPA Logo" align="left" border="0" /></a></td>
 <td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>
 $reloadlink
 $navmaps
@@ -248,8 +255,8 @@ $docs
 $groups
 $remote
 <td><a href="/adm/roles" target="_top">$lt{'roles'}</a></td>
-<td><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
-<td class="LC_top_nav_logo"><img align="right" src="$logo" alt="Logo" /><b>LON-CAPA</b></td>
+<td>$helplink</td>
+<td class="LC_top_logout"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
 </tr>
 </table>
 $form
@@ -277,7 +284,7 @@ sub registerurl {
         ($env{'environment.remote'} eq 'off') ||
         ((($env{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map(
-	   &Apache::lonnet::unescape($env{'request.noversionuri'})))) &&
+	   &unescape($env{'request.noversionuri'})))) &&
         (!$forcereg))) {
  	return $result.
           '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
@@ -378,7 +385,7 @@ sub innerregister {
 	    &Apache::lonnet::allowed('opa',$crs)) {
 	    $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',
 			     "gocmd('/adm/parmset','set')",
-			     'Modify deadlines, etc, for this resource');
+			     'Modify parameter settings for this resource');
 	}
 # -- End Homework
         ###
@@ -437,10 +444,7 @@ sub innerregister {
                     ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
             } elsif ($editbutton eq '') {
-                $editbutton=&switch('','',6,1,'port.gif',
-				    'port-[_1]','folio[_1]',
-				    "go('/adm/portfolio');",
-				    "Enter my portfolio space");
+                $editbutton=&clear(6,1);
             }
         }
         ###
@@ -531,7 +535,7 @@ ENDREGTEXT
 # Registered, graphical output
         } else {
 	    my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
-	    $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri));
+	    $requri=&Apache::lonenc::check_encrypt(&unescape($requri));
 	    my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
 	    my $navstatus=&get_nav_status();
 	    my $clearcstr;
@@ -646,7 +650,7 @@ sub startupremote {
 # The Remote actually gets launched!
 #
     my $configmenu=&rawconfig();
-    my $esclowerurl=&Apache::lonnet::escape($lowerurl);
+    my $esclowerurl=&escape($lowerurl);
     my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
     return(<<ENDREMOTESTARTUP);
 <script type="text/javascript">
@@ -729,9 +733,9 @@ sub load_remote_msg {
     if (($env{'browser.interface'} eq 'textual') ||
         ($env{'environment.remote'} eq 'off')) { return ''; }
 
-    my $esclowerurl=&Apache::lonnet::escape($lowerurl);
+    my $esclowerurl=&escape($lowerurl);
     my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
-		    "/adm/remote?action=collapse?url=$esclowerurl");
+		 "/adm/remote?action=collapse&amp;url=$esclowerurl");
     return(<<ENDREMOTEFORM);
 <p>
 <form name="wheel">
@@ -772,7 +776,7 @@ ENDRESIZE
     $returnval.=(<<ENDOPEN);
 window.status='Opening LON-CAPA Remote Control';
 var menu=window.open("/res/adm/pages/menu.html","$menuname",
-"height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
+"height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
 self.name='loncapaclient';
 ENDOPEN
     return '<script type="text/javascript">'.$returnval.'</script>';
@@ -919,12 +923,16 @@ sub rawconfig {
     my $con=($env{'request.state'} eq 'construct');
     my $rol=$env{'request.role'};
     my $requested_domain = $env{'request.role.domain'};
-    foreach (@desklines) {
-        my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$_);
+    foreach my $line (@desklines) {
+        my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$line);
         $prt=~s/\$uname/$uname/g;
         $prt=~s/\$udom/$udom/g;
         $prt=~s/\$crs/$crs/g; 
         $prt=~s/\$requested_domain/$requested_domain/g;
+        my $type = &Apache::loncommon::course_type();
+        if ($type eq 'Group') {
+            $desc = &convert_menu_function($desc,$type);
+        }
         if ($pro eq 'clear') {
 	    $output.=&clear($row,$col);
         } elsif ($pro eq 'any') {
@@ -1045,7 +1053,7 @@ sub utilityfunctions {
     unless (($env{'browser.interface'} eq 'textual')  ||
         ($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
     my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
-    $currenturl=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($currenturl));
+    $currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
     
     my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
     my $nav_control=&nav_control_js();
@@ -1253,6 +1261,20 @@ sub get_nav_status {
     return $navstatus;
 }
 
+#FIXME this needs to move into mydesktab and the other locations 
+# the text is generated
+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;
+}
+
+
 # ================================================================ Main Program
 
 BEGIN {