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

[albertel]

albertel		Wed Jul 19 06:52:33 2006 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm loncommon.pm 
  Log:
  - fixing up public access to look like logged in access
  - making the exit and help links predictable in size and location 
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.198 loncom/interface/lonmenu.pm:1.199
--- loncom/interface/lonmenu.pm:1.198	Tue Jul 18 17:55:24 2006
+++ loncom/interface/lonmenu.pm	Wed Jul 19 06:52:27 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.198 2006/07/18 21:55:24 albertel Exp $
+# $Id: lonmenu.pm,v 1.199 2006/07/19 10:52:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,6 +90,10 @@
     my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
     my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
 
+    my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
+    $logo = '<td class="LC_top_nav_logo"><a href="/adm/about.html"><img src="'.
+	$logo.'" alt="LON-CAPA Logo" /></a></td>';
+
     if ($env{'request.state'} eq 'construct') {
         if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
             my $returnurl = $env{'request.filename'};
@@ -167,14 +171,14 @@
         my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain);
         my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
 	if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
-	    my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
 	    return (<<ENDINLINEMENU);
    <table id="LC_top_nav">
     <tr>
-      <td>
+      $logo
+      <td></td>
+      <td class="LC_top_nav_exit">
         <a href="/adm/logout" target="_top">$lt{'exit'}</a>
      </td>
-     <td class="LC_top_nav_logo">LON-CAPA<img src="$logo" alt="Logo" /></td>
     </tr>
   </table>
 </font>
@@ -230,7 +234,6 @@
         }
         my $form=&serverform();
 	my $utility=&utilityfunctions();
-	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
 	my $remote;
 	if ($env{'user.adv'}) {
 	    $remote = '<td><a href="/adm/remote?action=launch&amp;url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>'
@@ -246,8 +249,7 @@
 </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>
+$logo
 <td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>
 $reloadlink
 $navmaps
@@ -255,8 +257,8 @@
 $groups
 $remote
 <td><a href="/adm/roles" target="_top">$lt{'roles'}</a></td>
-<td>$helplink</td>
-<td class="LC_top_logout"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
+<td class="LC_top_nav_help">$helplink</td>
+<td class="LC_top_nav_exit"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
 </tr>
 </table>
 $form
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.431 loncom/interface/loncommon.pm:1.432
--- loncom/interface/loncommon.pm:1.431	Wed Jul 19 04:36:11 2006
+++ loncom/interface/loncommon.pm	Wed Jul 19 06:52:27 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.431 2006/07/19 08:36:11 albertel Exp $
+# $Id: loncommon.pm,v 1.432 2006/07/19 10:52:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3262,14 +3262,18 @@
 }
 table#LC_top_nav td.LC_top_nav_logo {
   background: $tabbg;
-  text-align: right;
+  text-align: left;
   white-space: nowrap;
-  font-weight: bold;
+  width: 31px;
 }
 table#LC_top_nav td.LC_top_nav_logo img {
-  margin-left: 0.2em;
+  border: 0px;
   vertical-align: bottom;
 }
+table#LC_top_nav td.LC_top_nav_exit,
+table#LC_top_nav td.LC_top_nav_help {
+  width: 2.0em;
+}
 table.LC_breadcrumbs td, table.LC_docs_path td  {
   background: $tabbg;
   color: $font;