--- loncom/interface/loncommon.pm	2008/12/05 09:41:48	1.708
+++ loncom/interface/loncommon.pm	2008/12/15 16:37:44	1.718
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.708 2008/12/05 09:41:48 bisitz Exp $
+# $Id: loncommon.pm,v 1.718 2008/12/15 16:37:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1686,17 +1686,17 @@ sub select_form {
 sub display_filter {
     if (!$env{'form.show'}) { $env{'form.show'}=10; }
     if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
-    return '<nobr><label>'.&mt('Records [_1]',
+    return '<span class="LC_nobreak"><label>'.&mt('Records [_1]',
 			       &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
 							   (&mt('all'),10,20,50,100,1000,10000))).
-	   '</label></nobr> <nobr>'.
+	   '</label></span> <span class="LC_nobreak">'.
            &mt('Filter [_1]',
 	   &select_form($env{'form.displayfilter'},
 			'displayfilter',
 			('currentfolder' => 'Current folder/page',
 			 'containing' => 'Containing phrase',
 			 'none' => 'None'))).
-			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';
+			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></span>';
 }
 
 sub gradeleveldescription {
@@ -4392,6 +4392,8 @@ sub standard_css {
     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';
@@ -4665,6 +4667,10 @@ td.LC_menubuttons_text {
   font-size: small;
 }
 
+.LC_mail_functions {
+    font-weight: bold;
+}
+
 table.LC_aboutme_port {
   border: 0px;
   border-collapse: collapse;
@@ -4697,14 +4703,22 @@ table.LC_prior_tries tr th {
   background-color: $data_table_head;
   font-size:90%;
 }
+table.LC_data_table tr.LC_info_row > td {
+  background-color: #CCC;
+  font-weight: bold;
+  text-align: left;
+}
 table.LC_data_table tr.LC_odd_row > td, 
+table.LC_pick_box tr > td.LC_odd_row,
 table.LC_aboutme_port tr td {
   background-color: $data_table_light;
   padding: 2px;
 }
 table.LC_data_table tr.LC_even_row > td,
+table.LC_pick_box tr > td.LC_even_row,
 table.LC_aboutme_port tr.LC_even_row td {
   background-color: $data_table_dark;
+  padding: 2px;
 }
 table.LC_data_table tr.LC_data_table_highlight td {
   background-color: $data_table_darker;
@@ -5305,24 +5319,6 @@ div.LC_clear_float_footer {
 }
 
 
-div.LC_grade_select_mode {
-  font-family: $sans;
-}
-div.LC_grade_select_mode div div {
-  margin: 5px;
-}
-div.LC_grade_select_mode_selector {
-  margin: 5px;
-  float: left;
-}
-div.LC_grade_select_mode_selector_header {
-  font-weight: bold;
-  font-size: medium;
-}
-div.LC_grade_select_mode_type {
-  clear: left;
-}
-
 div.LC_grade_show_user {
   margin-top: 20px;
   border: 1px solid black;
@@ -5452,6 +5448,10 @@ table#LC_mainmenu td.LC_mainmenu_col_fie
   font-weight: bold;
 }
 
+div.LC_createcourse {
+    margin: 10px 10px 10px 10px;
+}
+
 /* ---- Remove when done ----
 # The following styles is part of the redesign of LON-CAPA and are
 # subject to change during this project.
@@ -5709,19 +5709,26 @@ div.columnSection > .ContentBoxSpecial
 	width:65%;
 	padding: 10px;
 	height: auto;
-#	background-color:#FFFFFF;
-	background-color:$loginbg;
+	background-color:#FFFFFF;
 	border:1px solid #CCCCCC;
 }
 
 
 .LC_loginpage_loginContainer {
 	float:left;
-	width:60%;
+	width: 182px;
+	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 {
-	margin-top:20px;
 	margin-left:20px;
 	float:left;
 	width:30%;
@@ -5729,6 +5736,13 @@ div.columnSection > .ContentBoxSpecial
 	padding:10px;
 }
 
+.LC_loginpage_loginDomain {
+	margin-right:20px;
+	width:20%;
+	float:left;
+	padding:10px;
+}
+
 .LC_loginpage_space {
 	clear:both;
 	margin-bottom:20px;
@@ -5748,7 +5762,6 @@ div.columnSection > .ContentBoxSpecial
 }
 
 
-
 END
 }
 
@@ -6012,11 +6025,22 @@ sub start_page {
     }
 
     if ($args->{'js_ready'}) {
-	$result = &js_ready($result);
+		$result = &js_ready($result);
     }
     if ($args->{'html_encode'}) {
-	$result = &html_encode($result);
+		$result = &html_encode($result);
     }
+
+    if (exists($args->{'bread_crumbs'})) {
+        &Apache::lonhtmlcommon::clear_breadcrumbs();
+        if (ref($args->{'bread_crumbs'}) eq 'ARRAY') {         
+            foreach my $crumb (@{$args->{'bread_crumbs'}}){
+                &Apache::lonhtmlcommon::add_breadcrumb($crumb);
+            }
+        }
+        $result .= &Apache::lonhtmlcommon::breadcrumbs();
+    }
+
     return $result;
 }
 
@@ -6779,19 +6803,35 @@ sub default_quota {
         if ($inststatus ne '') {
             my @statuses = split(/:/,$inststatus);
             foreach my $item (@statuses) {
-                if ($quotahash{'quotas'}{$item} ne '') {
-                    if ($defquota eq '') {
-                        $defquota = $quotahash{'quotas'}{$item};
-                        $settingstatus = $item;
-                    } elsif ($quotahash{'quotas'}{$item} > $defquota) {
-                        $defquota = $quotahash{'quotas'}{$item};
-                        $settingstatus = $item;
+                if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
+                    if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {
+                        if ($defquota eq '') {
+                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
+                            $settingstatus = $item;
+                        } elsif ($quotahash{'quotas'}{'defaultquota'}{$item} > $defquota) {
+                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
+                            $settingstatus = $item;
+                        }
+                    }
+                } else {
+                    if ($quotahash{'quotas'}{$item} ne '') {
+                        if ($defquota eq '') {
+                            $defquota = $quotahash{'quotas'}{$item};
+                            $settingstatus = $item;
+                        } elsif ($quotahash{'quotas'}{$item} > $defquota) {
+                            $defquota = $quotahash{'quotas'}{$item};
+                            $settingstatus = $item;
+                        }
                     }
                 }
             }
         }
         if ($defquota eq '') {
-            $defquota = $quotahash{'quotas'}{'default'};
+            if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
+                $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'};
+            } else {
+                $defquota = $quotahash{'quotas'}{'default'};
+            }
             $settingstatus = 'default';
         }
     } else {