--- loncom/interface/loncommon.pm	2010/11/01 13:45:35	1.692.4.37
+++ loncom/interface/loncommon.pm	2008/11/14 13:29:28	1.693
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.692.4.37 2010/11/01 13:45:35 raeburn Exp $
+# $Id: loncommon.pm,v 1.693 2008/11/14 13:29:28 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -406,10 +406,9 @@ sub studentbrowser_javascript {
          || ($env{'request.role'}=~/^(au|dc|su)/)
           ) { return ''; }  
    return (<<'ENDSTDBRW');
-<script type="text/javascript" language="Javascript">
-// <![CDATA[
+<script type="text/javascript" language="Javascript" >
     var stdeditbrowser;
-    function openstdbrowser(formname,uname,udom,roleflag,ignorefilter,courseadvonly) {
+    function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
         var url = '/adm/pickstudent?';
         var filter;
 	if (!ignorefilter) {
@@ -423,39 +422,30 @@ sub studentbrowser_javascript {
         url += 'form=' + formname + '&unameelement='+uname+
                                     '&udomelement='+udom;
 	if (roleflag) { url+="&roles=1"; }
-        if (courseadvonly) { url+="&courseadvonly=1"; }
         var title = 'Student_Browser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
         options += ',width=700,height=600';
         stdeditbrowser = open(url,title,options,'1');
         stdeditbrowser.focus();
     }
-// ]]>
 </script>
 ENDSTDBRW
 }
 
 sub selectstudent_link {
-   my ($form,$unameele,$udomele,$courseadvonly)=@_;
-   my $callargs = "'".$form."','".$unameele."','".$udomele."'";
+   my ($form,$unameele,$udomele)=@_;
    if ($env{'request.course.id'}) {  
        if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	   && !&Apache::lonnet::allowed('srm',$env{'request.course.id'}.
 					'/'.$env{'request.course.sec'})) {
 	   return '';
        }
-       if ($courseadvonly)  {
-           $callargs .= ",'',1,1";
-       }
-       return '<span class="LC_nobreak">'.
-              '<a href="javascript:openstdbrowser('.$callargs.');">'.
-              &mt('Select User').'</a></span>';
+       return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
+        '","'.$udomele.'");'."'>".&mt('Select User')."</a>";
    }
    if ($env{'request.role'}=~/^(au|dc|su)/) {
-       $callargs .= ",1";
-       return '<span class="LC_nobreak">'.
-              '<a href="javascript:openstdbrowser('.$callargs.');">'.
-              &mt('Select User').'</a></span>';
+       return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
+        '","'.$udomele.'",1);'."'>".&mt('Select User')."</a>";
    }
    return '';
 }
@@ -463,7 +453,6 @@ sub selectstudent_link {
 sub authorbrowser_javascript {
     return <<"ENDAUTHORBRW";
 <script type="text/javascript">
-// <![CDATA[
 var stdeditbrowser;
 
 function openauthorbrowser(formname,udom) {
@@ -475,28 +464,33 @@ function openauthorbrowser(formname,udom
     stdeditbrowser = open(url,title,options,'1');
     stdeditbrowser.focus();
 }
-// ]]>
+
 </script>
 ENDAUTHORBRW
 }
 
 sub coursebrowser_javascript {
-    my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;
-    my $wintitle = 'Course_Browser';
-    if ($crstype eq 'Community') {
-        $wintitle = 'Community_Browser';
-    }
-    my $id_functions = &javascript_index_functions();
-    my $output = '
-<script type="text/javascript" language="JavaScript">
-// <![CDATA[
+    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">
     var stdeditbrowser;'."\n";
-
-    $output .= <<"ENDSTDBRW";
-    function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,type,type_elem) {
+   $output .= <<"ENDSTDBRW";
+    function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
         var url = '/adm/pickcourse?';
+        var domainfilter = '';
         var formid = getFormIdByName(formname);
-        var domainfilter = getDomainFromSelectbox(formname,udom);
+        if (formid > -1) {
+            var domid = getIndexByName(formid,udom);
+            if (domid > -1) {
+                if (document.forms[formid].elements[domid].type == 'select-one') {
+                    domainfilter=document.forms[formid].elements[domid].options[document.forms[formid].elements[domid].selectedIndex].value;
+                }
+                if (document.forms[formid].elements[domid].type == 'hidden') {
+                    domainfilter=document.forms[formid].elements[domid].value;
+                }
+            }
+        }
         if (domainfilter != null) {
            if (domainfilter != '') {
                url += 'domainfilter='+domainfilter+'&';
@@ -515,171 +509,59 @@ sub coursebrowser_javascript {
             else {
                 if (formname == 'portform') {
                     url += '&setroles='+extra_element;
-                } else {
-                    if (formname == 'rules') {
-                        url += '&fixeddom='+extra_element;
-                    }
                 }
             }     
         }
-        if (type != null && type != '') {
-            url += '&type='+type;
-        }
-        if (type_elem != null && type_elem != '') {
-            url += '&typeelement='+type_elem;
-        }
-        if (formname == 'ccrs') {
-            var ownername = document.forms[formid].ccuname.value;
-            var ownerdom =  document.forms[formid].ccdomain.options[document.forms[formid].ccdomain.selectedIndex].value;
-            url += '&cloner='+ownername+':'+ownerdom;
-        }
         if (multflag !=null && multflag != '') {
             url += '&multiple='+multflag;
         }
-        var title = '$wintitle';
+        if (crstype == 'Course/Group') {
+            if (formname == 'cu') {
+                crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value; 
+                if (crstype == "") {
+                    alert("$crs_or_grp_alert");
+                    return;
+                }
+            }
+        }
+        if (crstype !=null && crstype != '') {
+            url += '&type='+crstype;
+        }
+        var title = 'Course_Browser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
         options += ',width=700,height=600';
         stdeditbrowser = open(url,title,options,'1');
         stdeditbrowser.focus();
     }
-$id_functions
-ENDSTDBRW
-    if (($sec_element ne '') || ($role_element ne '')) {
-        $output .= &setsec_javascript($sec_element,$formname,$role_element);
-    }
-    $output .= '
-// ]]>
-</script>';
-    return $output;
-}
-
-sub javascript_index_functions {
-    return <<"ENDJS";
-
-function getFormIdByName(formname) {
-    for (var i=0;i<document.forms.length;i++) {
-        if (document.forms[i].name == formname) {
-            return i;
-        }
-    }
-    return -1;
-}
 
-function getIndexByName(formid,item) {
-    for (var i=0;i<document.forms[formid].elements.length;i++) {
-        if (document.forms[formid].elements[i].name == item) {
-            return i;
-        }
-    }
-    return -1;
-}
-
-function getDomainFromSelectbox(formname,udom) {
-    var userdom;
-    var formid = getFormIdByName(formname);
-    if (formid > -1) {
-        var domid = getIndexByName(formid,udom);
-        if (domid > -1) {
-            if (document.forms[formid].elements[domid].type == 'select-one') {
-                userdom=document.forms[formid].elements[domid].options[document.forms[formid].elements[domid].selectedIndex].value;
-            }
-            if (document.forms[formid].elements[domid].type == 'hidden') {
-                userdom=document.forms[formid].elements[domid].value;
+    function getFormIdByName(formname) {
+        for (var i=0;i<document.forms.length;i++) {
+            if (document.forms[i].name == formname) {
+                return i;
             }
         }
+        return -1; 
     }
-    return userdom;
-}
-
-ENDJS
-
-}
-
-sub userbrowser_javascript {
-    my $id_functions = &javascript_index_functions();
-    return <<"ENDUSERBRW";
 
-function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom,caller) {
-    var url = '/adm/pickuser?';
-    var userdom = getDomainFromSelectbox(formname,udom);
-    if (userdom != null) {
-       if (userdom != '') {
-           url += 'srchdom='+userdom+'&';
-       }
-    }
-    url += 'form=' + formname + '&unameelement='+uname+
-                                '&udomelement='+udom+
-                                '&ulastelement='+ulast+
-                                '&ufirstelement='+ufirst+
-                                '&uemailelement='+uemail+
-                                '&hideudomelement='+hideudom+
-                                '&coursedom='+crsdom;
-    if ((caller != null) && (caller != undefined)) {
-        url += '&caller='+caller;
-    }
-    var title = 'User_Browser';
-    var options = 'scrollbars=1,resizable=1,menubar=0';
-    options += ',width=700,height=600';
-    var stdeditbrowser = open(url,title,options,'1');
-    stdeditbrowser.focus();
-}
-
-function fix_domain (formname,udom,origdom,uname) {
-    var formid = getFormIdByName(formname);
-    if (formid > -1) {
-        var unameid = getIndexByName(formid,uname);
-        var domid = getIndexByName(formid,udom);
-        var hidedomid = getIndexByName(formid,origdom);
-        if (hidedomid > -1) {
-            var fixeddom = document.forms[formid].elements[hidedomid].value;
-            var unameval = document.forms[formid].elements[unameid].value;
-            if ((fixeddom != '') && (fixeddom != undefined) && (fixeddom != null) && (unameval != '') && (unameval != undefined) && (unameval != null)) {
-                if (domid > -1) {
-                    var slct = document.forms[formid].elements[domid];
-                    if (slct.type == 'select-one') {
-                        var i;
-                        for (i=0;i<slct.length;i++) {
-                            if (slct.options[i].value==fixeddom) { slct.selectedIndex=i; }
-                        }
-                    }
-                    if (slct.type == 'hidden') {
-                        slct.value = fixeddom;
-                    }
-                }
+    function getIndexByName(formid,item) {
+        for (var i=0;i<document.forms[formid].elements.length;i++) {
+            if (document.forms[formid].elements[i].name == item) {
+                return i;
             }
         }
+        return -1;
     }
-    return;
-}
-
-$id_functions
-ENDUSERBRW
+ENDSTDBRW
+    if ($sec_element ne '') {
+        $output .= &setsec_javascript($sec_element,$formname);
+    }
+    $output .= '
+</script>';
+    return $output;
 }
 
-
 sub setsec_javascript {
-    my ($sec_element,$formname,$role_element) = @_;
-    my (@courserolenames,@communityrolenames,$rolestr,$courserolestr,
-        $communityrolestr);
-    if ($role_element ne '') {
-        my @allroles = ('st','ta','ep','in','ad');
-        foreach my $crstype ('Course','Community') {
-            if ($crstype eq 'Community') {
-                foreach my $role (@allroles) {
-                    push(@communityrolenames,&Apache::lonnet::plaintext($role,$crstype));
-                }
-                push(@communityrolenames,&Apache::lonnet::plaintext('co'));
-            } else {
-                foreach my $role (@allroles) {
-                    push(@courserolenames,&Apache::lonnet::plaintext($role,$crstype));
-                }
-                push(@courserolenames,&Apache::lonnet::plaintext('cc'));
-            }
-        }
-        $rolestr = '"'.join('","',@allroles).'"';
-        $courserolestr = '"'.join('","',@courserolenames).'"';
-        $communityrolestr = '"'.join('","',@communityrolenames).'"';
-    }
+    my ($sec_element,$formname) = @_;
     my $setsections = qq|
 function setSect(sectionlist) {
     var sectionsArray = new Array();
@@ -713,67 +595,15 @@ function setSect(sectionlist) {
         }
     }
 }
-
-function setRole(crstype) {
-|;
-    if ($role_element eq '') {
-        $setsections .= '    return;
-}
-';
-    } else {
-        $setsections .= qq|
-    var elementLength = document.$formname.$role_element.length;
-    var allroles = Array($rolestr);
-    var courserolenames = Array($courserolestr);
-    var communityrolenames = Array($communityrolestr);
-    if (elementLength != undefined) {
-        if (document.$formname.$role_element.options[5].value == 'cc') {
-            if (crstype == 'Course') {
-                return;
-            } else {
-                allroles[5] = 'co';
-                for (var i=0; i<6; i++) {
-                    document.$formname.$role_element.options[i].value = allroles[i];
-                    document.$formname.$role_element.options[i].text = communityrolenames[i];
-                }
-            }
-        } else {
-            if (crstype == 'Community') {
-                return;
-            } else {
-                allroles[5] = 'cc';
-                for (var i=0; i<6; i++) {
-                    document.$formname.$role_element.options[i].value = allroles[i];
-                    document.$formname.$role_element.options[i].text = courserolenames[i];
-                }
-            }
-        }
-    }
-    return;
-}
 |;
-    }
     return $setsections;
 }
 
+
 sub selectcourse_link {
-   my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype,
-       $typeelement) = @_;
-   my $type = $selecttype;
-   my $linktext = &mt('Select Course');
-   if ($selecttype eq 'Community') {
-       $linktext = &mt('Select Community');
-   } elsif ($selecttype eq 'Course/Community') {
-       $linktext = &mt('Select Course/Community');
-       $type = '';
-   }
-   return '<span class="LC_nobreak">'
-         ."<a href='"
-         .'javascript:opencrsbrowser("'.$form.'","'.$unameele
-         .'","'.$udomele.'","'.$desc.'","'.$extra_element
-         .'","'.$multflag.'","'.$type.'","'.$typeelement.'");'
-         ."'>".$linktext.'</a>'
-         .'</span>';
+   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>";
 }
 
 sub selectauthor_link {
@@ -782,14 +612,6 @@ sub selectauthor_link {
           &mt('Select Author').'</a>';
 }
 
-sub selectuser_link {
-    my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem,
-        $coursedom,$linktext,$caller) = @_;
-    return '<a href="javascript:openuserbrowser('."'$form','$unameelem','$domelem',".
-           "'$lastelem','$firstelem','$emailelem','$hdomelem','$coursedom','$caller'".
-           ');">'.$linktext.'</a>';
-}
-
 sub check_uncheck_jscript {
     my $jscript = <<"ENDSCRT";
 function checkAll(field) {
@@ -855,7 +677,7 @@ sub select_datelocale {
             if ($id ne '') {
                 my $en_terr = $locale->{'en_territory'};
                 my $native_terr = $locale->{'native_territory'};
-                my @languages = &Apache::lonlocal::preferred_languages();
+                my @languages = &preferred_languages();
                 if (grep(/^en$/,@languages) || !@languages) {
                     if ($en_terr ne '') {
                         $locale_names{$id} = '('.$en_terr.')';
@@ -888,21 +710,6 @@ sub select_datelocale {
     return $output;
 }
 
-sub select_language {
-    my ($name,$selected,$includeempty) = @_;
-    my %langchoices;
-    if ($includeempty) {
-        %langchoices = ('' => 'No language preference');
-    }
-    foreach my $id (&languageids()) {
-        my $code = &supportedlanguagecode($id);
-        if ($code) {
-            $langchoices{$code} = &plainlanguagedescription($id);
-        }
-    }
-    return &select_form($selected,$name,%langchoices);
-}
-
 =pod
 
 =item * &linked_select_forms(...)
@@ -989,8 +796,7 @@ sub linked_select_forms {
     my $first = "document.$formname.$firstselectname";
     # output the javascript to do the changing
     my $result = '';
-    $result.='<script type="text/javascript" language="JavaScript">'."\n";
-    $result.="// <![CDATA[\n";
+    $result.="<script type=\"text/javascript\">\n";
     $result.="var select2data = new Object();\n";
     $" = '","';
     my $debug = '';
@@ -1036,7 +842,6 @@ function select1_changed() {
         }
     }
 }
-// ]]>
 </script>
 END
     # output the initial values for the selection lists
@@ -1127,12 +932,10 @@ sub help_open_topic {
     # Add the graphic
     my $title = &mt('Online Help');
     my $helpicon=&lonhttpdurl("/adm/help/help.png");
-    $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></td></tr></table>';
-    }
+    $template .= <<"ENDTEMPLATE";
+ <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
+ENDTEMPLATE
+    if ($text ne '') { $template.='</span></td></tr></table>' };
     return $template;
 
 }
@@ -1140,37 +943,31 @@ sub help_open_topic {
 # This is a quicky function for Latex cheatsheet editing, since it 
 # appears in at least four places
 sub helpLatexCheatsheet {
-    my ($topic,$text,$not_author) = @_;
-    my $out;
+    my $other = shift;
     my $addOther = '';
-    if ($topic) {
-	$addOther = &Apache::loncommon::help_open_topic($topic,$text,
+    if ($other) {
+	$addOther = Apache::loncommon::help_open_topic($other, shift,
 						       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>';
-    unless ($not_author) {
-        $out .= '<td>'.
-                &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
-                                                    undef,undef,600).
-                '</td>';
-    }
-    $out .= '</tr></table>';
-    return $out;
+    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>';
 }
 
 sub general_help {
     my $helptopic='Student_Intro';
     if ($env{'request.role'}=~/^(ca|au)/) {
 	$helptopic='Authoring_Intro';
-    } elsif ($env{'request.role'}=~/^(cc|co)/) {
+    } elsif ($env{'request.role'}=~/^cc/) {
 	$helptopic='Course_Coordination_Intro';
     } elsif ($env{'request.role'}=~/^dc/) {
         $helptopic='Domain_Coordination_Intro';
@@ -1190,9 +987,7 @@ sub update_help_link {
     my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
     my $output .= <<"ENDOUTPUT";
 <script type="text/javascript">
-// <![CDATA[
 banner_link = '$banner_link';
-// ]]>
 </script>
 ENDOUTPUT
     return $output;
@@ -1269,8 +1064,8 @@ sub help_menu_js {
 
     my $template .= <<"ENDTEMPLATE";
 <script type="text/javascript">
-// <![CDATA[
 // <!-- BEGIN LON-CAPA Internal
+// <![CDATA[
 var banner_link = '';
 function helpMenu(target) {
     var caller = this;
@@ -1295,8 +1090,8 @@ function writeHelp(caller) {
     caller.document.close()
     caller.focus()
 }
-// END LON-CAPA Internal -->
 // ]]>
+// END LON-CAPA Internal -->
 </script>
 ENDTEMPLATE
     return $template;
@@ -1564,7 +1359,6 @@ sub resize_textarea_js {
     my $geometry = &viewport_geometry_js();
     return <<"RESIZE";
     <script type="text/javascript">
-// <![CDATA[
 $geometry
 
 function getX(element) {
@@ -1603,7 +1397,6 @@ function resize_textarea(textarea_id,bot
     }
     textarea.style.height=new_height+'px';
 }
-// ]]>
 </script>
 RESIZE
 
@@ -1836,7 +1629,7 @@ sub multiple_select_form {
             $size = scalar(keys(%$hash));
         }
     }
-    $output.="\n".'<select name="'.$name.'" size="'.$size.'" multiple="multiple">';
+    $output.="\n<select name='$name' size='$size' multiple='1'>";
     my @order;
     if (ref($order) eq 'ARRAY')  {
         @order = @{$order};
@@ -1882,7 +1675,7 @@ sub select_form {
         $selectform.=
 	    '<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.
             ($key eq $def ? 'selected="selected" ' : '').
-                ">".$hash{$key}."</option>\n";
+                ">".&mt($hash{$key})."</option>\n";
     }
     $selectform.="</select>";
     return $selectform;
@@ -1893,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 '<span class="LC_nobreak"><label>'.&mt('Records [_1]',
+    return '<nobr><label>'.&mt('Records [_1]',
 			       &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
 							   (&mt('all'),10,20,50,100,1000,10000))).
-	   '</label></span> <span class="LC_nobreak">'.
+	   '</label></nobr> <nobr>'.
            &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'}).'" /></span>';
+			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';
 }
 
 sub gradeleveldescription {
@@ -1947,7 +1740,7 @@ sub select_level_form {
 
 =pod
 
-=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms)
+=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select the domain to preform an operation in.  
@@ -1956,28 +1749,16 @@ 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.
-
-The optional $onchange argument specifies what should occur if the domain selector is changed, e.g., 'this.form.submit()' if the form is to be automatically submitted.
-
-The optional $incdoms is a reference to an array of domains which will be the only available options.
+If the $showdomdesc flag is set, the domain name is followed by the domain description. 
 
 =cut
 
 #-------------------------------------------
 sub select_dom_form {
-    my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms) = @_;
-    if ($onchange) {
-        $onchange = ' onchange="'.$onchange.'"';
-    }
-    my @domains;
-    if (ref($incdoms) eq 'ARRAY') {
-        @domains = sort {lc($a) cmp lc($b)} (@{$incdoms});
-    } else {
-        @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
-    }
+    my ($defdom,$name,$includeempty,$showdomdesc) = @_;
+    my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
     if ($includeempty) { @domains=('',@domains); }
-    my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
+    my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
     foreach my $dom (@domains) {
         $selectdomain.="<option value=\"$dom\" ".
             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
@@ -2033,7 +1814,7 @@ sub home_server_form_item {
     if ($numlib > 1) {
         $result .= '<select name="'.$name.'" />'."\n";
         if ($default) {
-            $result .= '<option value="default" selected="selected">'.&mt('default').
+            $result .= '<option value="default" selected>'.&mt('default').
                        '</option>'."\n";
         }
         foreach my $hostid (sort(keys(%servers))) {
@@ -2328,14 +2109,14 @@ sub authform_kerberos {
         $autharg,$jscall);
     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
     if ($in{'kerb_def_auth'} eq 'krb5') {
-       $check5 = ' checked="checked"';
+       $check5 = ' checked="on"';
     } else {
-       $check4 = ' checked="checked"';
+       $check4 = ' checked="on"';
     }
     $krbarg = $in{'kerb_def_dom'};
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'krb') {
-            $krbcheck = ' checked="checked"';
+            $krbcheck = ' checked="on"';
             if (defined($in{'mode'})) {
                 if ($in{'mode'} eq 'modifyuser') {
                     $krbcheck = '';
@@ -2343,10 +2124,10 @@ sub authform_kerberos {
             }
             if (defined($in{'curr_kerb_ver'})) {
                 if ($in{'curr_krb_ver'} eq '5') {
-                    $check5 = ' checked="checked"';
+                    $check5 = ' checked="on"';
                     $check4 = '';
                 } else {
-                    $check4 = ' checked="checked"';
+                    $check4 = ' checked="on"';
                     $check5 = '';
                 }
             }
@@ -2367,7 +2148,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'}) {
@@ -2376,7 +2157,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">';
                 }
             }
         }
@@ -2437,7 +2218,7 @@ sub authform_internal{
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'int') {
             if ($can_assign{'int'}) {
-                $intcheck = 'checked="checked" ';
+                $intcheck = 'checked="on" ';
                 if (defined($in{'mode'})) {
                     if ($in{'mode'} eq 'modifyuser') {
                         $intcheck = '';
@@ -2453,7 +2234,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'}) {
@@ -2462,7 +2243,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">';
                 }
             }
         }
@@ -2477,7 +2258,7 @@ sub authform_internal{
     $result = &mt
         ('[_1] Internally authenticated (with initial password [_2])',
          '<label>'.$authtype,'</label>'.$autharg);
-    $result.="<label><input type=\"checkbox\" name=\"visible\" onclick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
+    $result.="<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
     return $result;
 }
 
@@ -2492,7 +2273,7 @@ sub authform_local{
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'loc') {
             if ($can_assign{'loc'}) {
-                $loccheck = 'checked="checked" ';
+                $loccheck = 'checked="on" ';
                 if (defined($in{'mode'})) {
                     if ($in{'mode'} eq 'modifyuser') {
                         $loccheck = '';
@@ -2508,7 +2289,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'}) {
@@ -2517,7 +2298,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">';
                 }
             }
         }
@@ -2546,7 +2327,7 @@ sub authform_filesystem{
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'fsys') {
             if ($can_assign{'fsys'}) {
-                $fsyscheck = 'checked="checked" ';
+                $fsyscheck = 'checked="on" ';
                 if (defined($in{'mode'})) {
                     if ($in{'mode'} eq 'modifyuser') {
                         $fsyscheck = '';
@@ -2559,7 +2340,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'}) {
@@ -2568,7 +2349,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">';
                 }
             }
         }
@@ -2936,43 +2717,6 @@ 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
@@ -2991,25 +2735,6 @@ sub screenname {
     return $names{'screenname'};
 }
 
-# ------------------------------------------------------------- Confirm Wrapper
-=pod
-
-=item confirmwrapper
-
-Wrap messages about completion of operation in box
-
-=cut
-
-sub confirmwrapper {
-    my ($message)=@_;
-    if ($message) {
-        return "\n".'<div class="LC_confirm_box">'."\n"
-               .$message."\n"
-               .'</div>'."\n";
-    } else {
-        return $message;
-    }
-}
 
 # ------------------------------------------------------------- Message Wrapper
 
@@ -3036,7 +2761,7 @@ sub aboutmewrapper {
         return;
     }
     return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
-	($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'</a>';
+	($target?' target="$target"':'').' title="'.&mt("View this user's personal page").'">'.$link.'</a>';
 }
 
 # ------------------------------------------------------------ Syllabus Wrapper
@@ -3051,7 +2776,7 @@ sub syllabuswrapper {
 }
 
 sub track_student_link {
-    my ($linktext,$sname,$sdom,$target,$start,$only_body) = @_;
+    my ($linktext,$sname,$sdom,$target,$start) = @_;
     my $link ="/adm/trackstudent?";
     my $title = 'View recent activity';
     if (defined($sname) && $sname !~ /^\s*$/ &&
@@ -3065,34 +2790,12 @@ sub track_student_link {
         $target = '';
     }
     if ($start) { $link.='&amp;start='.$start; }
-    if ($only_body) { $link .= '&amp;only_body=1'; }
     $title = &mt($title);
     $linktext = &mt($linktext);
     return qq{<a href="$link" title="$title" $target>$linktext</a>}.
 	&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
 
 
@@ -3295,7 +2998,7 @@ sub fileextensions {
 
 sub display_languages {
     my %languages=();
-    foreach my $lang (&Apache::lonlocal::preferred_languages()) {
+    foreach my $lang (&preferred_languages()) {
 	$languages{$lang}=1;
     }
     &get_unprocessed_cgi($ENV{'QUERY_STRING'},['displaylanguage']);
@@ -3307,9 +3010,59 @@ sub display_languages {
     return %languages;
 }
 
+sub preferred_languages {
+    my @languages=();
+    if (($env{'request.role.adv'}) && ($env{'form.languages'})) {
+        @languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$env{'form.languages'}));
+    }
+    if ($env{'course.'.$env{'request.course.id'}.'.languages'}) {
+	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,
+	         $env{'course.'.$env{'request.course.id'}.'.languages'}));
+    }
+
+    if ($env{'environment.languages'}) {
+	@languages=(@languages,
+		    split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}));
+    }
+    my $browser=$ENV{'HTTP_ACCEPT_LANGUAGE'};
+    if ($browser) {
+	my @browser = 
+	    map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser));
+	push(@languages,@browser);
+    }
+
+    foreach my $domtype ($env{'user.domain'},$env{'request.role.domain'},
+                         $Apache::lonnet::perlvar{'lonDefDomain'}) {
+        if ($domtype ne '') {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);
+            if ($domdefs{'lang_def'} ne '') {
+                push(@languages,$domdefs{'lang_def'});
+            }
+        }
+    }
+    return &get_genlanguages(@languages);
+}
+
+sub get_genlanguages {
+    my (@languages) = @_;
+# turn "en-ca" into "en-ca,en"
+    my @genlanguages;
+    foreach my $lang (@languages) {
+        unless ($lang=~/\w/) { next; }
+        push(@genlanguages,$lang);
+        if ($lang=~/(\-|\_)/) {
+            push(@genlanguages,(split(/(\-|\_)/,$lang))[0]);
+        }
+    }
+    #uniqueify the languages list
+    my %count;
+    @genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages;
+    return @genlanguages;
+}
+
 sub languages {
     my ($possible_langs) = @_;
-    my @preferred_langs = &Apache::lonlocal::preferred_languages();
+    my @preferred_langs = &preferred_languages();
     if (!ref($possible_langs)) {
 	if( wantarray ) {
 	    return @preferred_langs;
@@ -3330,28 +3083,6 @@ 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                     ##
 ###############################################################
@@ -3490,7 +3221,7 @@ sub relative_to_absolute {
     }
     $thisdir=~s-/[^/]*$--;
     foreach my $link (@rlinks) {
-	unless (($link=~/^https?\:\/\//i) ||
+	unless (($link=~/^http:\/\//i) ||
 		($link=~/^\//) ||
 		($link=~/^javascript:/i) ||
 		($link=~/^mailto:/i) ||
@@ -3737,13 +3468,10 @@ sub findallcourses {
         $udom = $env{'user.domain'};
     }
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-        my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
-        my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname,'.',undef,
-                                              $extra);
+        my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname);
         if (!%roles) {
             %roles = (
                        cc => 1,
-                       co => 1,
                        in => 1,
                        ep => 1,
                        ta => 1,
@@ -4070,7 +3798,7 @@ sub blocking_status {
                              &Apache::lonnet::coursedescription($course);
                         $coursedesc = $courseinfo{'description'};
                     }
-                    $category = "Group portfolio files in the course '$coursedesc'";
+                    $category = "Group files in the course '$coursedesc'";
                 } else {
                     $category = 'Portfolio files belonging to ';
                     if ($env{'user.name'} eq 'public' && 
@@ -4173,7 +3901,7 @@ sub determinedomain {
     my $domain=shift;
     if (! $domain) {
         # Determine domain if we have not been given one
-        $domain = &Apache::lonnet::default_login_domain();
+        $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
         if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
         if ($env{'request.role.domain'}) { 
             $domain=$env{'request.role.domain'}; 
@@ -4196,43 +3924,13 @@ sub get_domainconf {
     if (defined($cached)) { return %{$result}; }
 
     my %domconfig = &Apache::lonnet::get_dom('configuration',
-					     ['login','rolecolors','loginvia'],$udom);
+					     ['login','rolecolors'],$udom);
     my (%designhash,%legacy);
     if (keys(%domconfig) > 0) {
         if (ref($domconfig{'login'}) eq 'HASH') {
             if (keys(%{$domconfig{'login'}})) {
                 foreach my $key (keys(%{$domconfig{'login'}})) {
-                    if (ref($domconfig{'login'}{$key}) eq 'HASH') {
-                        if ($key eq 'loginvia') {
-                            if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') {
-                                my @ids = &Apache::lonnet::current_machine_ids();
-                                foreach my $hostname (@ids) {
-                                    if (ref($domconfig{'login'}{'loginvia'}{$hostname}) eq 'HASH') {
-                                        if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) {
-                                            my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'};
-                                            $designhash{$udom.'.login.loginvia'} = $server;
-                                            if ($domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'} eq 'custom') {
-
-                                                $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'};
-                                            } else {
-                                                 $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'};
-                                            }
-                                            if ($domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}) {
-                                                $designhash{$udom.'.login.loginvia_exempt_'.$hostname} = $domconfig{'login'}{'loginvia'}{$hostname}{'exempt'};
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        } else {
-                            foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
-                                $designhash{$udom.'.login.'.$key.'_'.$img} =
-                                    $domconfig{'login'}{$key}{$img};
-                            }
-                        }
-                    } else {
-                        $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
-                    }
+                    $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
                 }
             } else {
                 $legacy{'login'} = 1;
@@ -4255,11 +3953,6 @@ sub get_domainconf {
         } else {
             $legacy{'rolecolors'} = 1;
         }
-        if (ref($domconfig{'autoenroll'}) eq 'HASH') {
-            if ($domconfig{'autoenroll'}{'co-owners'}) {
-                $designhash{$udom.'.autoassign.co-owners'}=$domconfig{'autoenroll'}{'co-owners'};
-            }
-        }
         if (keys(%legacy) > 0) {
             my %legacyhash = &get_legacy_domconf($udom);
             foreach my $item (keys(%legacyhash)) {
@@ -4459,7 +4152,7 @@ sub bodytag {
     my $font =   &designparm($function.'.font',$domain);
     my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);
 
-    my %design = ( 'style'   => 'margin-top: 0',
+    my %design = ( 'style'   => 'margin-top: 0px',
 		   'bgcolor' => $pgbg,
 		   'text'    => $font,
                    'alink'   => &designparm($function.'.alink',$domain),
@@ -4747,8 +4440,8 @@ sub standard_css {
     my $sans                 = 'Verdana,Arial,Helvetica,sans-serif';
     my $mono                 = 'monospace';
     my $data_table_head      = $tabbg;
-    my $data_table_light     = '#FAFAFA';
-    my $data_table_dark      = '#F0F0F0';
+    my $data_table_light     = '#EEEEEE';
+    my $data_table_dark      = '#DDDDDD';
     my $data_table_darker    = '#CCCCCC';
     my $data_table_highlight = '#FFFF00';
     my $mail_new             = '#FFBB77';
@@ -4761,17 +4454,15 @@ sub standard_css {
     my $mail_other_hover     = '#669999';
     my $table_header         = '#DDDDDD';
     my $feedback_link_bg     = '#BBBBBB';
-    my $lg_border_color      = '#C8C8C8';
 
     my $border = ($env{'browser.type'} eq 'explorer' ||
-		  $env{'browser.type'} eq 'safari'     ) ? '0 2px 0 2px'
-	                                                 : '0 3px 0 4px';
+		  $env{'browser.type'} eq 'safari'     ) ? '0px 2px 0px 2px'
+	                                                 : '0px 3px 0px 4px';
 
 
     return <<END;
 h1, h2, h3, th { font-family: $sans }
 a:focus { color: red; background: yellow } 
-
 table.thinborder,
 
 table.thinborder tr th {
@@ -4801,66 +4492,25 @@ form, .inline { display: inline; }
 .LC_diff_added {
   color: green;
 }
-
-div.LC_confirm_box {
-  background-color: #FAFAFA;
-  border: 1px solid $lg_border_color;
-  margin-right: 0;
-  padding: 5px;
-}
-
-div.LC_confirm_box .LC_error img,
-div.LC_confirm_box .LC_success img {
-  vertical-align: middle;
+.LC_unknown {
+  color: yellow;
 }
 
 .LC_icon {
-  border: none;
+  border: 0px;
 }
 .LC_indexer_icon {
-  border: 0;
+  border: 0px;
   height: 22px;
 }
 .LC_docs_spacer {
   width: 25px;
   height: 1px;
-  border: none;
+  border: 0px;
 }
 
 .LC_internal_info {
-  color: #999999;
-}
-
-.LC_discussion {
-   background: $tabbg;
-   border: 1px solid black;
-   margin: 2px;
-}
-
-.LC_disc_action_links_bar {
-   background: $tabbg;
-   border: none;
-   margin: 4px;
-}
-
-.LC_disc_action_left {
-   text-align: left;
-}
-
-.LC_disc_action_right {
-   text-align: right;
-}
-
-.LC_disc_new_item {
-   background: white;
-   border: 2px solid red;
-   margin: 2px;
-}
-
-.LC_disc_old_item {
-   background: white;
-   border: 1px solid black;
-   margin: 2px;
+  color: #999;
 }
 
 table.LC_pastsubmission {
@@ -4873,7 +4523,7 @@ table#LC_top_nav, table#LC_menubuttons,t
   background: $pgbg;
   border: 2px;
   border-collapse: separate;
-  padding: 0;
+  padding: 0px;
 }
 
 table#LC_title_bar, table.LC_breadcrumbs, 
@@ -4886,7 +4536,7 @@ table#LC_title_bar.LC_with_remote {
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0;
+  padding: 0px;
 }
 
 table.LC_docs_path {
@@ -4895,7 +4545,7 @@ table.LC_docs_path {
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0;
+  padding: 0px;
 }
 
 table#LC_title_bar td {
@@ -4916,27 +4566,27 @@ span.LC_title_bar_title {
 table#LC_title_bar td.LC_title_bar_domain_logo {
   background: $sidebg;
   text-align: right;
-  padding: 0;
+  padding: 0px;
 }
 table#LC_title_bar td.LC_title_bar_role_logo {
   background: $sidebg;
-  padding: 0;
+  padding: 0px;
 }
 
 table#LC_menubuttons_mainmenu {
   width: 100%;
-  border: 0;
+  border: 0px;
   border-spacing: 1px;
-  padding: 0 1px;
-  margin: 0;
+  padding: 0px 1px;
+  margin: 0px;
   border-collapse: separate;
 }
 table#LC_menubuttons img, table#LC_menubuttons_mainmenu img {
-  border: none;
+  border: 0px;
 }
 table#LC_top_nav td {
   background: $tabbg;
-  border: none;
+  border: 0px;
   font-size: small;
 }
 table#LC_top_nav td a, div#LC_top_nav a {
@@ -4950,7 +4600,7 @@ table#LC_top_nav td.LC_top_nav_logo {
   width: 31px;
 }
 table#LC_top_nav td.LC_top_nav_logo img {
-  border: none;
+  border: 0px;
   vertical-align: bottom;
 }
 table#LC_top_nav td.LC_top_nav_exit,
@@ -4991,7 +4641,7 @@ table#LC_mainmenu td.LC_mainmenu_column
 .LC_menubuttons_link {
   text-decoration: none;
 }
-/*2008--9-5: new menu style sheet.Changed category*/
+#2008--9-5: new menu style sheet.Changed category
 .LC_menubuttons_category {
   color: $font;
   background: $pgbg;
@@ -5019,6 +4669,35 @@ td.LC_menubuttons_img {
   font-weight: bold;
 }
 
+.LC_rolesmenu_is {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_selected {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_future {
+  font-family: $sans;
+}
+
+
+.LC_rolesmenu_will {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_will_not {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_expired {
+  font-family: $sans;
+}
+
+.LC_rolesinfo {
+  font-family: $sans;
+}
+
 .LC_dropadd_labeltext {
   font-family: $sans;
   text-align: right;
@@ -5033,14 +4712,10 @@ td.LC_menubuttons_img {
   font-size: smaller;
 }
 
-.LC_mail_functions {
-    font-weight: bold;
-}
-
 table.LC_aboutme_port {
-  border: none;
+  border: 0px;
   border-collapse: collapse;
-  border-spacing: 0;
+  border-spacing: 0px;
 }
 table.LC_data_table, table.LC_mail_list {
   border: 1px solid #000000;
@@ -5054,43 +4729,29 @@ table.LC_data_table, table.LC_mail_list
 table.LC_nested_outer {
   border: 1px solid #000000;
   border-collapse: collapse;
-  border-spacing: 0;
+  border-spacing: 0px;
   width: 100%;
 }
-table.LC_innerpickbox,
 table.LC_nested {
-  border: none;
+  border: 0px;
   border-collapse: collapse;
-  border-spacing: 0;
+  border-spacing: 0px;
   width: 100%;
 }
 table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th,
-table.LC_prior_tries tr th,
-table.LC_innerpickbox tr th {
+table.LC_prior_tries tr th {
   font-weight: bold;
   background-color: $data_table_head;
   font-size: smaller;
 }
-table.LC_innerpickbox tr th,
-table.LC_innerpickbox tr td {
-  vertical-align: top;
-}
-table.LC_data_table tr.LC_info_row > td {
-  background-color: #CCCCCC;
-  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;
@@ -5101,20 +4762,12 @@ table.LC_data_table tr td.LC_leftcol_hea
 }
 table.LC_data_table tr.LC_empty_row td,
 table.LC_nested tr.LC_empty_row td {
+  background-color: #FFFFFF;
   font-weight: bold;
   font-style: italic;
   text-align: center;
   padding: 8px;
 }
-
-table.LC_data_table tr.LC_empty_row td {
-  background-color: $tabbg;
-}
-
-table.LC_nested tr.LC_empty_row td {
-  background-color: #FFFFFF;
-}
-
 table.LC_nested tr.LC_empty_row td {
   padding: 4ex
 }
@@ -5132,7 +4785,7 @@ table.LC_nested_outer tr td.LC_subheader
   text-align: right;
 }
 table.LC_nested tr.LC_info_row td {
-  background-color: #CCCCCC;
+  background-color: #CCC;
   font-weight: bold;
   font-size: small;
   text-align: center;
@@ -5142,7 +4795,7 @@ table.LC_nested_outer tr th.LC_left_item
   text-align: left;
 }
 table.LC_nested td {
-  background-color: #FFFFFF;
+  background-color: #FFF;
   font-size: small;
 }
 table.LC_nested_outer tr th.LC_right_item,
@@ -5153,7 +4806,7 @@ table.LC_nested tr td.LC_right_item {
 }
 
 table.LC_nested tr.LC_odd_row td {
-  background-color: #EEEEEE;
+  background-color: #EEE;
 }
 
 table.LC_createuser {
@@ -5164,7 +4817,7 @@ table.LC_createuser tr.LC_section_row td
 }
 
 table.LC_createuser tr.LC_info_row td  {
-  background-color: #CCCCCC;
+  background-color: #CCC;
   font-weight: bold;
   text-align: center;
 }
@@ -5220,10 +4873,10 @@ table.LC_mail_list tr.LC_mail_odd {
 table#LC_portfolio_actions {
   width: auto;
   background: $pgbg;
-  border: none;
+  border: 0px;
   border-spacing: 2px 2px;
-  padding: 0;
-  margin: 0;
+  padding: 0px;
+  margin: 0px;
   border-collapse: separate;
 }
 table#LC_portfolio_actions td.LC_label {
@@ -5279,49 +4932,6 @@ table#LC_browser tr.LC_browser_file_meta
 table#LC_browser tr.LC_browser_folder {
   background: #CCCCFF;
 }
-
-table.LC_data_table tr > td.LC_browser_file,
-table.LC_data_table tr > td.LC_browser_file_published {
-  background: #AAEE77;
-}
-
-table.LC_data_table tr > td.LC_browser_file_locked,
-table.LC_data_table tr > td.LC_browser_file_unpublished {
-  background: #FFAA99;
-}
-
-table.LC_data_table tr > td.LC_browser_file_obsolete {
-  background: #888888;
-}
-
-table.LC_data_table tr > td.LC_browser_file_modified,
-table.LC_data_table tr > td.LC_browser_file_metamodified {
-  background: #F8F866;
-}
-
-table.LC_data_table tr.LC_browser_folder > td {
-  background: #E0E8FF;
-}
-
-table.LC_data_table tr > td.LC_roles_is {
-/*  background: #77FF77; */
-}
-table.LC_data_table tr > td.LC_roles_future {
-  background: #FFFF77;
-}
-table.LC_data_table tr > td.LC_roles_will {
-  background: #FFAA77;
-}
-table.LC_data_table tr > td.LC_roles_expired {
-  background: #FF7777;
-}
-table.LC_data_table tr > td.LC_roles_will_not {
-  background: #AAFF77;
-}
-table.LC_data_table tr > td.LC_roles_selected {
-  background: #11CC55;
-}
-
 span.LC_current_location {
   font-size: x-large;
   background: $pgbg;
@@ -5367,9 +4977,9 @@ table.LC_parm_overview_restrictions th {
   border-color: $pgbg;
 }
 table#LC_helpmenu {
-  border: none;
+  border: 0px;
   height: 55px;
-  border-spacing: 0;
+  border-spacing: 0px;
 }
 
 table#LC_helpmenu fieldset legend {
@@ -5380,7 +4990,7 @@ table#LC_helpmenu_links {
   width: 100%;
   border: 1px solid black;
   background: $pgbg;
-  padding: 0;
+  padding: 0px;
   border-spacing: 1px;
 }
 table#LC_helpmenu_links tr td {
@@ -5422,7 +5032,6 @@ table.LC_pick_box td.LC_pick_box_title {
   background: $tabbg;
   font-weight: bold;
   text-align: right;
-  vertical-align: top;
   width: 184px;
   padding: 8px;
 }
@@ -5443,7 +5052,7 @@ table.LC_pick_box td.LC_pick_box_select
   padding: 8px;
 }
 table.LC_pick_box td.LC_pick_box_separator {
-  padding: 0;
+  padding: 0px;
   height: 1px;
   background: black;
 }
@@ -5485,7 +5094,7 @@ table.LC_helpform_receipt td.LC_oddrow_v
   background-color: $data_table_light;
 }
 table.LC_helpform_receipt td.LC_pick_box_separator {
-  padding: 0;
+  padding: 0px;
   height: 1px;
   background: black;
 }
@@ -5518,7 +5127,7 @@ table.LC_group_priv_box td.LC_groups_fun
 }
 table.LC_group_priv td {
   text-align: left;
-  padding: 0;
+  padding: 0px;
 }
 
 table.LC_notify_front_page {
@@ -5539,7 +5148,6 @@ table.LC_notify_front_page td {
   background: $tabbg;
   vertical-align: middle;
   margin: 2ex 0ex 2ex 0ex;
-  padding: 3px;
 }
 .LC_topic_bar span {
   vertical-align: middle;
@@ -5641,7 +5249,7 @@ table.LC_prior_match tr td {
   border: 1px solid #000000;
 }
 
-.LC_nobreak {
+span.LC_nobreak {
   white-space: nowrap;
 }
 
@@ -5656,7 +5264,7 @@ span.LC_cusr_subheading {
 
 table.LC_docs_documents {
   background: #BBBBBB;
-  border-width: 0;
+  border-width: 0px;
   border-collapse: collapse;
 }
 
@@ -5673,7 +5281,7 @@ table.LC_docs_documents td.LC_docs_docum
 }
 
 .LC_docs_entry_move {
-  border: none;
+  border: 0px;
   border-collapse: collapse;
 }
 
@@ -5729,7 +5337,7 @@ table.LC_sty_end {
 }
 
 table.LC_double_column {
-  border-width: 0;
+  border-width: 0px;
   border-collapse: collapse;
   width: 100%;
   padding: 2px;
@@ -5868,7 +5476,7 @@ table.LC_edit_problem_header_title {
 
   background: $tabbg;
   border-collapse: collapse;
-  padding: 0;
+  padding: 0px
 }
 
 div.LC_edit_problem_discards {
@@ -5884,7 +5492,7 @@ hr.LC_edit_problem_divide {
   color: $tabbg;
   background-color: $tabbg;
   height: 3px;
-  border: none;
+  border: 0px;
 }
 img.stift{
   border-width:0;
@@ -5909,14 +5517,290 @@ table#LC_mainmenu td.LC_mainmenu_col_fie
   font-weight: bold;
 }
 fieldset#LC_mainmenu_fieldset {
-  margin:0 10px 10px 0;
+  margin:0px 10px 10px 0px;
+
+}
+/* ---- Remove when done ----
+# The following styles is part of the redesign of LON-CAPA and are
+# subject to change during this project.
+# Don't rely on their current functionality as they might be 
+# changed or removed.
+# --------------------------*/
+
+
+body {
+	font-family: Tahoma, Arial,Helvetica,sans-serif;
+	font-size: 0.85em;
+	line-height: 130%;
+	color: RGB(45, 45, 45);
+}
+
+a:link,a:visited {
+	/*color: RGB(0, 118, 127);*/
+	/*text-decoration: underline;*/
+}
+
+a:hover{
+	text-decoration:none;
+}
+/*a:hover,
+UL.smallMenu A:hover,
+UL.MenuBreadcrumbs A:hover,
+UL#TabMainMenuContent A:hover{
+	color: rgb(200, 10, 50);
+}*/
+
+h1 { 
+	padding:5px 10px 5px 20px;
+	line-height:130%;
+}
+h2,h4,h6 {
+	/*color: RGB(0, 118, 127);*/
+}
+h2,h3,h4,h5,h6
+{
+margin:5px 0px 5px 0px;
+line-height:130%;
+}
+
+.right {
+	text-align: right;
+}
 
+.center {
+	text-align: center;
 }
 
-div.LC_createcourse {
-    margin: 10px 10px 10px 10px;
+.left {
+	text-align: left;
 }
 
+
+.HeadRight {
+	text-align: right;
+	float: right;
+	margin: 0px;
+	padding: 0px;
+	 right:0;
+        position:absolute;
+}
+
+img {
+/*	border: 0px; */
+}
+
+.personalBgColor {
+	background: RGB(237, 239, 0) url(images/headHighlight.png) repeat-y left top;
+}
+
+p {
+	padding: 10px;
+}
+DL,UL,Div,Fieldset {
+	/*margin: 10px;*/
+	overflow:hidden;
+}
+OL.smallMenu {
+	margin: 0px 0px 0px 0px;
+}
+
+OL.smallMenu li {
+	display: inline;
+	padding: 5px 5px 0px 10px;
+	vertical-align: top;
+}
+
+OL.smallMenu li img {
+	vertical-align: bottom;
+}
+
+OL.smallMenu A {
+	font-size: 90%;
+	color: RGB(80, 80, 80);
+	text-decoration: none;
+}
+
+OL#TabMainMenuContent {
+	
+	margin: 0px 0px 10px 0px;
+	padding: 0px;
+}
+
+OL#TabMainMenuContent LI {
+	display: inline;
+	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%;
+	font-weight: bold;
+	overflow:hidden;
+	background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left top;
+}
+
+OL#TabMainMenuContent LI A {
+	color: RGB(47, 47, 47);
+	text-decoration: none;
+}
+
+OL#TabMainMenuContent DIV.columnSection {
+	margin-bottom: 0px;
+}
+
+OL#MenuBreadcrumbs {
+	border-top: solid 1px RGB(255, 255, 255);
+	height: 20px;
+	line-height: 20px;
+	vertical-align: bottom;
+	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;
+}
+
+OL#MenuBreadcrumbs li {
+	background: url(images/pfeil_white.png) no-repeat left center;
+	display: inline;
+	padding: 0px 0px 0px 10px;
+	vertical-align: bottom;
+	overflow:hidden;
+}
+
+OL#MenuBreadcrumbs LI A {
+	text-decoration: none;
+	font-size:90%;
+}
+
+h4.hcell {
+	padding: 3px 10px 3px 10px;
+	margin: 0px;
+	background: RGB(0, 118, 127);
+	color: white;
+	border: outset 1px;
+}
+
+DIV.DivContentBoxSpecial
+{
+	border: solid 1px RGB(100, 100, 100);
+}
+
+FIELDSET
+{
+	/*width:78%;*/
+}
+DIV.DivContentBox,
+DIV.DivContentBoxSpecial {
+	width: 80%;
+	margin:10px;
+}
+
+FIELDSET legend,DL DT {
+	font-weight: bold;
+	font-size: 110%;
+	/*padding-left: 0px;*/
+/*	margin-left: 0px;*/
+}
+
+DIV.DivImportant {
+	background: url(images/important.png) no-repeat center top;
+	padding: 100px 10px 10px 10px;
+	width: 200px;
+	border: double 4px RGB(200, 200, 200);
+}
+
+
+
+DL.ListStyleClean DT {
+	padding-right: 5px;
+	display: table-header-group;
+}
+
+DL.ListStyleClean DD {
+	display: table-row;
+}
+
+.ListStyleClean,
+.ListStyleSimple,
+.ListStyleNormal,
+.ListStyleNormal_Border,
+.ListStyleSpecial
+	{
+	/*display:block;	*/
+	width: 400px;
+	list-style-position: inside;
+	list-style-type: none;
+	overflow: hidden;
+	padding: 0px;
+}
+
+.ListStyleClean li,
+.ListStyleSimple li,
+.ListStyleSimple DD,
+.ListStyleNormal li,
+.ListStyleNormal DD,
+.ListStyleSpecial li,
+.ListStyleSpecial DD
+	{
+	margin: 0px;
+	padding: 5px 5px 5px 10px;
+	clear: both;
+	/*display:block;*/
+}
+
+.ListStyleClean LI,
+.ListStyleClean DD {
+	padding-top: 0px;
+	padding-bottom: 0px;
+}
+
+.ListStyleSimple DD,
+.ListStyleSimple LI{
+	border-bottom: solid 1px RGB(150, 150, 150);
+}
+
+.ListStyleSpecial LI,
+.ListStyleSpecial DD {
+	list-style-type: none;
+	background-color: RGB(220, 220, 220);
+	margin-bottom: 4px;
+}
+
+table.SimpleTable *{
+	padding:10px;
+	}
+
+table.SimpleTable td {
+	vertical-align:top;
+	border:solid 1px RGB(210,210,210);
+}
+table.SimpleTable thead{
+	 background:rgb(210,210,210);
+}
+
+DIV.columnSection {
+	display: block;
+	clear: both;
+	overflow: hidden;
+	margin:0px;
+}
+
+DIV.columnSection>* {
+	float: left;
+	margin: 10px 20px 10px 0px;
+	overflow:hidden;	
+}
+
+DIV.columnSection>FIELDSET,
+DIV.columnSection>DIV.DivContentBox,
+DIV.columnSection>DIV.DivContentBoxSpecial
+	{
+	width: 480px;
+	
+}
+
+
 END
 }
 
@@ -6044,8 +5928,7 @@ sub xml_begin {
             .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" ' 
 	    .'xmlns="http://www.w3.org/1999/xhtml">';
     } else {
-	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'.
-            '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">';
+	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>';
     }
     return $output;
 }
@@ -6186,26 +6069,10 @@ sub start_page {
     if ($args->{'html_encode'}) {
 	$result = &html_encode($result);
     }
-    #Breadcrumbs
-    if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
-        &Apache::lonhtmlcommon::clear_breadcrumbs();
-        #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);
-            }
-        }
-
-        #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;
 }
 
+
 =pod
 
 =item * &head()
@@ -6430,13 +6297,13 @@ Returns either 'student','coordinator','
 ###############################################
 sub get_users_function {
     my $function = 'student';
-    if ($env{'request.role'}=~/^(cc|co|in|ta|ep)/) {
+    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
         $function='coordinator';
     }
     if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
         $function='admin';
     }
-    if (($env{'request.role'}=~/^(au|ca|aa)/) ||
+    if (($env{'request.role'}=~/^(au|ca)/) ||
         ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
         $function='author';
     }
@@ -6447,37 +6314,6 @@ sub get_users_function {
 
 =pod
 
-=item * &show_course()
-
-Used by lonmenu.pm and lonroles.pm to determine whether to use the word
-'Courses' or 'Roles' in inline navigation and on screen displaying user's roles.
-Inputs:
-None
-
-Outputs:
-Scalar: 1 if 'Course' to be used, 0 otherwise.
-
-=cut
-
-###############################################
-sub show_course {
-    my $course = !$env{'user.adv'};
-    if (!$env{'user.adv'}) {
-        foreach my $env (keys(%env)) {
-            next if ($env !~ m/^user\.priv\./);
-            if ($env !~ m/^user\.priv\.(?:st|cm)/) {
-                $course = 0;
-                last;
-            }
-        }
-    }
-    return $course;
-}
-
-###############################################
-
-=pod
-
 =item * &check_user_status()
 
 Determines current status of supplied role for a
@@ -6494,14 +6330,13 @@ role status: active, previous or future.
 
 sub check_user_status {
     my ($udom,$uname,$cdom,$crs,$role,$sec) = @_;
-    my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
-    my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname,'.',undef,$extra);
+    my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname);
     my @uroles = keys %userinfo;
     my $srchstr;
     my $active_chk = 'none';
     my $now = time;
     if (@uroles > 0) {
-        if (($role eq 'cc') || ($role eq 'co') || ($sec eq '') || (!defined($sec))) {
+        if (($role eq 'cc') || ($sec eq '') || (!defined($sec))) {
             $srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
         } else {
             $srchstr = '/'.$cdom.'/'.$crs.'/'.$sec.'_'.$role;
@@ -6982,8 +6817,6 @@ If the user's status includes multiple t
 the largest default quota which applies to the user determines the
 default quota returned.
 
-=back
-
 =cut
 
 ###############################################
@@ -6996,37 +6829,21 @@ sub default_quota {
                                             ['quotas'],$udom);
     if (ref($quotahash{'quotas'}) eq 'HASH') {
         if ($inststatus ne '') {
-            my @statuses = map { &unescape($_); } split(/:/,$inststatus);
+            my @statuses = split(/:/,$inststatus);
             foreach my $item (@statuses) {
-                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 ($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 '') {
-            if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
-                $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'};
-            } else {
-                $defquota = $quotahash{'quotas'}{'default'};
-            }
+            $defquota = $quotahash{'quotas'}{'default'};
             $settingstatus = 'default';
         }
     } else {
@@ -7132,7 +6949,6 @@ sub user_picker {
         #       loncreateuser::print_user_query_page()
         #       has been completed.
         next if ($option eq 'alc');
-        next if (($option eq 'crs') && ($env{'form.form'} eq 'requestcrs'));
         next if ($option eq 'crs' && !$env{'request.course.id'});
         if ($curr_selected{'srchin'} eq $option) {
             $srchinsel .= ' 
@@ -7176,14 +6992,12 @@ sub user_picker {
                 if ($cancreate) {
                     $new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>';
                 } else {
-                    my $helplink = 'javascript:helpMenu('."'display'".')';
+                    my $helplink = ' href="javascript:helpMenu('."'display'".')"';
                     my %usertypetext = (
                         official   => 'institutional',
                         unofficial => 'non-institutional',
                     );
-                    $new_user_create = '<p class="LC_warning">'.
-                                       &mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.
-                                       &mt('Please contact the [_1]helpdesk[_2] for assistance.','<a href="'.$helplink.'">','</a>').'</p><br />';
+                    $new_user_create = '<br /><span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
                 }
             }
         }
@@ -7220,7 +7034,6 @@ ENDSCRIPT
 
     my $output = <<"END_BLOCK";
 <script type="text/javascript">
-// <![CDATA[
 function validateEntry(callingForm) {
 
     var checkok = 1;
@@ -7289,25 +7102,28 @@ function validateEntry(callingForm) {
 
 $newuserscript
 
-// ]]>
 </script>
 
 $new_user_create
 
+<table>
+ <tr>
+  <td>$lt{'doma'}:</td>
+  <td>$domform</td>
+  </td>
+ </tr>
+ <tr>
+  <td>$lt{'usr'}:</td>
+  <td>$srchbysel
+      $srchtypesel 
+      <input type="text" size="15" name="srchterm" value="$srchterm" />
+      $srchinsel 
+  </td>
+ </tr>
+</table>
+<br />
 END_BLOCK
 
-    $output .= &Apache::lonhtmlcommon::start_pick_box().
-               &Apache::lonhtmlcommon::row_title($lt{'doma'}).
-               $domform.
-               &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title($lt{'usr'}).
-               $srchbysel.
-               $srchtypesel.
-               '<input type="text" size="15" name="srchterm" value="'.$srchterm.'" />'.
-               $srchinsel.
-               &Apache::lonhtmlcommon::row_closure(1).
-               &Apache::lonhtmlcommon::end_pick_box().
-               '<br />';
     return $output;
 }
 
@@ -7463,7 +7279,6 @@ sub personal_data_fieldtitles {
                         middlename => 'Middle Name',
                         generation => 'Generation',
                         gen => 'Generation',
-                        inststatus => 'Affiliation',
                    );
     return %fieldtitles;
 }
@@ -7533,56 +7348,8 @@ 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
@@ -8133,7 +7900,7 @@ sub upfile_select_html {
 #                 xml   => &mt('HTML/XML'),
                  );
     my $Str = '<input type="file" name="upfile" size="50" />'.
-        '<br />'.&mt('Type').': <select name="upfiletype">';
+        '<br />Type: <select name="upfiletype">';
     foreach my $type (sort(keys(%Types))) {
         $Str .= '<option value="'.$type.'" >'.$Types{$type}."</option>\n";
     }
@@ -8179,8 +7946,7 @@ sub csv_print_samples {
     $r->print(&mt('Samples').'<br />'.&start_data_table().
               &start_data_table_header_row());
     foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) { 
-        $r->print('<th>'.&mt('Column [_1]',($sample+1)).'</th>');
-    }
+        $r->print('<th>'.&mt('Column&nbsp;[_1]',($sample+1)).'</th>'); }
     $r->print(&end_data_table_header_row());
     foreach my $hash (@$samples) {
 	$r->print(&start_data_table_row());
@@ -8224,7 +7990,7 @@ sub csv_print_select_table {
 	my ($value,$display,$defaultcol)=@{ $array_ref };
 	$r->print(&start_data_table_row().'<td>'.$display.'</td>');
 
-	$r->print('<td><select name="f'.$i.'"'.
+	$r->print('<td><select name=f'.$i.
 		  ' onchange="javascript:flip(this.form,'.$i.');">');
 	$r->print('<option value="none"></option>');
 	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
@@ -8878,11 +8644,9 @@ sub restore_settings {
 
 =item * &build_recipient_list()
 
-Build recipient lists for five types of e-mail:
-(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
-(d) Help requests, (e) Course requests needing approval,  generated by
-lonerrorhandler.pm, CHECKRPMS, loncron, lonsupportreq.pm and
-loncoursequeueadmin.pm respectively.
+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.
 
 Inputs:
 defmail (scalar - email address of default recipient), 
@@ -8906,21 +8670,17 @@ sub build_recipient_list {
     my %domconfig =
          &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
     if (ref($domconfig{'contacts'}) eq 'HASH') {
-        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);
-                        }
+        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);
@@ -9052,8 +8812,6 @@ sub extract_categories {
                 my $trailstr;
                 if ($name eq 'instcode') {
                     $trailstr = &mt('Official courses (with institutional codes)');
-                } elsif ($name eq 'communities') {
-                    $trailstr = &mt('Communities');
                 } else {
                     $trailstr = $name;
                 }
@@ -9164,16 +8922,14 @@ Inputs:
 cathash - reference to hash of categories defined for the domain (from
           configuration.db)
 
-currcat - scalar with an & separated list of categories assigned to a course.
-
-type    - scalar contains course type (Course or Community).
+currcat - scalar with an & separated list of categories assigned to a course. 
 
 Returns: $output (markup to be displayed) 
 
 =cut
 
 sub assign_categories_table {
-    my ($cathash,$currcat,$type) = @_;
+    my ($cathash,$currcat) = @_;
     my $output;
     if (ref($cathash) eq 'HASH') {
         my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
@@ -9182,20 +8938,15 @@ sub assign_categories_table {
         if (@cats > 0) {
             my $itemcount = 0;
             if (ref($cats[0]) eq 'ARRAY') {
+                $output = &Apache::loncommon::start_data_table();
                 my @currcategories;
                 if ($currcat ne '') {
                     @currcategories = split('&',$currcat);
                 }
-                my $table;
                 for (my $i=0; $i<@{$cats[0]}; $i++) {
                     my $parent = $cats[0][$i];
-                    next if ($parent eq 'instcode');
-                    if ($type eq 'Community') {
-                        next unless ($parent eq 'communities');
-                    } else {
-                        next if ($parent eq 'communities');
-                    }
                     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                    next if ($parent eq 'instcode');
                     my $item = &escape($parent).'::0';
                     my $checked = '';
                     if (@currcategories > 0) {
@@ -9203,26 +8954,18 @@ sub assign_categories_table {
                             $checked = ' checked="checked" ';
                         }
                     }
-                    my $parent_title = $parent;
-                    if ($parent eq 'communities') {
-                        $parent_title = &mt('Communities');
-                    }
-                    $table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
-                              '<input type="checkbox" name="usecategory" value="'.
-                              $item.'"'.$checked.' />'.$parent_title.'</span>'.
-                              '<input type="hidden" name="catname" value="'.$parent.'" /></td>';
+                    $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
+                               '<input type="checkbox" name="usecategory" value="'.
+                               $item.'"'.$checked.' />'.$parent.'</span>'.
+                               '<input type="hidden" name="catname" value="'.$parent.'" /></td>';
                     my $depth = 1;
                     push(@path,$parent);
-                    $table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
+                    $output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
                     pop(@path);
-                    $table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
+                    $output .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
                     $itemcount ++;
                 }
-                if ($itemcount) {
-                    $output = &Apache::loncommon::start_data_table().
-                              $table.
-                              &Apache::loncommon::end_data_table();
-                }
+                $output .= &Apache::loncommon::end_data_table();
             }
         }
     }
@@ -9467,64 +9210,40 @@ sub check_clone {
     my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
     my $clonemsg;
     my $can_clone = 0;
-    my $lctype = lc($args->{'crstype'});
-    if ($lctype ne 'community') {
-        $lctype = 'course';
-    }
+
     if ($clonehome eq 'no_host') {
-        if ($args->{'crstype'} eq 'Community') {
-            $clonemsg = &mt('No new community created.').$linefeed.&mt('A new community could not be cloned from the specified original - [_1] - because it is a non-existent community.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
-        } else {
-            $clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
-        }
+        $clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});     
     } else {
 	my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
-        if ($args->{'crstype'} eq 'Community') {
-            if ($clonedesc{'type'} ne 'Community') {
-                 $clonemsg = &mt('No new community created.').$linefeed.&mt('A new community could not be cloned from the specified original - [_1] - because it is a course not a community.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
-                return ($can_clone, $clonemsg, $cloneid, $clonehome);
-            }
-        }
-        if (($env{'request.role.domain'} eq $args->{'clonedomain'}) &&
-            (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) {
-            $can_clone = 1;
-        } else {
-            my %clonehash = &Apache::lonnet::get('environment',['cloners'],
-                                                 $args->{'clonedomain'},$args->{'clonecourse'});
-            my @cloners = split(/,/,$clonehash{'cloners'});
+	if ($env{'request.role.domain'} eq $args->{'clonedomain'}) {
+	    $can_clone = 1;
+	} else {
+	    my %clonehash = &Apache::lonnet::get('environment',['cloners'],
+						 $args->{'clonedomain'},$args->{'clonecourse'});
+	    my @cloners = split(/,/,$clonehash{'cloners'});
             if (grep(/^\*$/,@cloners)) {
                 $can_clone = 1;
             } elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
                 $can_clone = 1;
             } else {
-                my $ccrole = 'cc';
-                if ($args->{'crstype'} eq 'Community') {
-                    $ccrole = 'co';
-                }
-                my %roleshash =
-                    &Apache::lonnet::get_my_roles($args->{'ccuname'},
-                                         $args->{'ccdomain'},
-                                         'userroles',['active'],[$ccrole],
-                                         [$args->{'clonedomain'}]);
-                if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
-                    $can_clone = 1;
-                } elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},$args->{'ccuname'},$args->{'ccdomain'})) {
-                    $can_clone = 1;
-                } else {
-                    if ($args->{'crstype'} eq 'Community') {
-                        $clonemsg = &mt('No new community created.').$linefeed.&mt('The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
-                    } else {
-                        $clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
-                    }
-                }
-            }
+	        my %roleshash =
+		    &Apache::lonnet::get_my_roles($args->{'ccuname'},
+					 $args->{'ccdomain'},
+                                         'userroles',['active'],['cc'],
+					 [$args->{'clonedomain'}]);
+	        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
+		    $can_clone = 1;
+	        } else {
+                    $clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+	        }
+	    }
         }
     }
     return ($can_clone, $clonemsg, $cloneid, $clonehome);
 }
 
 sub construct_course {
-    my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum,$category) = @_;
+    my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_;
     my $outcome;
     my $linefeed =  '<br />'."\n";
     if ($context eq 'auto') {
@@ -9562,9 +9281,7 @@ sub construct_course {
                                              $args->{'crscode'},
                                              $args->{'ccuname'}.':'.
                                              $args->{'ccdomain'},
-                                             $args->{'crstype'},
-                                             $cnum,$context,$category);
-
+                                             $args->{'crstype'});
 
     # Note: The testing routines depend on this being output; see 
     # Utils::Course. This needs to at least be output as a comment
@@ -9594,10 +9311,6 @@ sub construct_course {
 	$cenv{'url'}=$oldcenv{'url'};
 # Restore title
 	$cenv{'description'}=$oldcenv{'description'};
-# Restore creation date, creator and creation context.
-        $cenv{'internal.created'}=$oldcenv{'internal.created'};
-        $cenv{'internal.creator'}=$oldcenv{'internal.creator'};
-        $cenv{'internal.creationcontext'}=$oldcenv{'internal.creationcontext'};
 # Mark as cloned
 	$cenv{'clonedfrom'}=$cloneid;
 # Need to clone grading mode
@@ -9611,9 +9324,7 @@ sub construct_course {
                    'policy.email',
                    'comment.email',
                    'pch.users.denied',
-                   'plc.users.denied',
-                   'hidefromcat',
-                   'categories'],
+                   'plc.users.denied'],
                    $$crsudom,$$crsunum);
     }
 
@@ -9876,22 +9587,12 @@ sub course_type {
 sub group_term {
     my $crstype = &course_type();
     my %names = (
-                  'Course'    => 'group',
-                  'Community' => 'group',
+                  'Course' => 'group',
+                  'Group' => 'team',
                 );
     return $names{$crstype};
 }
 
-sub course_types {
-    my @types = ('official','unofficial','community');
-    my %typename = (
-                         official   => 'Official course',
-                         unofficial => 'Unofficial course',
-                         community  => 'Community',
-                   );
-    return (\@types,\%typename);
-}
-
 sub icon {
     my ($file)=@_;
     my $curfext = lc((split(/\./,$file))[-1]);
@@ -9951,22 +9652,6 @@ sub escape_url {
     return join('/',@urlslices).'/'.$lastitem;
 }
 
-sub compare_arrays {
-    my ($arrayref1,$arrayref2) = @_;
-    my (@difference,%count);
-    @difference = ();
-    %count = ();
-    if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) {
-        foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
-        foreach my $element (keys(%count)) {
-            if ($count{$element} == 1) {
-                push(@difference,$element);
-            }
-        }
-    }
-    return @difference;
-}
-
 # -------------------------------------------------------- Initliaze user login
 sub init_user_environment {
     my ($r, $username, $domain, $authhost, $form, $args) = @_;
@@ -10097,17 +9782,6 @@ 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','community') {
-            $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",
@@ -10146,7 +9820,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-^https?\://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+    (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
     my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
     if ($symb eq '') {
         if (!$silent) {
@@ -10173,13 +9847,11 @@ sub get_annotation {
 }
 
 sub clean_symb {
-    my ($symb,$delete_enc) = @_;
+    my ($symb) = @_;
 
     &Apache::lonenc::check_decrypt(\$symb);
     my $enc = $env{'request.enc'};
-    if ($delete_enc) {
-        delete($env{'request.enc'});
-    }
+    delete($env{'request.enc'});
 
     return ($symb,$enc);
 }