--- loncom/interface/loncommon.pm	2009/11/06 16:36:27	1.911
+++ loncom/interface/loncommon.pm	2009/11/20 04:12:43	1.917
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.911 2009/11/06 16:36:27 bisitz Exp $
+# $Id: loncommon.pm,v 1.917 2009/11/20 04:12:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4503,9 +4503,8 @@ sub bodytag {
                         $env{'course.'.$env{'request.course.id'}.
                                  '.domain'}.'/'})) {
         my $cid = $env{'request.course.id'};
-        $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
+        $dc_info = $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
         $dc_info =~ s/\s+$//;
-        $dc_info = '('.$dc_info.')';
     }
 
     $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
@@ -4513,7 +4512,9 @@ sub bodytag {
 
     if ($env{'environment.remote'} eq 'off') {
         # No Remote
-        if ($no_nav_bar) { return $bodytag; } 
+        if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { 
+            return $bodytag; 
+        } 
 
         if ($env{'request.state'} eq 'construct') { $forcereg=1; }
 
@@ -4521,21 +4522,29 @@ sub bodytag {
         #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
         #    }
 
-        $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
-            <em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'};
 
-        if (   $env{'form.inhibitmenu'} eq 'yes' 
-            || $ENV{'REQUEST_URI'} eq '/adm/logout'
-            || $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
 
+        if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
+             if ($dc_info) {
+                 $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
+             }
+             $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
+                <em>$realm</em> $dc_info</div>|;
             return $bodytag;
         }
 
+        $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>|;
+
         $bodytag .= Apache::lonhtmlcommon::scripttag(
             Apache::lonmenu::utilityfunctions(), 'start');
 
         $bodytag .= Apache::lonmenu::primary_menu();
 
+        if ($dc_info) {
+            $dc_info = &dc_courseid_toggle($dc_info);
+        }
+        $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
+
         #don't show menus for public users
         if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
             $bodytag .= Apache::lonmenu::secondary_menu();
@@ -4567,12 +4576,15 @@ sub bodytag {
     # Explicit link to get inline menu
     my $menu= ($no_inline_link?''
 	       :'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');
-    $bodytag .= qq|<div id="LC_nav_bar">$name $role
-            <em>$realm</em> $dc_info </div>
+
+    if ($dc_info) {
+        $dc_info = qq|<span class="LC_cusr_subheading">($dc_info)</span>|;
+    }
+
+    $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>
             <ol class="LC_primary_menu LC_right">
                 <li>$menu</li>
-            </ol>| unless $env{'form.inhibitmenu'};
-    #
+            </ol><div id="LC_realm"> $realm $dc_info</div>| unless $env{'form.inhibitmenu'};
     return(<<ENDBODY);
 $bodytag
 <table id="LC_title_bar" class="LC_with_remote">
@@ -4585,6 +4597,14 @@ $bodytag
 ENDBODY
 }
 
+sub dc_courseid_toggle {
+    my ($dc_info) = @_;
+    return ' <span id="dccidtext" class="LC_cusr_subheading">'.
+           '<a href="javascript:showCourseID();">'.
+           &mt('(More ...)').'</a></span>'.
+           '<div id="dccid" class="LC_dccid">'.$dc_info.'</div>';
+}
+
 sub make_attr_string {
     my ($register,$attr_ref) = @_;
 
@@ -4885,6 +4905,47 @@ table#LC_title_bar.LC_with_remote {
   margin: 0;
 }
 
+/* #SD START (work in progress)*/
+
+ul.LC_bct {
+    margin: 0;
+    padding: 0;
+}
+ul.LC_bct ol {
+    display: inline;
+}
+ul.LC_bct ul {
+    display: inline;
+    padding: 0;
+}
+ul.LC_bct li {
+    list-style-type: none;
+    display: inline;
+}
+
+
+ul.LC_breadcrumb_tools {
+}
+
+li.LC_breadcrumb_tools {
+}
+li.LC_breadcrumb_tools img{
+    vertical-align: middle;
+}
+
+.LC_breadcrumb_tools_A {
+    margin: 0 0 0 1em;
+}
+.LC_breadcrumb_tools_B {
+    float: right;
+    margin-top: 0.4em;
+}
+.LC_breadcrumb_tools_C {
+    margin: 0 1em 0 0;
+    float: right;
+}
+/* #SD END */
+
 table#LC_title_bar td {
   background: $tabbg;
 }
@@ -4953,9 +5014,9 @@ table#LC_mainmenu td.LC_mainmenu_column
   background: $sidebg;
   border-bottom: 1px solid $lg_border_color;
   line-height: 2.5em;
- /* SD working here
- height: 2.5em;
- overflow: hidden; */
+     /* SD working here 
+     height: 2.5em;
+     overflow: hidden; */
   margin: 0;
   padding: 0;
 }
@@ -4968,9 +5029,8 @@ table#LC_mainmenu td.LC_mainmenu_column
 #LC_head_subbox {
   clear:both;
   background: #F8F8F8; /* $sidebg; */
-  border-bottom: 1px solid $lg_border_color;
-  margin: 0 0 10px 0;
-  padding: 5px;
+  border: 1px solid $sidebg;
+  margin: 0 0 10px 0;      
 }
 
 .LC_fontsize_medium {
@@ -5060,17 +5120,25 @@ table.LC_data_table tr.LC_info_row > td
   text-align: left;
 }
 
-table.LC_data_table tr.LC_odd_row > td,
+table.LC_data_table tr.LC_odd_row > td {
+  background-color: $data_table_light;
+  padding: 2px;
+  vertical-align: top;
+}
+
 table.LC_pick_box tr > td.LC_odd_row {
   background-color: $data_table_light;
+  vertical-align: top;
+}
+
+table.LC_data_table tr.LC_even_row > td {
+  background-color: $data_table_dark;
   padding: 2px;
   vertical-align: top;
 }
 
-table.LC_data_table tr.LC_even_row > td,
 table.LC_pick_box tr > td.LC_even_row {
   background-color: $data_table_dark;
-  padding: 2px;
   vertical-align: top;
 }
 
@@ -5159,6 +5227,7 @@ table.LC_createuser tr.LC_info_row td  {
 table.LC_calendar {
   border: 1px solid #000000;
   border-collapse: collapse;
+  width: 98%;
 }
 
 table.LC_calendar_pickdate {
@@ -5168,6 +5237,7 @@ table.LC_calendar_pickdate {
 table.LC_calendar tr td {
   border: 1px solid #000000;
   vertical-align: top;
+  width: 14%;
 }
 
 table.LC_calendar tr td.LC_calendar_day_empty {
@@ -5865,6 +5935,13 @@ div.LC_createcourse {
   margin: 10px 10px 10px 10px;
 }
 
+.LC_dccid {
+  margin: 0.2em 0 0 0;
+  padding: 0;
+  font-size: 90%;
+  display:none;
+}
+
 /* ---- Remove when done ----
 # The following styles is part of the redesign of LON-CAPA and are
 # subject to change during this project.
@@ -5955,6 +6032,13 @@ fieldset > legend {
   margin: 0.2em 0 0 0;
 }
 
+#LC_realm {
+  margin: 0.2em 0 0 0;
+  padding: 0;
+  font-weight: bold;
+  text-align: center;
+}
+
 #LC_nav_bar em {
   font-weight: bold;
   font-style: normal;
@@ -6119,7 +6203,7 @@ ol#LC_PathBreadcrumbs {
   padding-left: 10px;
   margin: 0;
   list-style-position: inside;
-    /* SD working here
+    /* SD working here 
     white-space: nowrap; */
 }
 
@@ -6128,8 +6212,8 @@ ol#LC_PathBreadcrumbs li,
 ul.LC_CourseBreadcrumbs li {
   display: inline;
   white-space: nowrap;
-    /* SD working here
-    white-space: normal; */
+    /* SD working here  
+    white-space: normal; */ 
 }
 
 ol#LC_MenuBreadcrumbs li a,
@@ -6383,11 +6467,29 @@ a.LC_toolbarItem {
   background-color:transparent;
 }
 
+ul.LC_funclist {
+    margin: 0;
+    padding: 0.5em 1em 0.5em 0;
+}
+
+ul.LC_funclist + ul.LC_funclist {
+    /* 
+       left border as a seperator if we have more than
+       one list 
+    */
+    border-left: 1px solid $sidebg;
+    /* 
+       this hides the left border behind the border of the 
+       outer box if element is wrapped to the next 'line' 
+    */
+    margin-left: -1px;
+}
+
 ul.LC_funclist li {
-  float: left;
+  display: inline;
   white-space: nowrap;
-  height: 35px; /* at least as high as heighest list item */
-  margin: 0 15px 15px 10px;
+  margin: 0 0 0 25px;
+  line-height: 150%;
 }