[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /interface loncommon.pm

[raeburn]

raeburn		Tue May 18 03:48:45 2010 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/interface	loncommon.pm 
  Log:
  - Backport 1.965, 1.966, 1.967.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.948.2.5 loncom/interface/loncommon.pm:1.948.2.6
--- loncom/interface/loncommon.pm:1.948.2.5	Tue May 18 02:26:39 2010
+++ loncom/interface/loncommon.pm	Tue May 18 03:48:44 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.948.2.5 2010/05/18 02:26:39 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 @@
     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 @@
   background: #F8F8F8; /* $sidebg; */
   border: 1px solid $sidebg;
   margin: 0 0 10px 0;      
+  padding: 3px;
 }
 
 .LC_fontsize_medium {
@@ -6099,7 +6096,7 @@
 
 #LC_nav_bar {
   float: left;
-  margin: 0;
+  margin: 0 0 2px 0;
 }
 
 #LC_realm {
@@ -6114,6 +6111,11 @@
   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 @@
   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;