--- loncom/interface/loncommon.pm	2009/03/01 20:24:39	1.760
+++ loncom/interface/loncommon.pm	2009/04/21 18:03:45	1.789
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.760 2009/03/01 20:24:39 harmsja Exp $
+# $Id: loncommon.pm,v 1.789 2009/04/21 18:03:45 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -406,7 +406,7 @@ sub studentbrowser_javascript {
          || ($env{'request.role'}=~/^(au|dc|su)/)
           ) { return ''; }  
    return (<<'ENDSTDBRW');
-<script type="text/javascript" language="Javascript" >
+<script type="text/javascript" language="Javascript">
     var stdeditbrowser;
     function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
         var url = '/adm/pickstudent?';
@@ -452,7 +452,7 @@ sub selectstudent_link {
 
 sub authorbrowser_javascript {
     return <<"ENDAUTHORBRW";
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
 var stdeditbrowser;
 
 function openauthorbrowser(formname,udom) {
@@ -473,7 +473,7 @@ sub coursebrowser_javascript {
     my ($domainfilter,$sec_element,$formname)=@_;
     my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
    my $output = '
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
     var stdeditbrowser;'."\n";
    $output .= <<"ENDSTDBRW";
     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
@@ -602,8 +602,13 @@ function setSect(sectionlist) {
 
 sub selectcourse_link {
    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
-   return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
+   return '<span class="LC_nobreak">'
+         ."<a href='"
+         .'javascript:opencrsbrowser("'.$form.'","'.$unameele
+         .'","'.$udomele.'","'.$desc.'","'.$extra_element
+         .'","'.$multflag.'","'.$selecttype.'");'
+         ."'>".&mt('Select Course').'</a>'
+         .'</span>';
 }
 
 sub selectauthor_link {
@@ -796,7 +801,7 @@ sub linked_select_forms {
     my $first = "document.$formname.$firstselectname";
     # output the javascript to do the changing
     my $result = '';
-    $result.="<script type=\"text/javascript\">\n";
+    $result.='<script type="text/javascript" language="JavaScript">'."\n";
     $result.="var select2data = new Object();\n";
     $" = '","';
     my $debug = '';
@@ -924,16 +929,22 @@ sub help_open_topic {
 
     # Add the text
     if ($text ne "") {	
-	$template.="<span class=\"LC_nobreak\"><a class=\"LC_helptextbgcolor\" target=\"_top\" href=\"$link\"><span class=\"LC_helptextfontcolor\">$text</span></a>";
+	$template.='<span class="LC_help_open_topic">'
+                  .'<a target="_top" href="'.$link.'">'
+                  .$text.'</a>';
     }
 
-    # Add the graphic
+    # (Always) Add the graphic
     my $title = &mt('Online Help');
     my $helpicon=&lonhttpdurl("/adm/help/help.png");
-    $template .= <<"ENDTEMPLATE";
- <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a></span>
-ENDTEMPLATE
-    
+    $template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
+              .'<img src="'.$helpicon.'" border="0"'
+              .' alt="'.&mt('Help: [_1]',$topic).'"'
+              .' title="'.$title.'"' 
+              .' /></a>';
+    if ($text ne "") {	
+        $template.='</span>';
+    }
     return $template;
 
 }
@@ -945,25 +956,26 @@ sub helpLatexCheatsheet {
     my $out;
     my $addOther = '';
     if ($topic) {
-	$addOther = &Apache::loncommon::help_open_topic($topic,$text,
-						       undef, undef, 600).
-							   '</td><td>';
-    }
-    $out = '<table><tr><td>'.
-	   $addOther .
-	   &Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
-					       undef,undef,600).
-	   '</td><td>'.
-	   &Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
-					       undef,undef,600).
-	   '</td>';
+	$addOther = '<span>'.&Apache::loncommon::help_open_topic($topic,&mt($text),
+							       undef, undef, 600).
+								   '</span> ';
+    }
+    $out = '<span>' # Start cheatsheet
+	  .$addOther
+          .'<span>'
+	  .&Apache::loncommon::help_open_topic('Greek_Symbols',&mt('Greek Symbols'),
+					       undef,undef,600)
+	  .'</span> <span>'
+	  .&Apache::loncommon::help_open_topic('Other_Symbols',&mt('Other Symbols'),
+					       undef,undef,600)
+	  .'</span>';
     unless ($not_author) {
-        $out .= '<td>'.
-	        &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
-	                                            undef,undef,600).
-	        '</td>';
+        $out .= ' <span>'
+	       .&Apache::loncommon::help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),
+	                                            undef,undef,600)
+	       .'</span>';
     }
-    $out .= '</tr></table>';
+    $out .= '</span>'; # End cheatsheet
     return $out;
 }
 
@@ -2119,14 +2131,14 @@ sub authform_kerberos {
         $autharg,$jscall);
     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
     if ($in{'kerb_def_auth'} eq 'krb5') {
-       $check5 = ' checked="on"';
+       $check5 = ' checked="checked"';
     } else {
-       $check4 = ' checked="on"';
+       $check4 = ' checked="checked"';
     }
     $krbarg = $in{'kerb_def_dom'};
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'krb') {
-            $krbcheck = ' checked="on"';
+            $krbcheck = ' checked="checked"';
             if (defined($in{'mode'})) {
                 if ($in{'mode'} eq 'modifyuser') {
                     $krbcheck = '';
@@ -2134,10 +2146,10 @@ sub authform_kerberos {
             }
             if (defined($in{'curr_kerb_ver'})) {
                 if ($in{'curr_krb_ver'} eq '5') {
-                    $check5 = ' checked="on"';
+                    $check5 = ' checked="checked"';
                     $check4 = '';
                 } else {
-                    $check4 = ' checked="on"';
+                    $check4 = ' checked="checked"';
                     $check5 = '';
                 }
             }
@@ -2158,7 +2170,7 @@ sub authform_kerberos {
         }
     } else {
         if ($authnum == 1) {
-            $authtype = '<input type="hidden" name="login" value="krb">';
+            $authtype = '<input type="hidden" name="login" value="krb" />';
         }
     }
     if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
@@ -2167,7 +2179,7 @@ sub authform_kerberos {
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="hidden" name="login" value="krb">';
+                    $authtype = '<input type="hidden" name="login" value="krb" />';
                 }
             }
         }
@@ -2228,7 +2240,7 @@ sub authform_internal{
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'int') {
             if ($can_assign{'int'}) {
-                $intcheck = 'checked="on" ';
+                $intcheck = 'checked="checked" ';
                 if (defined($in{'mode'})) {
                     if ($in{'mode'} eq 'modifyuser') {
                         $intcheck = '';
@@ -2244,7 +2256,7 @@ sub authform_internal{
         }
     } else {
         if ($authnum == 1) {
-            $authtype = '<input type="hidden" name="login" value="int">';
+            $authtype = '<input type="hidden" name="login" value="int" />';
         }
     }
     if (!$can_assign{'int'}) {
@@ -2253,7 +2265,7 @@ sub authform_internal{
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="hidden" name="login" value="int">';
+                    $authtype = '<input type="hidden" name="login" value="int" />';
                 }
             }
         }
@@ -2283,7 +2295,7 @@ sub authform_local{
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'loc') {
             if ($can_assign{'loc'}) {
-                $loccheck = 'checked="on" ';
+                $loccheck = 'checked="checked" ';
                 if (defined($in{'mode'})) {
                     if ($in{'mode'} eq 'modifyuser') {
                         $loccheck = '';
@@ -2299,7 +2311,7 @@ sub authform_local{
         }
     } else {
         if ($authnum == 1) {
-            $authtype = '<input type="hidden" name="login" value="loc">';
+            $authtype = '<input type="hidden" name="login" value="loc" />';
         }
     }
     if (!$can_assign{'loc'}) {
@@ -2308,7 +2320,7 @@ sub authform_local{
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="hidden" name="login" value="loc">';
+                    $authtype = '<input type="hidden" name="login" value="loc" />';
                 }
             }
         }
@@ -2337,7 +2349,7 @@ sub authform_filesystem{
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'fsys') {
             if ($can_assign{'fsys'}) {
-                $fsyscheck = 'checked="on" ';
+                $fsyscheck = 'checked="checked" ';
                 if (defined($in{'mode'})) {
                     if ($in{'mode'} eq 'modifyuser') {
                         $fsyscheck = '';
@@ -2350,7 +2362,7 @@ sub authform_filesystem{
         }
     } else {
         if ($authnum == 1) {
-            $authtype = '<input type="hidden" name="login" value="fsys">';
+            $authtype = '<input type="hidden" name="login" value="fsys" />';
         }
     }
     if (!$can_assign{'fsys'}) {
@@ -2359,7 +2371,7 @@ sub authform_filesystem{
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="hidden" name="login" value="fsys">';
+                    $authtype = '<input type="hidden" name="login" value="fsys" />';
                 }
             }
         }
@@ -2840,6 +2852,27 @@ sub track_student_link {
 	&help_open_topic('View_recent_activity');
 }
 
+sub slot_reservations_link {
+    my ($linktext,$sname,$sdom,$target) = @_;
+    my $link ="/adm/slotrequest?command=showresv&amp;origin=aboutme";
+    my $title = 'View slot reservation history';
+    if (defined($sname) && $sname !~ /^\s*$/ &&
+        defined($sdom)  && $sdom  !~ /^\s*$/) {
+        $link .= "&amp;uname=$sname&amp;udom=$sdom";
+        $title .= ' of this student';
+    }
+    if (defined($target) && $target !~ /^\s*$/) {
+        $target = qq{target="$target"};
+    } else {
+        $target = '';
+    }
+    $title = &mt($title);
+    $linktext = &mt($linktext);
+    return qq{<a href="$link" title="$title" $target>$linktext</a>};
+# FIXME uncomment when help item created: &help_open_topic('Slot_Reservation_History');
+
+}
+
 # ===================================================== Display a student photo
 
 
@@ -3815,7 +3848,7 @@ sub blocking_status {
                              &Apache::lonnet::coursedescription($course);
                         $coursedesc = $courseinfo{'description'};
                     }
-                    $category = "Group files in the course '$coursedesc'";
+                    $category = "Group portfolio in the course '$coursedesc'";
                 } else {
                     $category = 'Portfolio files belonging to ';
                     if ($env{'user.name'} eq 'public' && 
@@ -4244,7 +4277,7 @@ $realm&nbsp;
 </td>
 ENDROLE
 
-    my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
+    my $titleinfo = '<h1>'.$title.'</h1>';
     if ($customtitle) {
         $titleinfo = $customtitle;
     }
@@ -4498,7 +4531,7 @@ body{
   }
 a:link, a:visited { font-size:100%; }
 
-a:focus { color: red; background: yellow } 
+a:focus { color: red; background: yellow }
 table.thinborder,
 table.thinborder tr th {
   border-style: solid;
@@ -4514,22 +4547,26 @@ table.thinborder tr td {
 
 form, .inline { display: inline; }
 
-.LC_center { text-align: center; }
-.LC_left { text-align:left; }
 .LC_right {text-align:right;}
 .LC_middle {vertical-align:middle;}
-.LC_top {vertical-align:top;}
-.LC_bottom {vertical-align:bottom;}
 
 /* just for tests */
-.LC_300Box { width:300px; }
 .LC_400Box {width:400px; }
-.LC_500Box {width:500px; }
-.LC_600Box {width:600px; }
-.LC_800Box {width:800px;}
 /* end */
 
-.LC_filename {font-family: $mono; white-space:pre;}
+.LC_filename {
+  font-family: $mono;
+  white-space:pre;
+}
+
+.LC_fileicon {
+  border: none;
+  height: 1.3em;
+  vertical-align: text-bottom;
+  margin-right: 0.3em;
+  text-decoration:none;
+}
+
 .LC_error {
   color: red;
   font-size: larger;
@@ -4549,8 +4586,9 @@ form, .inline { display: inline; }
 }
 
 .LC_icon {
-  border: 0px;
+  border: none;
 }
+
 .LC_indexer_icon {
   border: 0px;
   height: 22px;
@@ -4558,7 +4596,7 @@ form, .inline { display: inline; }
 .LC_docs_spacer {
   width: 25px;
   height: 1px;
-  border: 0px;
+  border: none;
 }
 
 .LC_internal_info {
@@ -4578,7 +4616,7 @@ table#LC_top_nav, table#LC_menubuttons,t
   padding: 0px;
 }
 
-table#LC_title_bar, table.LC_breadcrumbs, 
+table#LC_title_bar, table.LC_breadcrumbs,
 table#LC_title_bar.LC_with_remote {
   width: 100%;
   border-color: $pgbg;
@@ -4602,18 +4640,25 @@ table.LC_docs_path {
 table#LC_title_bar td {
   background: $tabbg;
 }
-table#LC_title_bar td.LC_title_bar_who {
+table#LC_title_bar .LC_title_bar_who {
   background: $tabbg;
   color: $font;
   font: small $sans;
   text-align: right;
+  margin: 0px;
+}
+table#LC_title_bar .LC_title_bar_name {
+  margin: 0px;
+}
+table#LC_title_bar .LC_title_bar_role {
+  margin: 0px;
+}
+table#LC_title_bar .LC_title_bar_realm {
+  margin: 0px;
 }
 span.LC_metadata {
     font-family: $sans;
 }
-span.LC_title_bar_title {
-  font: bold x-large $sans;
-}
 table#LC_title_bar td.LC_title_bar_domain_logo {
   background: $sidebg;
   text-align: right;
@@ -4692,11 +4737,6 @@ table#LC_mainmenu td.LC_mainmenu_column
  font-size: 120%;
 }
 
-.LC_fontcolor_red
-{
- color: #FF0000;
-}
-
 .LC_menubuttons_inline_text {
   color: $font;
   font-family: $sans;
@@ -4717,7 +4757,7 @@ table#LC_mainmenu td.LC_mainmenu_column
 }
 
 td.LC_menubuttons_text {
- 	color: $font; 	
+ 	color: $font;
 }
 
 
@@ -4788,7 +4828,7 @@ table.LC_data_table tr.LC_info_row > td
   font-weight: bold;
   text-align: left;
 }
-table.LC_data_table tr.LC_odd_row > td, 
+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;
@@ -4886,13 +4926,16 @@ table.LC_calendar tr td.LC_calendar_day_
 table.LC_calendar tr td.LC_calendar_day_current {
   background-color: $data_table_highlight;
 }
-
 table.LC_mail_list tr.LC_mail_new {
   background-color: $mail_new;
 }
 table.LC_mail_list tr.LC_mail_new:hover {
   background-color: $mail_new_hover;
 }
+table.LC_mail_list tr.LC_mail_even{
+}
+table.LC_mail_list tr.LC_mail_odd{
+}
 table.LC_mail_list tr.LC_mail_read {
   background-color: $mail_read;
 }
@@ -4911,10 +4954,6 @@ table.LC_mail_list tr.LC_mail_other {
 table.LC_mail_list tr.LC_mail_other:hover {
   background-color: $mail_other_hover;
 }
-table.LC_mail_list tr.LC_mail_even {
-}
-table.LC_mail_list tr.LC_mail_odd {
-}
 
 table.LC_data_table tr > td.LC_browser_file,
 table.LC_data_table tr > td.LC_browser_file_published {
@@ -4982,7 +5021,7 @@ span.LC_parm_folder, span.LC_parm_symb {
 }
 
 td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu,
-td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+td.LC_parm_overview_parm_selectors,td.LC_parm_overview_restrictions  {
   border: 1px solid black;
   border-collapse: collapse;
 }
@@ -5194,7 +5233,7 @@ table.LC_descriptive_input td.LC_descrip
 div.LC_feedback_link {
   clear: both;
   background: white;
-  width: 100%;  
+  width: 100%;
 }
 span.LC_feedback_link {
   background: $feedback_link_bg;
@@ -5225,7 +5264,7 @@ table.LC_prior_tries td {
   background: #FFAAAA ! important;
   color: black;
 }
-.LC_answer_not_charged_try, 
+.LC_answer_not_charged_try,
 .LC_answer_no_grade,
 .LC_answer_late {
   background: #FFFFAA;
@@ -5243,8 +5282,6 @@ table.LC_prior_tries td {
   background: orange;
   color: black;
 }
-
-
 span.LC_prior_numerical,
 span.LC_prior_string,
 span.LC_prior_custom,
@@ -5272,6 +5309,7 @@ table.LC_prior_match tr td {
   border: 1px solid #000000;
 }
 
+td.LC_nobreak,
 span.LC_nobreak {
   white-space: nowrap;
 }
@@ -5290,12 +5328,10 @@ table.LC_docs_documents {
   border-width: 0px;
   border-collapse: collapse;
 }
-
 table.LC_docs_documents td.LC_docs_document {
   border: 2px solid black;
   padding: 4px;
 }
-
 .LC_docs_entry_move {
   border: 0px;
   border-collapse: collapse;
@@ -5368,7 +5404,7 @@ table.LC_double_column tr td.LC_left_col
 
 table.LC_double_column tr td.LC_right_col {
   top: 2px;
-  right: 2px; 
+  right: 2px;
   width: 47%;
   vertical-align: top;
 }
@@ -5446,7 +5482,7 @@ table.LC_scantron_action tr th {
   font-weight:bold;
   font-style:normal;
 }
-.LC_edit_problem_header, 
+.LC_edit_problem_header,
 div.LC_edit_problem_footer {
   font-weight: normal;
   font-size:  medium;
@@ -5521,7 +5557,6 @@ table#LC_mainmenu td.LC_mainmenu_col_fie
   font-size: small;
   font-weight: bold;
 }
-
 div.LC_createcourse {
     margin: 10px 10px 10px 10px;
 }
@@ -5544,7 +5579,7 @@ ul.LC_TabContent   li:hover a{
         text-decoration:none;
 }
 
-h1 { 
+h1 {
 	padding:5px 10px 5px 20px;
 	line-height:130%;
 }
@@ -5559,26 +5594,19 @@ h2,h3,h4,h5,h6
         padding:3px 15px 3px 15px;
         margin:0px;
 	background-color:$tabbg;
-	border-bottom:solid 1px $lg_border_color;       
+	border-bottom:solid 1px $lg_border_color;
 }
 .LC_noBorder {
         border:0px;
 }
 
-.LC_bgLightGrey{
-	background:URL(/adm/lonIcons/lightGreyBG.png) repeat-x left bottom;
-}
-
 
 /* Main Header with discription of Person, Course, etc. */
-.LC_HeadRight {
-	text-align: right;
-	float: right;
-	margin: 0px;
-	padding: 0px;
-        right:0;
-        position:absolute;
-        overflow:hidden;
+
+.LC_Right {
+        float: right;
+        margin: 0px;
+        padding: 0px;
 }
 
 p, .LC_ContentBox {
@@ -5586,18 +5614,20 @@ p, .LC_ContentBox {
 
 }
 .LC_FormSectionClearButton input {
-        background-color:transparent;    	    
+        background-color:transparent;
         border:0px;
         cursor:pointer;
         text-decoration:underline;
 }
-.LC_helptextbgcolor
-{
-	background-color:#5555FF;
-}
-.LC_helptextfontcolor
-{
-	color:#FFFFFF;
+
+.LC_help_open_topic {
+        color: #FFFFFF;
+        background-color: #EEEEFF;
+        margin: 1px;
+        padding: 4px;
+        border: 1px solid #000033;
+        white-space: nowrap;
+/*		vertical-align: middle; */
 }
 
 dl,ul,div,fieldset {
@@ -5662,15 +5692,17 @@ ul.LC_TabContent li{
 	background-color:$tabbg;
 	border-bottom:solid 1px $lg_border_color;
 }
-ul.LC_TabContent li a, ul.LC_TabContent li{ 
+ul.LC_TabContent li a, ul.LC_TabContent li{
 	color:rgb(47,47,47);
 	text-decoration:none;
 	font-size:95%;
 	font-weight:bold;
+	padding-right: 16px;
 }
 ul.LC_TabContent li:hover, ul.LC_TabContent li.active{
-	background-color:#FFFFFF;
+        background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
 	border-bottom:solid 1px #FFFFFF;
+	padding-right: 16px;
 }
 ul.LC_TabContentBigger li{
 	vertical-align:bottom;
@@ -5687,18 +5719,8 @@ ul.LC_TabContentBigger li, ul.LC_TabCont
 	font-size:110%;
 	font-weight:bold;
 }
-#LC_CourseDocuments, #LC_SupplementalCourseDocuments
-{
-	margin:0px;
-}
-
-.LC_hideThis
-{
-	display:none;
-	visibility:hidden;
-}
 
-ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs {
+ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs, ul.LC_CourseBreadcrumbs{
 	border-top: solid 1px RGB(255, 255, 255);
 	height: 20px;
 	line-height: 20px;
@@ -5709,17 +5731,17 @@ ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcr
 	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
 }
 
-ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li {
+ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li, ul.LC_CourseBreadcrumbs li {
 /*
 	background: url(/adm/lonIcons/arrow_white.png) no-repeat left center;
-*/	
+*/
 	display: inline;
 	padding: 0px 0px 0px 10px;
-	vertical-align: bottom;
+/*	vertical-align: bottom; */
 	overflow:hidden;
 }
 
-ol#LC_MenuBreadcrumbs li a {
+ol#LC_MenuBreadcrumbs li a, ul.LC_CourseBreadcrumbs li a {
 	text-decoration: none;
 	font-size:90%;
 }
@@ -5728,6 +5750,10 @@ ol#LC_PathBreadcrumbs li a{
 	font-size:100%;
 	font-weight:bold;
 }
+.LC_BoxPadding
+{
+	padding: 10px;
+}
 .LC_ContentBoxSpecial
 {
 	border: solid 1px $lg_border_color;
@@ -5759,7 +5785,7 @@ dl.LC_ListStyleClean dd {
 .LC_ListStyleClean,
 .LC_ListStyleSimple,
 .LC_ListStyleNormal,
-.LC_ListStyleNormal_Border,
+.LC_ListStyle_Border,
 .LC_ListStyleSpecial
 	{
 	/*display:block;	*/
@@ -5849,7 +5875,7 @@ div.LC_columnSection > .ContentBoxSpecia
 .LC_loginpage_container {
 	text-align:left;
 	margin : 0 auto;
-	width:65%;
+	width:90%;
 	padding: 10px;
 	height: auto;
 	background-color:#FFFFFF;
@@ -5860,6 +5886,7 @@ div.LC_columnSection > .ContentBoxSpecia
 .LC_loginpage_loginContainer {
 	float:left;
 	width: 182px;
+	padding: 2px;
 	border:1px solid #CCCCCC;
 	background-color:$loginbg;
 }
@@ -5871,19 +5898,12 @@ div.LC_columnSection > .ContentBoxSpecia
 	color:$textcol;
 	padding-left:5px;
 }
+
 .LC_loginpage_loginInfo {
-	margin-left:20px;
 	float:left;
-	width:30%;
+	width:182px;
 	border:1px solid #CCCCCC;
-	padding:10px;
-}
-
-.LC_loginpage_loginDomain {
-	margin-right:20px;
-	width:20%;
-	float:left;
-	padding:10px;
+	padding:2px;
 }
 
 .LC_loginpage_space {
@@ -5892,28 +5912,41 @@ div.LC_columnSection > .ContentBoxSpecia
 	border-bottom: 1px solid #CCCCCC;
 }
 
+.LC_loginpage_floatLeft {
+	float: left;
+	width: 200px;
+	margin: 0;
+}
+
 table em{
 	font-weight: bold;
 	font-style: normal;
 }
-
-table#LC_tableOfContent{
-	border-collapse: collapse;
-	border-spacing: 0;
+table.LC_tableBrowseRes,
+table.LC_tableOfContent{
+        border:none;
+	border-spacing: 1;
 	padding: 3px;
-	border: 0;
 	background-color: #FFFFFF;
 	font-size: 90%;
 }
-table#LC_tableOfContent a {
+
+table.LC_tableOfContent{
+    border-collapse: collapse;
+}
+
+table.LC_tableBrowseRes a,
+table.LC_tableOfContent a {
+        background-color: transparent;
 	text-decoration: none;
 }
 
-table#LC_tableOfContent tr.LC_trOdd{
+table.LC_tableBrowseRes tr.LC_trOdd,
+table.LC_tableOfContent tr.LC_trOdd{
 	background-color: #EEEEEE;
 }
 
-table#LC_tableOfContent img{
+table.LC_tableOfContent img{
 	border: none;
 	height: 1.3em;
 	vertical-align: text-bottom;
@@ -5924,7 +5957,7 @@ a#LC_content_toolbar_firsthomework{
 	background-image:url(/res/adm/pages/open-first-problem.gif);
 }
 
-a#LC_content_toolbar_launchnav{	
+a#LC_content_toolbar_launchnav{
 	background-image:url(/res/adm/pages/start-navigation.gif);
 }
 
@@ -5957,7 +5990,7 @@ ul#LC_toolbar li a:hover{
 }
 
 ul#LC_toolbar{
-	padding:0; 
+	padding:0;
 	margin: 2px;
 	list-style:none;
 	position:relative;
@@ -5968,22 +6001,31 @@ ul#LC_toolbar li{
 	border:1px solid white;
 	padding:0;
 	margin: 0;
-	display:inline-block;
+    float: left;
+	display:inline;
 	vertical-align:middle;
 }
 
+
 a.LC_toolbarItem{
-	display:inline-block;
+	display:block;
 	padding:0;
 	margin:0;
 	height: 32px;
 	width: 32px;
-	color:white; 
-	border:0 none;	
+	color:white;
+	border:0 none;
 	background-repeat:no-repeat;
 	background-color:transparent;
 }
 
+ul.LC_functionslist li {
+  float: left;
+  white-space: nowrap;
+  height: 35px; /* at least as high as heighest list item */
+  margin: 0px 15px 15px 10px;
+}
+
 
 END
 }
@@ -7019,6 +7061,8 @@ If the user's status includes multiple t
 the largest default quota which applies to the user determines the
 default quota returned.
 
+=back
+
 =cut
 
 ###############################################
@@ -7031,7 +7075,7 @@ sub default_quota {
                                             ['quotas'],$udom);
     if (ref($quotahash{'quotas'}) eq 'HASH') {
         if ($inststatus ne '') {
-            my @statuses = split(/:/,$inststatus);
+            my @statuses = map { &unescape($_); } split(/:/,$inststatus);
             foreach my $item (@statuses) {
                 if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
                     if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {
@@ -7497,6 +7541,7 @@ sub personal_data_fieldtitles {
                         middlename => 'Middle Name',
                         generation => 'Generation',
                         gen => 'Generation',
+                        inststatus => 'Affiliation',
                    );
     return %fieldtitles;
 }
@@ -7566,8 +7611,57 @@ sub get_institutional_codes {
 
 =pod
 
+=head1 Slot Helpers
+
+=over 4
+
+=item * sorted_slots()
+
+Sorts an array of slot names in order of slot start time (earliest first). 
+
+Inputs:
+
+=over 4
+
+slotsarr  - Reference to array of unsorted slot names.
+
+slots     - Reference to hash of hash, where outer hash keys are slot names.
+
+=back
+
+Returns:
+
+=over 4
+
+sorted   - An array of slot names sorted by the start time of the slot.
+
+=back
+
 =back
 
+=cut
+
+
+sub sorted_slots {
+    my ($slotsarr,$slots) = @_;
+    my @sorted;
+    if ((ref($slotsarr) eq 'ARRAY') && (ref($slots) eq 'HASH')) {
+        @sorted =
+            sort {
+                     if (ref($slots->{$a}) && ref($slots->{$b})) {
+                         return $slots->{$a}{'starttime'} <=> $slots->{$b}{'starttime'}
+                     }
+                     if (ref($slots->{$a})) { return -1;}
+                     if (ref($slots->{$b})) { return 1;}
+                     return 0;
+                 } @{$slotsarr};
+    }
+    return @sorted;
+}
+
+
+=pod
+
 =head1 HTTP Helpers
 
 =over 4
@@ -8862,9 +8956,10 @@ sub restore_settings {
 
 =item * &build_recipient_list()
 
-Build recipient lists for three types of e-mail:
-(a) Error Reports, (b) Package Updates, (c) Help requests, generated by
-lonerrorhandler.pm, CHECKRPMS and lonsupportreq.pm respectively.
+Build recipient lists for four types of e-mail:
+(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
+(d) Help requests, generated by
+lonerrorhandler.pm, CHECKRPMS, loncron, and lonsupportreq.pm respectively.
 
 Inputs:
 defmail (scalar - email address of default recipient), 
@@ -8888,17 +8983,21 @@ sub build_recipient_list {
     my %domconfig =
          &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
     if (ref($domconfig{'contacts'}) eq 'HASH') {
-        if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
-            my @contacts = ('adminemail','supportemail');
-            foreach my $item (@contacts) {
-                if ($domconfig{'contacts'}{$mailing}{$item}) {
-                    my $addr = $domconfig{'contacts'}{$item}; 
-                    if (!grep(/^\Q$addr\E$/,@recipients)) {
-                        push(@recipients,$addr);
+        if (exists($domconfig{'contacts'}{$mailing})) {
+            if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
+                my @contacts = ('adminemail','supportemail');
+                foreach my $item (@contacts) {
+                    if ($domconfig{'contacts'}{$mailing}{$item}) {
+                        my $addr = $domconfig{'contacts'}{$item}; 
+                        if (!grep(/^\Q$addr\E$/,@recipients)) {
+                            push(@recipients,$addr);
+                        }
                     }
+                    $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
                 }
-                $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
             }
+        } elsif ($origmail ne '') {
+            push(@recipients,$origmail);
         }
     } elsif ($origmail ne '') {
         push(@recipients,$origmail);
@@ -9169,7 +9268,7 @@ sub assign_categories_table {
                     my $checked = '';
                     if (@currcategories > 0) {
                         if (grep(/^\Q$item\E$/,@currcategories)) {
-                            $checked = ' checked="checked" ';
+                            $checked = ' checked="checked"';
                         }
                     }
                     $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
@@ -9235,7 +9334,7 @@ sub assign_category_rows {
                     if (ref($currcategories) eq 'ARRAY') {
                         if (@{$currcategories} > 0) {
                             if (grep(/^\Q$item\E$/,@{$currcategories})) {
-                                $checked = ' checked="checked" ';
+                                $checked = ' checked="checked"';
                             }
                         }
                     }
@@ -10007,6 +10106,12 @@ sub init_user_environment {
                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
         }
 
+        foreach my $crstype ('official','unofficial') {
+            $userenv{'canrequest.'.$crstype} =
+                &Apache::lonnet::usertools_access($username,$domain,$crstype,
+                                                  'reload','requestcourses');
+        }
+
 	$env{'user.environment'} = "$lonids/$cookie.id";
 	
 	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",