--- loncom/interface/loncommon.pm	2010/05/18 01:24:42	1.948.2.4
+++ loncom/interface/loncommon.pm	2010/05/18 03:48:44	1.948.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.948.2.4 2010/05/18 01:24:42 raeburn Exp $
+# $Id: loncommon.pm,v 1.948.2.6 2010/05/18 03:48:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4860,10 +4860,6 @@ sub standard_css {
     my $vlink  = &designparm($function.'.vlink', $domain);
     my $link   = &designparm($function.'.link',  $domain);
 
-    my $loginbg = &designparm('login.sidebg',$domain);
-    my $bgcol = &designparm('login.bgcol',$domain);
-    my $textcol = &designparm('login.textcol',$domain);
-
     my $sans                 = 'Verdana,Arial,Helvetica,sans-serif';
     my $mono                 = 'monospace';
     my $data_table_head      = $sidebg;
@@ -5130,6 +5126,7 @@ td.LC_table_cell_checkbox {
   background: #F8F8F8; /* $sidebg; */
   border: 1px solid $sidebg;
   margin: 0 0 10px 0;      
+  padding: 3px;
 }
 
 .LC_fontsize_medium {
@@ -6099,7 +6096,7 @@ fieldset > legend {
 
 #LC_nav_bar {
   float: left;
-  margin: 0;
+  margin: 0 0 2px 0;
 }
 
 #LC_realm {
@@ -6114,6 +6111,11 @@ fieldset > legend {
   font-style: normal;
 }
 
+/* Preliminary fix to hide nav_bar inside bookmarks window */
+#LC_bookmarks #LC_nav_bar {
+  display:none;
+}
+
 ol.LC_primary_menu {
   float: right;
   margin: 0;
@@ -6413,52 +6415,6 @@ div.LC_columnSection>* {
   overflow:hidden;
 }
 
-.LC_loginpage_container {
-  text-align:left;
-  margin : 0 auto;
-  width:90%;
-  padding: 10px;
-  height: auto;
-  background-color:#FFFFFF;
-  border:1px solid #CCCCCC;
-}
-
-
-.LC_loginpage_loginContainer {
-  float:left;
-  width: 182px;
-  padding: 2px;
-  border:1px solid #CCCCCC;
-  background-color:$loginbg;
-}
-
-.LC_loginpage_loginContainer h2 {
-  margin-top: 0;
-  display:block;
-  background:$bgcol;
-  color:$textcol;
-  padding-left:5px;
-}
-
-.LC_loginpage_loginInfo {
-  float:left;
-  width:182px;
-  border:1px solid #CCCCCC;
-  padding:2px;
-}
-
-.LC_loginpage_space {
-  clear: both;
-  margin-bottom: 20px;
-  border-bottom: 1px solid #CCCCCC;
-}
-
-.LC_loginpage_floatLeft {
-  float: left;
-  width: 200px;
-  margin: 0;
-}
-
 table em {
   font-weight: bold;
   font-style: normal;
@@ -7003,15 +6959,26 @@ sub simple_error_page {
 
 {
     my @row_count;
+
+    sub start_data_table_count {
+        unshift(@row_count, 0);
+        return;
+    }
+
+    sub end_data_table_count {
+        shift(@row_count);
+        return;
+    }
+
     sub start_data_table {
 	my ($add_class) = @_;
 	my $css_class = (join(' ','LC_data_table',$add_class));
-	unshift(@row_count,0);
+        &start_data_table_count();
 	return '<table class="'.$css_class.'">'."\n";
     }
 
     sub end_data_table {
-	shift(@row_count);
+        &end_data_table_count();
 	return '</table>'."\n";;
     }
 
@@ -10549,7 +10516,7 @@ sub construct_course {
 	    $title=&mt('Syllabus');
             $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
         } else {
-            $title=&mt('Navigate Contents');
+            $title=&mt('Table of Contents');
             $url='/adm/navmaps';
         }