--- loncom/interface/loncommon.pm	2009/02/26 22:22:51	1.758
+++ loncom/interface/loncommon.pm	2009/03/17 16:11:52	1.768
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.758 2009/02/26 22:22:51 kaisler Exp $
+# $Id: loncommon.pm,v 1.768 2009/03/17 16:11:52 schulted Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -924,16 +924,22 @@ sub help_open_topic {
 
     # Add the text
     if ($text ne "") {	
-	$template.="<a style=\"background-color:#3333AA;\" target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF;\">$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>
-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 +951,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;
 }
 
@@ -3815,7 +3822,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 +4251,7 @@ $realm&nbsp;
 </td>
 ENDROLE
 
-    my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
+    my $titleinfo = '<h1>'.$title.'</h1>';
     if ($customtitle) {
         $titleinfo = $customtitle;
     }
@@ -4611,9 +4618,6 @@ table#LC_title_bar td.LC_title_bar_who {
 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;
@@ -5581,6 +5585,12 @@ h2,h3,h4,h5,h6
         overflow:hidden;
 }
 
+.LC_Right {
+        float: right;
+        margin: 0px;
+        padding: 0px;
+}
+
 p, .LC_ContentBox {
 	padding: 10px;
 
@@ -5592,6 +5602,14 @@ p, .LC_ContentBox {
         text-decoration:underline;
 }
 
+.LC_help_open_topic {
+        color: #FFFFFF;
+        background-color: #EEEEFF;
+        margin: 1px;
+        padding: 4px;
+        border: 1px solid #000033;
+        white-space: nowrap;
+}
 
 dl,ul,div,fieldset {
 	margin: 10px 10px 10px 0px;
@@ -5616,7 +5634,7 @@ ol.LC_smallMenu a {
 	color: RGB(80, 80, 80);
 	text-decoration: none;
 }
-ol#LC_TabMainMenueContent, ul.LC_TabContent ,
+ol#LC_TabMainMenuContent, ul.LC_TabContent ,
 ul.LC_TabContentBigger {
 	display:block;
 	list-style:none;
@@ -5660,10 +5678,12 @@ ul.LC_TabContent li a, ul.LC_TabContent
 	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;
@@ -5890,7 +5910,7 @@ table em{
 	font-style: normal;
 }
 
-table#LC_tableOfContent{
+table.LC_tableOfContent{
 	border-collapse: collapse;
 	border-spacing: 0;
 	padding: 3px;
@@ -5898,15 +5918,16 @@ table#LC_tableOfContent{
 	background-color: #FFFFFF;
 	font-size: 90%;
 }
-table#LC_tableOfContent a {
+table.LC_tableOfContent a {
+        background-color:transparent;
 	text-decoration: none;
 }
 
-table#LC_tableOfContent 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;
@@ -5961,12 +5982,13 @@ 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;
@@ -7024,7 +7046,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 '') {
@@ -7490,6 +7512,7 @@ sub personal_data_fieldtitles {
                         middlename => 'Middle Name',
                         generation => 'Generation',
                         gen => 'Generation',
+                        inststatus => 'Affiliation',
                    );
     return %fieldtitles;
 }
@@ -8855,9 +8878,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), 
@@ -8881,17 +8905,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);
@@ -10000,6 +10028,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",