--- loncom/interface/loncommon.pm	2009/12/15 05:08:50	1.925.2.5
+++ loncom/interface/loncommon.pm	2009/12/08 14:44:17	1.926
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.925.2.5 2009/12/15 05:08:50 raeburn Exp $
+# $Id: loncommon.pm,v 1.926 2009/12/08 14:44:17 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4467,10 +4467,6 @@ sub bodytag {
 		   'link'    => &designparm($function.'.link',$domain),);
     @design{keys(%$addentries)} = @$addentries{keys(%$addentries)}; 
 
-    my $custommenu;
-    if ($env{'environment.remote'} eq 'off') {
-        $custommenu = &needs_gci_custom();
-    }
  # role and realm
     my ($role,$realm) = split(/\./,$env{'request.role'},2);
     if ($role  eq 'ca') {
@@ -4480,22 +4476,14 @@ sub bodytag {
 # realm
     if ($env{'request.course.id'}) {
         if ($env{'request.role'} !~ /^cr/) {
-            if (($custommenu) && ($role eq 'cm')) {
-                undef($role);
-            } else {
-                $role = &Apache::lonnet::plaintext($role,&course_type());
-            }
+            $role = &Apache::lonnet::plaintext($role,&course_type());
         }
         if ($env{'request.course.sec'}) {
             $role .= (' 'x2).'- '.&mt('section:').' '.$env{'request.course.sec'};
         }   
 	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
     } else {
-        if (($custommenu) && ($role eq 'cm')) {
-            undef($role);
-        } else {
-            $role = &Apache::lonnet::plaintext($role);
-        }
+        $role = &Apache::lonnet::plaintext($role);
     }
 
     if (!$realm) { $realm=' '; }
@@ -4546,17 +4534,7 @@ sub bodytag {
         #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
         #    }
 
-        my $role_selector;
-        if (($custommenu) && ($env{'request.course.id'}) && 
-            ($env{'course.'.$env{'request.course.id'}.'.domain'} eq 'gcitest') &&
-            ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) {
-            $role_selector = &Apache::lonmenu::roles_selector(
-                        $env{'course.' . $env{'request.course.id'} . '.domain'},
-                        $env{'course.' . $env{'request.course.id'} . '.num'}  );
-            if ($role_selector) {
-                $role_selector = '<br />'.$role_selector;
-            }
-        }
+
 
         if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
              if ($dc_info) {
@@ -4567,10 +4545,10 @@ sub bodytag {
             return $bodytag;
         }
 
-        $bodytag .= qq|<div id="LC_nav_bar">$name $role $role_selector</div>|;
+        $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>|;
 
         $bodytag .= Apache::lonhtmlcommon::scripttag(
-            Apache::lonmenu::utilityfunctions('',$custommenu), 'start');
+            Apache::lonmenu::utilityfunctions(), 'start');
 
         $bodytag .= Apache::lonmenu::primary_menu();
 
@@ -4581,12 +4559,7 @@ sub bodytag {
 
         #don't show menus for public users
         if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
-            if (($custommenu) && 
-                ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) {
-                $bodytag .= &Apache::lonmenu::gci_secondary_menu();
-            } else { 
-                $bodytag .= Apache::lonmenu::secondary_menu();
-            }
+            $bodytag .= Apache::lonmenu::secondary_menu();
             $bodytag .= Apache::lonmenu::serverform();
             $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
             if ($env{'request.state'} eq 'construct') {
@@ -5542,10 +5515,6 @@ table.LC_notify_front_page td {
   font-size: 1.2em;
 }
 
-.LC_topic_bar img {
-  vertical-align: bottom;
-}
-
 table.LC_course_group_status {
   margin: 20px;
 }
@@ -6446,36 +6415,6 @@ ul.LC_funclist li {
   line-height: 150%;
 }
 
-#gciheader {
-  float:left;
-  width:100%;
-  background:#DAE0D2 url("/gcimenu_bg.gif") repeat-x bottom;
-  font-size:93%;
-  line-height:normal;
-}
-#gciheader ul {
-  margin:0;
-  padding:10px 10px 0;
-  list-style:none;
-}
-#gciheader li {
-  float:left;
-  background:url("/gcimenu_left.gif") no-repeat left top;
-  margin:0;
-  padding:0 0 0 9px;
-}
-#gciheader a {
-  display:block;
-  background:url("/gcimenu_right.gif") no-repeat right top;
-  padding:5px 15px 4px 6px;
-}
-#gciheader #current {
-  background-image:url("/gcimenu_left_on.gif");
-}
-#gciheader #current a {
-  background-image:url("/gcimenu_right_on.gif");
-  padding-bottom:5px;
-}
 
 END
 }
@@ -10738,76 +10677,6 @@ sub clean_symb {
     return ($symb,$enc);
 }
 
-sub needs_gci_custom {
-    my $custommenu;
-    my $numdc = &check_for_gci_dc();
-    unless ($numdc) {
-        my $then=$env{'user.login.time'};
-        my $now = time;
-        my %cnums = (
-                        review => '9615072b469884921gcil1',
-                        submit => '1H96711d710194bfegcil1',
-                    );
-        if ($env{'user.role.st./gci/'.$cnums{'review'}}) {
-            my ($start,$end) =
-                split('.',$env{'user.role.st./gci/'.$cnums{'review'}});
-            if (((!$start) || ($start && $start <= $now)) &&
-                ((!$end) || ($end > $now))) {
-                $custommenu = 1;
-                if ($env{'user.role.cc./gci/'.$cnums{'review'}}) {
-                    my ($ccstart,$ccend) =
-                        split('.',$env{'user.role.cc./gci/'.$cnums{'review'}});
-                    if (((!$start) || ($start && $start <= $now)) &&
-                            ((!$end) || ($end > $now))) {
-                        $custommenu = '';
-                    }
-                }
-            }
-        }
-    }
-    return $custommenu;
-}
-
-sub check_for_gci_dc {
-    my $then=$env{'user.login.time'};
-    my $numdc = 0;
-    foreach my $dom ('gci','gcitest') {
-        if ($env{'user.role.dc./'.$dom.'/'}) {
-            my $livedc = 1;
-            my ($tstart,$tend)=split(/\./,$env{'user.role.dc./'.$dom.'/'});
-            if ($tstart && $tstart>$then) { $livedc = 0; }
-            if ($tend   && $tend  <$then) { $livedc = 0; }
-            if ($livedc) {
-                $numdc++;
-            }
-        }
-    }
-    return $numdc;
-}
-
-sub existing_gcitest_courses {
-    my %courses;
-    my $cdom = 'gcitest';
-    my $role = 'cc';
-    my $now = time;
-    foreach my $envkey (keys(%env)) {
-        my $cnum;
-        if ($envkey =~ m{^user\.role\.\Q$role\E\./\Q$cdom\E/($match_courseid)$}) {
-            $cnum = $1;
-        } else {
-            next;
-        }
-        my ($tstart,$tend) = split(':',$env{$envkey});
-        if (((!$tstart) || ($tstart < $now)) && ((!$tend) || ($tend > $now))) {
-            my $descr = $env{'course.'.$cdom.'_'.$cnum.'.description'};
-            if ($descr ne '') {
-                $courses{$cdom.'_'.$cnum}{'description'} = $descr;
-            }
-        }
-    }
-    return %courses;
-}
-
 =pod
 
 =back