--- loncom/interface/loncommon.pm	2009/10/22 13:41:41	1.901
+++ loncom/interface/loncommon.pm	2009/10/26 18:59:16	1.903
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.901 2009/10/22 13:41:41 bisitz Exp $
+# $Id: loncommon.pm,v 1.903 2009/10/26 18:59:16 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4444,48 +4444,44 @@ sub bodytag {
 
     if ($env{'environment.remote'} eq 'off') {
         # No Remote
-        if ($env{'request.state'} eq 'construct') {
-            $forcereg=1;
-        }
+        if ($no_nav_bar) { return $bodytag; } 
 
-    #    if ($env{'request.state'} eq 'construct') {
-    #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
-    #    }
+        if ($env{'request.state'} eq 'construct') { $forcereg=1; }
 
-        my $titletable = '<table id="LC_title_bar">'
-                            ."<tr><td> $titleinfo $dc_info</td>"
-                            .'</tr></table>';
+        #    if ($env{'request.state'} eq 'construct') {
+        #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
+        #    }
 
-        if ($no_nav_bar) {
-            $bodytag .= $titletable;
-        } else {
-            $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
-                <em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'};
+        $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
+            <em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'};
 
-#SD $titletable is obsolete
-#SD            if ($env{'request.state'} eq 'construct') {
-#SD                $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$titletable);
-#SD            } else {
-#SD                $bodytag .= &Apache::lonmenu::menubuttons($forcereg).$titletable;
-#SD            }
-               if (   $env{'form.inhibitmenu'} eq 'yes' 
-                   || $ENV{'REQUEST_URI'} eq '/adm/logout'
-                   || $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
-                   
-                   return $bodytag;
-               }
+        if (   $env{'form.inhibitmenu'} eq 'yes' 
+            || $ENV{'REQUEST_URI'} eq '/adm/logout'
+            || $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
 
-               $bodytag .= Apache::lonhtmlcommon::scripttag(
-                                Apache::lonmenu::utilityfunctions(),
-                                'start');
-               $bodytag .= Apache::lonmenu::primary_menu();
-               $bodytag .= Apache::lonmenu::secondary_menu();
-               #SD remove next line
-               #$bodytag .= Apache::lonmenu::menubuttons($forcereg);
-               $bodytag .= Apache::lonmenu::serverform();
-               $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); 
-               $bodytag .= Apache::lonmenu::innerregister($forcereg) if $forcereg;
+            return $bodytag;
         }
+
+        $bodytag .= Apache::lonhtmlcommon::scripttag(
+            Apache::lonmenu::utilityfunctions(), 'start');
+
+        $bodytag .= Apache::lonmenu::primary_menu();
+
+        #don't show menus for public users
+        if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
+            $bodytag .= Apache::lonmenu::secondary_menu();
+            $bodytag .= Apache::lonmenu::serverform();
+            $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); 
+            $bodytag .= Apache::lonmenu::innerregister($forcereg) if $forcereg;
+        }else{
+            # this is to seperate menu from content when there's no secondary
+            # menu. Especially needed for public accessible ressources.
+            $bodytag .= '<hr style="clear:both" />';
+            $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); 
+        }
+
+        #SD testing
+        #$bodytag .= Apache::lonmenu::menubuttons($forcereg);
         return $bodytag;
     }
 
@@ -10244,6 +10240,16 @@ sub group_term {
     return $names{$crstype};
 }
 
+sub course_types {
+    my @types = ('official','unofficial','community');
+    my %typename = (
+                         official   => 'Official course',
+                         unofficial => 'Unofficial course',
+                         community  => 'Community',
+                   );
+    return (\@types,\%typename);
+}
+
 sub icon {
     my ($file)=@_;
     my $curfext = lc((split(/\./,$file))[-1]);