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

[droeschl]

droeschl		Wed Jul  8 18:36:29 2009 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm loncommon.pm 
    /loncom/homework	structuretags.pm 
  Log:
  Changes related to modification of LON-CAPA screen header.
  - improved public problem and syllabus view
  - improved floating behavior of TabMainMenuContent (this fixes a bug regarding the menubuttons table in construction space)
  - resource preview popup (i.e. example problems, problems opened from browse resources) doesn't show user info anymore 
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.270 loncom/interface/lonmenu.pm:1.271
--- loncom/interface/lonmenu.pm:1.270	Mon Jun  8 18:04:45 2009
+++ loncom/interface/lonmenu.pm	Wed Jul  8 18:36:26 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.270 2009/06/08 18:04:45 bisitz Exp $
+# $Id: lonmenu.pm,v 1.271 2009/07/08 18:36:26 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -225,15 +225,11 @@
 
         if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
             return (<<ENDINLINEMENU);
-   <table id="LC_top_nav">
-    <tr>
-      <td>$logo</td>
-      <td></td>
-      <td class="LC_top_nav_login">
-        <a href="/adm/roles" target="_top">$lt{'login'}</a>
-     </td>
-    </tr>
-  </table>
+            <ol class="LC_smallMenu LC_right">
+                <li>$logo</li>
+                <li><a href="/adm/roles" target="_top">$lt{'login'}</a></li>
+            </ol>
+            <hr />
 ENDINLINEMENU
         }
         $roles = '<a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a>';
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.851 loncom/interface/loncommon.pm:1.852
--- loncom/interface/loncommon.pm:1.851	Wed Jul  8 07:51:01 2009
+++ loncom/interface/loncommon.pm	Wed Jul  8 18:36:26 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.851 2009/07/08 07:51:01 tempelho Exp $
+# $Id: loncommon.pm,v 1.852 2009/07/08 18:36:26 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4411,8 +4411,11 @@
 	if ($no_nav_bar) {
 	    $bodytag .= $titletable;
 	} else {
-        $bodytag .= qq|<div id="LC_nav_bar">$name ($role)<br />
-            <em>$realm</em> $dc_info</div>|;
+        $role = "($role)" if $role;
+        &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
+        $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
+            <em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'};
+
 	    if ($env{'request.state'} eq 'construct') {
                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
 							  $titletable);
@@ -5842,7 +5845,7 @@
 
 #LC_nav_bar {
     float: left;
-    margin: 0;
+    margin: 0.2em 0 0 0;
 }
 
 #LC_nav_bar em{
@@ -5852,9 +5855,10 @@
 
 ol.LC_smallMenu {
     float: right;
+    margin: 0.2em 0 0 0;
 }
 
-ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
+ol#LC_PathBreadcrumbs {
 	margin: 0;
 }
 
@@ -5881,12 +5885,10 @@
     list-style: none;
     padding: 0;
     margin: 0;
-    float:left;
     width: 100%;
 }
 
 ul#LC_TabMainMenuContent li {
-    float: left;
     font-weight: bold;
     line-height: 1.8em;
     padding: 0 0.8em; 
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.455 loncom/homework/structuretags.pm:1.456
--- loncom/homework/structuretags.pm:1.455	Mon Jul  6 17:48:30 2009
+++ loncom/homework/structuretags.pm	Wed Jul  8 18:36:29 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.455 2009/07/06 17:48:30 droeschl Exp $
+# $Id: structuretags.pm,v 1.456 2009/07/08 18:36:29 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -259,7 +259,7 @@
 	my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
 	if ($symb eq '' && !$publicuser) {
 	    my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
-	    $help="<hr/><p class='LC_info'>".&mt("Browsing resource, all submissions
+	    $help="<p class='LC_info'>".&mt("Browsing resource, all submissions
         are temporary.")."</p>";
 	    $page_start .= $help;
 	}