--- loncom/interface/loncommon.pm	2008/12/14 00:33:35	1.715
+++ loncom/interface/loncommon.pm	2009/03/17 20:07:45	1.769
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.715 2008/12/14 00:33:35 raeburn Exp $
+# $Id: loncommon.pm,v 1.769 2009/03/17 20:07:45 schulted Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -923,19 +923,23 @@ sub help_open_topic {
     }
 
     # Add the text
-    if ($text ne "") {
-	$template .= 
-            "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
-            "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF;font-size:10pt;\">$text</span></a>";
+    if ($text ne "") {	
+	$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
-    if ($text ne '') { $template.='</td></tr></table>' };
+    $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;
 
 }
@@ -943,24 +947,31 @@ ENDTEMPLATE
 # This is a quicky function for Latex cheatsheet editing, since it 
 # appears in at least four places
 sub helpLatexCheatsheet {
-    my $other = shift;
+    my ($topic,$text,$not_author) = @_;
+    my $out;
     my $addOther = '';
-    if ($other) {
-	$addOther = Apache::loncommon::help_open_topic($other, shift,
-						       undef, undef, 600) .
-							   '</td><td>';
-    }
-    return '<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><td>'.
-	&Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
-	                                    undef,undef,600)
-	.'</td></tr></table>';
+    if ($topic) {
+	$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 .= ' <span>'
+	       .&Apache::loncommon::help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),
+	                                            undef,undef,600)
+	       .'</span>';
+    }
+    $out .= '</span>'; # End cheatsheet
+    return $out;
 }
 
 sub general_help {
@@ -1629,7 +1640,7 @@ sub multiple_select_form {
             $size = scalar(keys(%$hash));
         }
     }
-    $output.="\n<select name='$name' size='$size' multiple='1'>";
+    $output.="\n".'<select name="'.$name.'" size="'.$size.'" multiple="multiple">';
     my @order;
     if (ref($order) eq 'ARRAY')  {
         @order = @{$order};
@@ -1740,7 +1751,7 @@ sub select_level_form {
 
 =pod
 
-=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc)
+=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$autosubmit)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select the domain to preform an operation in.  
@@ -1749,16 +1760,22 @@ See loncreateuser.pm for an example invo
 If the $includeempty flag is set, it also includes an empty choice ("no domain
 selected");
 
-If the $showdomdesc flag is set, the domain name is followed by the domain description. 
+If the $showdomdesc flag is set, the domain name is followed by the domain description.
+
+If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action.  
 
 =cut
 
 #-------------------------------------------
 sub select_dom_form {
-    my ($defdom,$name,$includeempty,$showdomdesc) = @_;
+    my ($defdom,$name,$includeempty,$showdomdesc,$autosubmit) = @_;
+    my $onchange;
+    if ($autosubmit) {
+        $onchange = ' onchange="this.form.submit()"';
+    }
     my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
     if ($includeempty) { @domains=('',@domains); }
-    my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
+    my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
     foreach my $dom (@domains) {
         $selectdomain.="<option value=\"$dom\" ".
             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
@@ -2717,6 +2734,43 @@ sub flush_email_cache {
     &Apache::lonnet::devalidate_cache_new('emailscache',$id);
 }
 
+# -------------------------------------------------------------------- getlangs
+
+=pod
+
+=item * &getlangs($uname,$udom)
+
+Gets a user's language preference and returns it as a hash with key:
+language.
+
+=cut
+
+
+sub getlangs {
+    my ($uname,$udom) = @_;
+    if (!$udom)  { $udom =$env{'user.domain'}; }
+    if (!$uname) { $uname=$env{'user.name'};   }
+    my $id=$uname.':'.$udom;
+    my ($langs,$cached)=&Apache::lonnet::is_cached_new('userlangs',$id);
+    if ($cached) {
+        return %{$langs};
+    } else {
+        my %loadlangs=&Apache::lonnet::get('environment',['languages'],
+                                           $udom,$uname);
+        &Apache::lonnet::do_cache_new('userlangs',$id,\%loadlangs);
+        return %loadlangs;
+    }
+}
+
+sub flush_langs_cache {
+    my ($uname,$udom)=@_;
+    if (!$udom)  { $udom =$env{'user.domain'}; }
+    if (!$uname) { $uname=$env{'user.name'};   }
+    return if ($udom eq 'public' && $uname eq 'public');
+    my $id=$uname.':'.$udom;
+    &Apache::lonnet::devalidate_cache_new('userlangs',$id);
+}
+
 # ------------------------------------------------------------------ Screenname
 
 =pod
@@ -2761,7 +2815,7 @@ sub aboutmewrapper {
         return;
     }
     return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
-	($target?' target="$target"':'').' title="'.&mt("View this user's personal page").'">'.$link.'</a>';
+	($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'</a>';
 }
 
 # ------------------------------------------------------------ Syllabus Wrapper
@@ -3030,6 +3084,29 @@ sub languages {
     return $preferred_possibilities[0];
 }
 
+sub user_lang {
+    my ($touname,$toudom,$fromcid) = @_;
+    my @userlangs;
+    if (($fromcid ne '') && ($env{'course.'.$fromcid.'.languages'} ne '')) {
+        @userlangs=(@userlangs,split(/\s*(\,|\;|\:)\s*/,
+                    $env{'course.'.$fromcid.'.languages'}));
+    } else {
+        my %langhash = &getlangs($touname,$toudom);
+        if ($langhash{'languages'} ne '') {
+            @userlangs = split(/\s*(\,|\;|\:)\s*/,$langhash{'languages'});
+        } else {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($toudom);
+            if ($domdefs{'lang_def'} ne '') {
+                @userlangs = ($domdefs{'lang_def'});
+            }
+        }
+    }
+    my @languages=&Apache::lonlocal::get_genlanguages(@userlangs);
+    my $user_lh = Apache::localize->get_handle(@languages);
+    return $user_lh;
+}
+
+
 ###############################################################
 ##               Student Answer Attempts                     ##
 ###############################################################
@@ -3168,7 +3245,7 @@ sub relative_to_absolute {
     }
     $thisdir=~s-/[^/]*$--;
     foreach my $link (@rlinks) {
-	unless (($link=~/^http:\/\//i) ||
+	unless (($link=~/^https?\:\/\//i) ||
 		($link=~/^\//) ||
 		($link=~/^javascript:/i) ||
 		($link=~/^mailto:/i) ||
@@ -3745,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' && 
@@ -4174,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;
     }
@@ -4443,12 +4520,22 @@ table.thinborder tr td {
 }
 
 form, .inline { display: inline; }
-.center { text-align: center; }
-.left { text-align:left; }
-.right {text-align:right;}
-.middle {vertical-align:middle;}
-.top {vertical-align:top;}
-.bottom {vertical-align:bottom;}
+
+.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_error {
   color: red;
@@ -4482,7 +4569,7 @@ form, .inline { display: inline; }
 }
 
 .LC_internal_info {
-  color: #999;
+  color: #999999;
 }
 
 table.LC_pastsubmission {
@@ -4531,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;
@@ -4704,7 +4788,7 @@ table.LC_prior_tries tr th {
   font-size:90%;
 }
 table.LC_data_table tr.LC_info_row > td {
-  background-color: #CCC;
+  background-color: #CCCCCC;
   font-weight: bold;
   text-align: left;
 }
@@ -4752,7 +4836,7 @@ table.LC_nested_outer tr td.LC_subheader
   text-align: right;
 }
 table.LC_nested tr.LC_info_row td {
-  background-color: #CCC;
+  background-color: #CCCCCC;
   font-weight: bold;
   font-size: small;
   text-align: center;
@@ -4762,7 +4846,7 @@ table.LC_nested_outer tr th.LC_left_item
   text-align: left;
 }
 table.LC_nested td {
-  background-color: #FFF;
+  background-color: #FFFFFF;
   font-size: small;
 }
 table.LC_nested_outer tr th.LC_right_item,
@@ -4773,7 +4857,7 @@ table.LC_nested tr td.LC_right_item {
 }
 
 table.LC_nested tr.LC_odd_row td {
-  background-color: #EEE;
+  background-color: #EEEEEE;
 }
 
 table.LC_createuser {
@@ -4784,7 +4868,7 @@ table.LC_createuser tr.LC_section_row td
 }
 
 table.LC_createuser tr.LC_info_row td  {
-  background-color: #CCC;
+  background-color: #CCCCCC;
   font-weight: bold;
   text-align: center;
 }
@@ -4974,6 +5058,7 @@ table.LC_pick_box td.LC_pick_box_title {
   background: $tabbg;
   font-weight: bold;
   text-align: right;
+  vertical-align: top;
   width: 184px;
   padding: 8px;
 }
@@ -5215,13 +5300,6 @@ table.LC_docs_documents td.LC_docs_docum
   padding: 4px;
 }
 
-.LC_docs_course_commands div {
-  float: left;
-  border: 4px solid #AAAAAA;
-  padding: 4px;
-  background: #DDDDCC;
-}
-
 .LC_docs_entry_move {
   border: 0px;
   border-collapse: collapse;
@@ -5448,6 +5526,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.
@@ -5456,41 +5538,44 @@ table#LC_mainmenu td.LC_mainmenu_col_fie
 # --------------------------*/
 
 a:hover,
-ol.smallMenu a:hover,
-ol#MenuBreadcrumbs a:hover,
-ul#TabMainMenuContent a:hover,
-.FormSectionClearButton input:hover{
+ol.LC_smallMenu a:hover,
+ol#LC_MenuBreadcrumbs a:hover,
+ol#LC_PathBreadcrumbs a:hover,
+ul#LC_TabMainMenuContent a:hover,
+.LC_FormSectionClearButton input:hover
+ul.LC_TabContent   li:hover a{
 	color:#BF2317;
         text-decoration:none;
 }
 
 h1 { 
-	padding:5px 10px 5px 0px;
+	padding:5px 10px 5px 20px;
 	line-height:130%;
 }
 
 h2,h3,h4,h5,h6
 {
-margin:5px 0px 5px 0px;
-line-height:130%;
+	margin:5px 0px 5px 0px;
+	padding:0px;
+	line-height:130%;
 }
-.hcell{
+.LC_hcell{
         padding:3px 15px 3px 15px;
         margin:0px;
 	background-color:$tabbg;
 	border-bottom:solid 1px $lg_border_color;       
 }
-.noBorder {
+.LC_noBorder {
         border:0px;
 }
-/*
-.bgLightGrey { background:URL(images/TabMenuBG.png) repeat-x left top; }
-.bgLightGreyYellow {background-color:#EFECE0;}
-*/
+
+.LC_bgLightGrey{
+	background:URL(/adm/lonIcons/lightGreyBG.png) repeat-x left bottom;
+}
 
 
 /* Main Header with discription of Person, Course, etc. */
-.HeadRight {
+.LC_HeadRight {
 	text-align: right;
 	float: right;
 	margin: 0px;
@@ -5500,71 +5585,133 @@ line-height:130%;
         overflow:hidden;
 }
 
-p {
+.LC_Right {
+        float: right;
+        margin: 0px;
+        padding: 0px;
+}
+
+p, .LC_ContentBox {
 	padding: 10px;
 
 }
-.FormSectionClearButton input {
-        background-color:transparent;
+.LC_FormSectionClearButton input {
+        background-color:transparent;    	    
         border:0px;
         cursor:pointer;
         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;
 	overflow:hidden;
 }
-ol.smallMenu {
+ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
 	margin: 0px;
 }
 
-ol.smallMenu li {
+ol.LC_smallMenu li {
 	display: inline;
 	padding: 5px 5px 0px 10px;
 	vertical-align: top;
 }
 
-ol.smallMenu li img {
+ol.LC_smallMenu li img {
 	vertical-align: bottom;
 }
 
-ol.smallMenu a {
+ol.LC_smallMenu a {
 	font-size: 90%;
 	color: RGB(80, 80, 80);
 	text-decoration: none;
 }
-
-ol#TabMainMenuContent {
-	
-	margin: 0px 0px 10px 0px;
+ol#LC_TabMainMenuContent, ul.LC_TabContent ,
+ul.LC_TabContentBigger {
+	display:block;
+	list-style:none;
+	margin: 0px;
 	padding: 0px;
 }
 
-ol#TabMainMenuContent li {
+ol#LC_TabMainMenuContent li, ul.LC_TabContent li,
+ul.LC_TabContentBigger li{
 	display: inline;
+	border-right: solid 1px $lg_border_color;
+	float:left;
+	line-height:140%;
+	white-space:nowrap;
+}
+ol#LC_TabMainMenuContent li{
 	vertical-align: bottom;
 	border-bottom: solid 1px RGB(175, 175, 175);
-	border-right: solid 1px RGB(175, 175, 175);
-	padding: 5px 15px 5px 15px;
-	margin-right:4px;
-	line-height: 140%;
+	padding: 5px 10px 5px 10px;
+	margin-right:5px;
+	margin-bottom:3px;
 	font-weight: bold;
-	overflow:hidden;
-/*	background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left top;*/
+	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
 }
 
-ol#TabMainMenuContent li a{
+ol#LC_TabMainMenuContent li a{
 	color: RGB(47, 47, 47);
 	text-decoration: none;
 }
+ul.LC_TabContent {
+	min-height:1.6em;
+}
+ul.LC_TabContent li{
+	vertical-align:middle;
+	padding:0px 10px 0px 10px;
+	background-color:$tabbg;
+	border-bottom:solid 1px $lg_border_color;
+}
+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:#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;
+	border-top:solid 1px $lg_border_color;
+	border-left:solid 1px $lg_border_color;
+	padding:5px 10px 5px 10px;
+	margin-left:2px;
+	background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+}
+ul.LC_TabContentBigger li:hover, ul.LC_TabContentBigger li.active{
+	background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom;
+}
+ul.LC_TabContentBigger li, ul.LC_TabContentBigger li a{
+	font-size:110%;
+	font-weight:bold;
+}
+#LC_CourseDocuments, #LC_SupplementalCourseDocuments
+{
+	margin:0px;
+}
 
-ol#TabMainMenuContent div.columnSection {
-	margin-bottom: 0px;
+.LC_hideThis
+{
+	display:none;
+	visibility:hidden;
 }
 
-ol#MenuBreadcrumbs, ol#PathBreadcrumbs {
+ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs {
 	border-top: solid 1px RGB(255, 255, 255);
 	height: 20px;
 	line-height: 20px;
@@ -5572,63 +5719,61 @@ ol#MenuBreadcrumbs, ol#PathBreadcrumbs {
 	margin: 0px 0px 30px 0px;
 	padding-left: 10px;
 	list-style-position: inside;
-/*	background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left
-		top;*/
+	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
 }
 
-ol#MenuBreadcrumbs li, ol#PathBreadcrumbs li {
-/*	background: url(images/pfeil_white.png) no-repeat left center;*/
+ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li {
+/*
+	background: url(/adm/lonIcons/arrow_white.png) no-repeat left center;
+*/	
 	display: inline;
 	padding: 0px 0px 0px 10px;
 	vertical-align: bottom;
 	overflow:hidden;
 }
 
-ol#MenuBreadcrumbs li a {
+ol#LC_MenuBreadcrumbs li a {
 	text-decoration: none;
 	font-size:90%;
 }
-ol#PathBreadcrumbs li a{
+ol#LC_PathBreadcrumbs li a{
 	text-decoration:none;
 	font-size:100%;
 	font-weight:bold;
 }
-
-.ContentBoxSpecial
+.LC_ContentBoxSpecial
 {
 	border: solid 1px $lg_border_color;
 }
-.ContentBox {
-	padding:10px;
+.LC_ContentBoxSpecialContactInfo
+{
+	border: solid 1px $lg_border_color;
+	max-width:25%;
+	min-width:25%;
 }
-.PopUp
+.LC_AboutMe_Image
 {
-	padding:10px;
-	border-left:solid 1px $lg_border_color;
- 	border-top:solid 1px $lg_border_color;
-	border-bottom:outset 1px $lg_border_color;
-	border-right:outset 1px $lg_border_color;
-	display:none;
-	position:absolute;
-	right:0;
-	background-color:white;
-	z-index:5;
+	float:left;
+	margin-right:10px;
 }
-
-dl.ListStyleClean dt {
+.LC_Clear_AboutMe_Image
+{
+	clear:left;
+}
+dl.LC_ListStyleClean dt {
 	padding-right: 5px;
 	display: table-header-group;
 }
 
-dl.ListStyleClean dd {
+dl.LC_ListStyleClean dd {
 	display: table-row;
 }
 
-.ListStyleClean,
-.ListStyleSimple,
-.ListStyleNormal,
-.ListStyleNormal_Border,
-.ListStyleSpecial
+.LC_ListStyleClean,
+.LC_ListStyleSimple,
+.LC_ListStyleNormal,
+.LC_ListStyleNormal_Border,
+.LC_ListStyleSpecial
 	{
 	/*display:block;	*/
 	list-style-position: inside;
@@ -5637,66 +5782,81 @@ dl.ListStyleClean dd {
 	padding: 0px;
 }
 
-.ListStyleSimple li,
-.ListStyleSimple dd,
-.ListStyleNormal li,
-.ListStyleNormal dd,
-.ListStyleSpecial li,
-.ListStyleSpecial dd
+.LC_ListStyleSimple li,
+.LC_ListStyleSimple dd,
+.LC_ListStyleNormal li,
+.LC_ListStyleNormal dd,
+.LC_ListStyleSpecial li,
+.LC_ListStyleSpecial dd
 	{
 	margin: 0px;
 	padding: 5px 5px 5px 10px;
 	clear: both;
 }
 
-.ListStyleClean li,
-.ListStyleClean dd {
+.LC_ListStyleClean li,
+.LC_ListStyleClean dd {
 	padding-top: 0px;
 	padding-bottom: 0px;
 }
 
-.ListStyleSimple dd,
-.ListStyleSimple li{
+.LC_ListStyleSimple dd,
+.LC_ListStyleSimple li{
 	border-bottom: solid 1px $lg_border_color;
 }
 
-.ListStyleSpecial li,
-.ListStyleSpecial dd {
+.LC_ListStyleSpecial li,
+.LC_ListStyleSpecial dd {
 	list-style-type: none;
 	background-color: RGB(220, 220, 220);
 	margin-bottom: 4px;
 }
 
-table.SimpleTable {
+table.LC_SimpleTable {
 	margin:5px;
 	border:solid 1px $lg_border_color;
 	}
 
-table.SimpleTable tr {
+table.LC_SimpleTable tr {
 	padding:0px;
 	border:solid 1px $lg_border_color;
 }
-table.SimpleTable thead{
+table.LC_SimpleTable thead{
 	 background:rgb(220,220,220);
 }
 
-div.columnSection {
+div.LC_columnSection {
 	display: block;
 	clear: both;
 	overflow: hidden;
 	margin:0px;
 }
 
-div.columnSection>* {
+div.LC_columnSection>* {
 	float: left;
 	margin: 10px 20px 10px 0px;
-	overflow:hidden;	
+	overflow:hidden;
 }
-div.columnSection > .ContentBox,
-div.columnSection > .ContentBoxSpecial
-	{
-	width: 400px;
-	
+
+.ContentBoxSpecialTemplate
+{
+        border: solid 1px $lg_border_color;
+}
+.ContentBoxTemplate {
+        padding:10px;
+}
+
+div.LC_columnSection > .ContentBoxTemplate,
+div.LC_columnSection > .ContentBoxSpecialTemplate
+        {
+        width: 600px;
+}
+
+.clear{
+	clear: both;
+	line-height: 0px;
+	font-size: 0px;
+	height: 0px;
 }
 
 .LC_loginpage_container {
@@ -5717,7 +5877,7 @@ div.columnSection > .ContentBoxSpecial
 	background-color:$loginbg;
 }
 
-.LC_loginpage_loginContainer h1{
+.LC_loginpage_loginContainer h2{
 	margin-top:0;
 	display:block;
 	background:$bgcol;
@@ -5740,21 +5900,102 @@ div.columnSection > .ContentBoxSpecial
 }
 
 .LC_loginpage_space {
-	clear:both;
-	margin-bottom:20px;
+	clear: both;
+	margin-bottom: 20px;
 	border-bottom: 1px solid #CCCCCC;
 }
 
-.LC_loginpage_fieldset{
-	border: 1px solid #CCCCCC;
-	margin: 0 auto;
+table em{
+	font-weight: bold;
+	font-style: normal;
 }
 
-.LC_loginpage_legend{
-	padding: 2px;
-	margin: 0px;
-	font-size:14px;
-	font-weight:bold;
+table.LC_tableOfContent{
+        border:none;
+	border-spacing: 1;
+	padding: 3px;
+	background-color: #FFFFFF;
+	font-size: 90%;
+}
+table.LC_tableOfContent a {
+        background-color:transparent;
+	text-decoration: none;
+}
+
+table.LC_tableOfContent tr.LC_trOdd{
+	background-color: #EEEEEE;
+}
+
+table.LC_tableOfContent img{
+	border: none;
+	height: 1.3em;
+	vertical-align: text-bottom;
+	margin-right: 0.3em;
+}
+
+a#LC_content_toolbar_firsthomework{
+	background-image:url(/res/adm/pages/open-first-problem.gif);
+}
+
+a#LC_content_toolbar_launchnav{	
+	background-image:url(/res/adm/pages/start-navigation.gif);
+}
+
+a#LC_content_toolbar_closenav{
+	background-image:url(/res/adm/pages/close-navigation.gif);
+}
+
+a#LC_content_toolbar_everything{
+	background-image:url(/res/adm/pages/show-all.gif);
+}
+
+a#LC_content_toolbar_uncompleted{
+	background-image:url(/res/adm/pages/show-incomplete-problems.gif);
+}
+
+#LC_content_toolbar_clearbubbles{
+	background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
+}
+
+a#LC_content_toolbar_changefolder{
+	background : url(/res/adm/pages/close-all-folders.gif) top center ;
+}
+
+a#LC_content_toolbar_changefolder_toggled{
+	background-image:url(/res/adm/pages/open-all-folders.gif);
+}
+
+ul#LC_toolbar li a:hover{
+	background-position: bottom center;
+}
+
+ul#LC_toolbar{
+	padding:0; 
+	margin: 2px;
+	list-style:none;
+	position:relative;
+	background-color:white;
+}
+
+ul#LC_toolbar li{
+	border:1px solid white;
+	padding:0;
+	margin: 0;
+    float: left;
+	display:inline;
+	vertical-align:middle;
+}
+
+a.LC_toolbarItem{
+	display:block;
+	padding:0;
+	margin:0;
+	height: 32px;
+	width: 32px;
+	color:white; 
+	border:0 none;	
+	background-repeat:no-repeat;
+	background-color:transparent;
 }
 
 
@@ -6027,15 +6268,23 @@ sub start_page {
 		$result = &html_encode($result);
     }
 
-	if (exists $args->{'bread_crumbs'}) {
+	#Breadcrumbs
+    if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
 		&Apache::lonhtmlcommon::clear_breadcrumbs();
-		my $temp = $args->{'bread_crumbs'};
-		foreach my $crumb (@$temp){
-			&Apache::lonhtmlcommon::add_breadcrumb($crumb);
+		#if any br links exists, add them to the breadcrumbs
+		if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') {         
+			foreach my $crumb (@{$args->{'bread_crumbs'}}){
+				&Apache::lonhtmlcommon::add_breadcrumb($crumb);
+			}
 		}
-		$result .= &Apache::lonhtmlcommon::breadcrumbs();
-    }
 
+		#if bread_crumbs_component exists show it as headline else show only the breadcrumbs
+		if(exists($args->{'bread_crumbs_component'})){
+			$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
+		}else{
+			$result .= &Apache::lonhtmlcommon::breadcrumbs();
+		}
+    }
     return $result;
 }
 
@@ -6796,7 +7045,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 '') {
@@ -7262,6 +7511,7 @@ sub personal_data_fieldtitles {
                         middlename => 'Middle Name',
                         generation => 'Generation',
                         gen => 'Generation',
+                        inststatus => 'Affiliation',
                    );
     return %fieldtitles;
 }
@@ -7883,7 +8133,7 @@ sub upfile_select_html {
 #                 xml   => &mt('HTML/XML'),
                  );
     my $Str = '<input type="file" name="upfile" size="50" />'.
-        '<br />Type: <select name="upfiletype">';
+        '<br />'.&mt('Type').': <select name="upfiletype">';
     foreach my $type (sort(keys(%Types))) {
         $Str .= '<option value="'.$type.'" >'.$Types{$type}."</option>\n";
     }
@@ -7971,7 +8221,7 @@ sub csv_print_select_table {
               &end_data_table_header_row()."\n");
     foreach my $array_ref (@$d) {
 	my ($value,$display,$defaultcol)=@{ $array_ref };
-	$r->print(&start_data_table_row().'<tr><td>'.$display.'</td>');
+	$r->print(&start_data_table_row().'<td>'.$display.'</td>');
 
 	$r->print('<td><select name=f'.$i.
 		  ' onchange="javascript:flip(this.form,'.$i.');">');
@@ -8627,9 +8877,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), 
@@ -8653,17 +8904,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);
@@ -9307,7 +9562,9 @@ sub construct_course {
                    'policy.email',
                    'comment.email',
                    'pch.users.denied',
-                   'plc.users.denied'],
+                   'plc.users.denied',
+                   'hidefromcat',
+                   'categories'],
                    $$crsudom,$$crsunum);
     }
 
@@ -9765,6 +10022,17 @@ sub init_user_environment {
 	    }
 	}
 
+        foreach my $tool ('aboutme','blog','portfolio') {
+            $userenv{'availabletools.'.$tool} = 
+                &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",
@@ -9803,7 +10071,7 @@ sub _add_to_env {
 # --- Get the symbolic name of a problem and the url
 sub get_symb {
     my ($request,$silent) = @_;
-    (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+    (my $url=$env{'form.url'}) =~ s-^https?\://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
     my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
     if ($symb eq '') {
         if (!$silent) {
@@ -9830,11 +10098,13 @@ sub get_annotation {
 }
 
 sub clean_symb {
-    my ($symb) = @_;
+    my ($symb,$delete_enc) = @_;
 
     &Apache::lonenc::check_decrypt(\$symb);
     my $enc = $env{'request.enc'};
-    delete($env{'request.enc'});
+    if ($delete_enc) {
+        delete($env{'request.enc'});
+    }
 
     return ($symb,$enc);
 }