[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm lonmenu.pm

[albertel]

albertel		Thu Jun 29 14:43:34 2006 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm loncommon.pm 
  Log:
  - BUG#4843, space readded between logo and lon-capa text
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.187 loncom/interface/lonmenu.pm:1.188
--- loncom/interface/lonmenu.pm:1.187	Wed Jun 28 16:56:00 2006
+++ loncom/interface/lonmenu.pm	Thu Jun 29 14:43:33 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.187 2006/06/28 20:56:00 albertel Exp $
+# $Id: lonmenu.pm,v 1.188 2006/06/29 18:43:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,7 +63,7 @@
                                        'docs' => 'Course Documents',
                                        'exit' => 'Exit',
 				       'launch' => 'Launch Remote Control',
-                                       'groups' => 'Course Groups',
+                                       'groups' => 'Groups',
                                        'gdoc' => 'Group Documents',
                                        'teams' => 'Teams',
                                        );
@@ -100,11 +100,11 @@
     }
     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'});
         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;
         }
@@ -175,10 +175,7 @@
       <td>
         <a href="/adm/logout" target="_top">$lt{'exit'}</a>
      </td>
-     <td "LC_top_nav_logo">
-       <img align="right" src="$logo" alt="Logo" />
-       <b>LON-CAPA</b>&nbsp;
-     </td>
+     <td "LC_top_nav_logo">LON-CAPA<img src="$logo" alt="Logo" /></td>
    </tr>
   </table>
 </font>
@@ -257,7 +254,7 @@
 $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 class="LC_top_nav_logo">LON-CAPA<img src="$logo" alt="Logo" /></td>
 </tr>
 </table>
 $form
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.407 loncom/interface/loncommon.pm:1.408
--- loncom/interface/loncommon.pm:1.407	Thu Jun 29 12:03:39 2006
+++ loncom/interface/loncommon.pm	Thu Jun 29 14:43:33 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.407 2006/06/29 16:03:39 albertel Exp $
+# $Id: loncommon.pm,v 1.408 2006/06/29 18:43:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3209,6 +3209,12 @@
 table#LC_top_nav td.LC_top_nav_logo {
   background: $tabbg;
   text-align: right;
+  white-space: nowrap;
+  font-weight: bold;
+}
+table#LC_top_nav td.LC_top_nav_logo img {
+  margin-left: 0.2em;
+  vertical-align: bottom;
 }
 table#LC_breadcrumbs td {
   background: $tabbg;