--- loncom/interface/loncommon.pm	2010/01/19 16:20:38	1.692.4.23
+++ loncom/interface/loncommon.pm	2009/03/27 04:59:30	1.781
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.692.4.23 2010/01/19 16:20:38 raeburn Exp $
+# $Id: loncommon.pm,v 1.781 2009/03/27 04:59:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -271,7 +271,7 @@ BEGIN {
         }
     }
     &Apache::lonnet::logthis(
-              "<font color=yellow>INFO: Read file types</font>");
+             "<span style='color:yellow;'>INFO: Read file types</span>");
     $readit=1;
     }  # end of unless($readit) 
     
@@ -407,9 +407,8 @@ sub studentbrowser_javascript {
           ) { return ''; }  
    return (<<'ENDSTDBRW');
 <script type="text/javascript" language="Javascript">
-// <![CDATA[
     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,47 +422,37 @@ 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 '';
 }
 
 sub authorbrowser_javascript {
     return <<"ENDAUTHORBRW";
-<script type="text/javascript">
-// <![CDATA[
+<script type="text/javascript" language="JavaScript">
 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 = '
+    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" language="JavaScript">
-// <![CDATA[
     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+'&';
@@ -518,164 +512,56 @@ sub coursebrowser_javascript {
                 }
             }     
         }
-        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();
@@ -709,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 {
@@ -778,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) {
@@ -884,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(...)
@@ -986,7 +797,6 @@ sub linked_select_forms {
     # output the javascript to do the changing
     my $result = '';
     $result.='<script type="text/javascript" language="JavaScript">'."\n";
-    $result.="// <![CDATA[\n";
     $result.="var select2data = new Object();\n";
     $" = '","';
     my $debug = '';
@@ -1032,7 +842,6 @@ function select1_changed() {
         }
     }
 }
-// ]]>
 </script>
 END
     # output the initial values for the selection lists
@@ -1114,20 +923,22 @@ sub help_open_topic {
     }
 
     # Add the text
-    if ($text ne "") {
-	$template .= 
-            "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
-            "<td bgcolor='#5555FF'><span class=\"LC_nobreak\"><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></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 .= '<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.=' <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;
 
@@ -1140,25 +951,26 @@ sub helpLatexCheatsheet {
     my $out;
     my $addOther = '';
     if ($topic) {
-	$addOther = &Apache::loncommon::help_open_topic($topic,$text,
-						       undef, undef, 600) .
-							   '</td><td>';
-    }
-    $out = '<table><tr><td>'.
-           $addOther .
-           &Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
-                                               undef,undef,600).
-           '</td><td>'.
-           &Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
-                                               undef,undef,600).
-           '</td>';
+	$addOther = '<span>'.&Apache::loncommon::help_open_topic($topic,&mt($text),
+							       undef, undef, 600).
+								   '</span> ';
+    }
+    $out = '<span>' # Start cheatsheet
+	  .$addOther
+          .'<span>'
+	  .&Apache::loncommon::help_open_topic('Greek_Symbols',&mt('Greek Symbols'),
+					       undef,undef,600)
+	  .'</span> <span>'
+	  .&Apache::loncommon::help_open_topic('Other_Symbols',&mt('Other Symbols'),
+					       undef,undef,600)
+	  .'</span>';
     unless ($not_author) {
-        $out .= '<td>'.
-                &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
-                                                    undef,undef,600).
-                '</td>';
+        $out .= ' <span>'
+	       .&Apache::loncommon::help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),
+	                                            undef,undef,600)
+	       .'</span>';
     }
-    $out .= '</tr></table>';
+    $out .= '</span>'; # End cheatsheet
     return $out;
 }
 
@@ -1166,7 +978,7 @@ 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';
@@ -1186,9 +998,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;
@@ -1265,8 +1075,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;
@@ -1291,8 +1101,8 @@ function writeHelp(caller) {
     caller.document.close()
     caller.focus()
 }
-// END LON-CAPA Internal -->
 // ]]>
+// END LON-CAPA Internal -->
 </script>
 ENDTEMPLATE
     return $template;
@@ -1329,7 +1139,7 @@ sub help_open_bug {
     {
 	$template .= 
   "<table bgcolor='#AA3333' cellspacing='1' cellpadding='1' border='0'><tr>".
-  "<td bgcolor='#FF5555'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+  "<td bgcolor='#FF5555'><a target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF;font-size:10pt;\">$text</span></a>";
     }
 
     # Add the graphic
@@ -1374,7 +1184,7 @@ sub help_open_faq {
     {
 	$template .= 
   "<table bgcolor='#337733' cellspacing='1' cellpadding='1' border='0'><tr>".
-  "<td bgcolor='#448844'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+  "<td bgcolor='#448844'><a target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF; font-size:10pt;\">$text</span></a>";
     }
 
     # Add the graphic
@@ -1560,7 +1370,6 @@ sub resize_textarea_js {
     my $geometry = &viewport_geometry_js();
     return <<"RESIZE";
     <script type="text/javascript">
-// <![CDATA[
 $geometry
 
 function getX(element) {
@@ -1599,7 +1408,6 @@ function resize_textarea(textarea_id,bot
     }
     textarea.style.height=new_height+'px';
 }
-// ]]>
 </script>
 RESIZE
 
@@ -1943,7 +1751,7 @@ sub select_level_form {
 
 =pod
 
-=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms)
+=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.  
@@ -1954,24 +1762,18 @@ 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 $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,$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,$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\"$onchange>\n";
     foreach my $dom (@domains) {
@@ -2029,7 +1831,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))) {
@@ -2363,7 +2165,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'}) {
@@ -2372,7 +2174,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">';
                 }
             }
         }
@@ -2449,7 +2251,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'}) {
@@ -2458,7 +2260,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">';
                 }
             }
         }
@@ -2473,7 +2275,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;
 }
 
@@ -2504,7 +2306,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'}) {
@@ -2513,7 +2315,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">';
                 }
             }
         }
@@ -2555,7 +2357,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'}) {
@@ -2564,7 +2366,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">';
                 }
             }
         }
@@ -2987,25 +2789,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
 
@@ -3039,15 +2822,12 @@ sub aboutmewrapper {
 
 
 sub syllabuswrapper {
-    my ($linktext,$coursedir,$domain,$fontcolor)=@_;
-    if ($fontcolor) { 
-        $linktext='<font color="'.$fontcolor.'">'.$linktext.'</font>'; 
-    }
+    my ($linktext,$coursedir,$domain)=@_;
     return qq{<a href="/public/$domain/$coursedir/syllabus">$linktext</a>};
 }
 
 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*$/ &&
@@ -3061,7 +2841,6 @@ 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>}.
@@ -3348,6 +3127,7 @@ sub user_lang {
     return $user_lh;
 }
 
+
 ###############################################################
 ##               Student Answer Attempts                     ##
 ###############################################################
@@ -3737,7 +3517,6 @@ sub findallcourses {
         if (!%roles) {
             %roles = (
                        cc => 1,
-                       co => 1,
                        in => 1,
                        ep => 1,
                        ta => 1,
@@ -4064,7 +3843,7 @@ sub blocking_status {
                              &Apache::lonnet::coursedescription($course);
                         $coursedesc = $courseinfo{'description'};
                     }
-                    $category = "Group portfolio files in the course '$coursedesc'";
+                    $category = "Group portfolio in the course '$coursedesc'";
                 } else {
                     $category = 'Portfolio files belonging to ';
                     if ($env{'user.name'} eq 'public' && 
@@ -4167,7 +3946,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'}; 
@@ -4198,7 +3977,7 @@ sub get_domainconf {
                 foreach my $key (keys(%{$domconfig{'login'}})) {
                     if (ref($domconfig{'login'}{$key}) eq 'HASH') {
                         foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
-                            $designhash{$udom.'.login.'.$key.'_'.$img} =
+                            $designhash{$udom.'.login.'.$key.'_'.$img} = 
                                 $domconfig{'login'}{$key}{$img};
                         }
                     } else {
@@ -4425,7 +4204,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),
@@ -4493,7 +4272,7 @@ $realm&nbsp;
 </td>
 ENDROLE
 
-    my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
+    my $titleinfo = '<h1>'.$title.'</h1>';
     if ($customtitle) {
         $titleinfo = $customtitle;
     }
@@ -4536,7 +4315,7 @@ ENDROLE
 		.'<b>'.&mt('Construction Space').'</b>:&nbsp;'
 		.'<form name="dirs" method="post" action="'.$formaction
 		.'" target="_top"><tt><b>'
-		.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />"
+		.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<span class=\"LC_fontsize_big\">$lastitem</span></b></tt><br />"
 		.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
 		.'</form>'
 		.&Apache::lonmenu::constspaceform();
@@ -4710,11 +4489,15 @@ sub standard_css {
     my $vlink  = &designparm($function.'.vlink', $domain);
     my $link   = &designparm($function.'.link',  $domain);
 
+    my $loginbg = &designparm('login.sidebg',$domain);
+    my $bgcol = &designparm('login.bgcol',$domain);
+    my $textcol = &designparm('login.textcol',$domain);
+
     my $sans                 = 'Verdana,Arial,Helvetica,sans-serif';
     my $mono                 = 'monospace';
     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';
@@ -4727,40 +4510,58 @@ sub standard_css {
     my $mail_other_hover     = '#669999';
     my $table_header         = '#DDDDDD';
     my $feedback_link_bg     = '#BBBBBB';
-    my $lg_border_color      = '#C8C8C8';
+    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 } 
-
-hr {
-  clear: both;
-  color: $tabbg;
-  background-color: $tabbg;
-  height: 3px;
-  border: none;
-}
+body{
+     font-family: $sans;
+     line-height:130%;
+     font-size:0.83em;
+     color:$font;
+  }
+a:link, a:visited { font-size:100%; }
 
+a:focus { color: red; background: yellow }
 table.thinborder,
-
 table.thinborder tr th {
   border-style: solid;
   border-width: 1px;
+  border-color: $lg_border_color;
   background: $tabbg;
 }
 table.thinborder tr td {
   border-style: solid;
-  border-width: 1px
+  border-width: 1px;
+  border-color: $lg_border_color;
 }
 
 form, .inline { display: inline; }
-.center { text-align: center; }
-.LC_filename {font-family: $mono; white-space:pre;}
+
+.LC_right {text-align:right;}
+.LC_middle {vertical-align:middle;}
+
+/* just for tests */
+.LC_400Box {width:400px; }
+/* end */
+
+.LC_filename {
+  font-family: $mono;
+  white-space:pre;
+}
+
+.LC_fileicon {
+  border: none;
+  height: 1.3em;
+  vertical-align: text-bottom;
+  margin-right: 0.3em;
+  text-decoration:none;
+}
+
 .LC_error {
   color: red;
   font-size: larger;
@@ -4775,24 +4576,16 @@ 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;
 }
+
 .LC_indexer_icon {
-  border: 0;
+  border: 0px;
   height: 22px;
 }
 .LC_docs_spacer {
@@ -4805,38 +4598,6 @@ div.LC_confirm_box .LC_success img {
   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;
-}
-
 table.LC_pastsubmission {
   border: 1px solid black;
   margin: 2px;
@@ -4847,10 +4608,10 @@ 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, 
+table#LC_title_bar, table.LC_breadcrumbs,
 table#LC_title_bar.LC_with_remote {
   width: 100%;
   border-color: $pgbg;
@@ -4860,58 +4621,58 @@ table#LC_title_bar.LC_with_remote {
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0;
+  padding: 0px;
 }
-
 table.LC_docs_path {
   width: 100%;
   border: 0;
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0;
+  padding: 0px;
 }
 
 table#LC_title_bar td {
   background: $tabbg;
 }
-table#LC_title_bar td.LC_title_bar_who {
+table#LC_title_bar .LC_title_bar_who {
   background: $tabbg;
   color: $font;
   font: small $sans;
   text-align: right;
+  margin: 0px;
+}
+table#LC_title_bar .LC_title_bar_name {
+  margin: 0px;
+}
+table#LC_title_bar .LC_title_bar_role {
+  margin: 0px;
+}
+table#LC_title_bar .LC_title_bar_realm {
+  margin: 0px;
 }
 span.LC_metadata {
     font-family: $sans;
 }
-span.LC_title_bar_title {
-  font: bold x-large $sans;
-}
 table#LC_title_bar td.LC_title_bar_domain_logo {
   background: $sidebg;
   text-align: right;
-  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-spacing: 1px;
-  padding: 0 1px;
-  margin: 0;
-  border-collapse: separate;
-}
-table#LC_menubuttons img, table#LC_menubuttons_mainmenu img {
-  border: none;
+table#LC_menubuttons img{
+  border: 0px;
 }
 table#LC_top_nav td {
   background: $tabbg;
-  border: none;
+  border: 0px;
   font-size: small;
+  vertical-align:top;
+  padding:2px 5px 2px 5px;
 }
 table#LC_top_nav td a, div#LC_top_nav a {
   color: $font;
@@ -4924,7 +4685,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,
@@ -4956,10 +4717,26 @@ table#LC_mainmenu td.LC_mainmenu_column
     vertical-align: top;
 }
 
+.LC_fontsize_small
+{
+ font-size: 70%;
+}
+
+.LC_fontsize_medium
+{
+ font-size: 85%;
+}
+
+.LC_fontsize_large
+{
+ font-size: 120%;
+}
+
 .LC_menubuttons_inline_text {
   color: $font;
   font-family: $sans;
-  font-size: smaller;
+  font-size: 90%;
+  padding-left:3px;
 }
 
 .LC_menubuttons_link {
@@ -4975,13 +4752,10 @@ table#LC_mainmenu td.LC_mainmenu_column
 }
 
 td.LC_menubuttons_text {
-  width: 90%;
-  color: $font;
-  font-family: $sans;
+ 	color: $font;
 }
 
-td.LC_menubuttons_img {
-}
+
 
 .LC_current_location {
   font-family: $sans;
@@ -4993,6 +4767,7 @@ td.LC_menubuttons_img {
   font-weight: bold;
 }
 
+
 .LC_dropadd_labeltext {
   font-family: $sans;
   text-align: right;
@@ -5004,7 +4779,7 @@ td.LC_menubuttons_img {
 }
 
 .LC_roleslog_note {
-  font-size: smaller;
+  font-size: small;
 }
 
 .LC_mail_functions {
@@ -5012,9 +4787,9 @@ td.LC_menubuttons_img {
 }
 
 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;
@@ -5028,33 +4803,27 @@ 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;
+  font-size:90%;
 }
 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_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;
@@ -5087,7 +4856,7 @@ table.LC_nested tr.LC_empty_row td {
 table.LC_nested_outer tr th {
   font-weight: bold;
   background-color: $data_table_head;
-  font-size: smaller;
+  font-size: small;
   border-bottom: 1px solid #000000;
 }
 table.LC_nested_outer tr td.LC_subheader {
@@ -5126,7 +4895,7 @@ table.LC_createuser {
 }
 
 table.LC_createuser tr.LC_section_row td {
-  font-size: smaller;
+  font-size: small;
 }
 
 table.LC_createuser tr.LC_info_row td  {
@@ -5152,13 +4921,16 @@ table.LC_calendar tr td.LC_calendar_day_
 table.LC_calendar tr td.LC_calendar_day_current {
   background-color: $data_table_highlight;
 }
-
 table.LC_mail_list tr.LC_mail_new {
   background-color: $mail_new;
 }
 table.LC_mail_list tr.LC_mail_new:hover {
   background-color: $mail_new_hover;
 }
+table.LC_mail_list tr.LC_mail_even{
+}
+table.LC_mail_list tr.LC_mail_odd{
+}
 table.LC_mail_list tr.LC_mail_read {
   background-color: $mail_read;
 }
@@ -5177,72 +4949,23 @@ table.LC_mail_list tr.LC_mail_other {
 table.LC_mail_list tr.LC_mail_other:hover {
   background-color: $mail_other_hover;
 }
-table.LC_mail_list tr.LC_mail_even {
-}
-table.LC_mail_list tr.LC_mail_odd {
-}
-
-
-table#LC_portfolio_actions {
-  width: auto;
-  background: $pgbg;
-  border: none;
-  border-spacing: 2px 2px;
-  padding: 0;
-  margin: 0;
-  border-collapse: separate;
-}
-table#LC_portfolio_actions td.LC_label {
-  background: $tabbg;
-  text-align: right;
-}
-table#LC_portfolio_actions td.LC_value {
-  background: $tabbg;
-}
 
-table#LC_cstr_controls {
-  width: 100%;
-  border-collapse: collapse;
-}
-table#LC_cstr_controls tr td {
-  border: 4px solid $pgbg;
-  padding: 4px;
-  text-align: center;
-  background: $tabbg;
-}
-table#LC_cstr_controls tr th {
-  border: 4px solid $pgbg;
-  background: $table_header;
-  text-align: center;
-  font-family: $sans;
-  font-size: smaller;
-}
-
-table#LC_browser {
- 
-}
-table#LC_browser tr th {
-  background: $table_header;
-}
-table#LC_browser tr td {
-  padding: 2px;
-}
-table#LC_browser tr.LC_browser_file,
-table#LC_browser tr.LC_browser_file_published {
+table.LC_data_table tr > td.LC_browser_file,
+table.LC_data_table tr > td.LC_browser_file_published {
   background: #CCFF88;
 }
-table#LC_browser tr.LC_browser_file_locked,
-table#LC_browser tr.LC_browser_file_unpublished {
+table.LC_data_table tr > td.LC_browser_file_locked,
+table.LC_data_table tr > td.LC_browser_file_unpublished {
   background: #FFAA99;
 }
-table#LC_browser tr.LC_browser_file_obsolete {
+table.LC_data_table tr > td.LC_browser_file_obsolete {
   background: #AAAAAA;
 }
-table#LC_browser tr.LC_browser_file_modified,
-table#LC_browser tr.LC_browser_file_metamodified {
+table.LC_data_table tr > td.LC_browser_file_modified,
+table.LC_data_table tr > td.LC_browser_file_metamodified {
   background: #FFFF77;
 }
-table#LC_browser tr.LC_browser_folder {
+table.LC_data_table tr.LC_browser_folder > td {
   background: #CCCCFF;
 }
 
@@ -5266,7 +4989,7 @@ table.LC_data_table tr > td.LC_roles_sel
 }
 
 span.LC_current_location {
-  font-size: x-large;
+  font-size:larger;
   background: $pgbg;
 }
 
@@ -5293,7 +5016,7 @@ span.LC_parm_folder, span.LC_parm_symb {
 }
 
 td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu,
-td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+td.LC_parm_overview_parm_selectors,td.LC_parm_overview_restrictions  {
   border: 1px solid black;
   border-collapse: collapse;
 }
@@ -5310,9 +5033,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 {
@@ -5323,7 +5046,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 {
@@ -5386,7 +5109,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;
 }
@@ -5428,7 +5151,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;
 }
@@ -5461,7 +5184,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 {
@@ -5482,7 +5205,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;
@@ -5506,7 +5228,7 @@ table.LC_descriptive_input td.LC_descrip
 div.LC_feedback_link {
   clear: both;
   background: white;
-  width: 100%;  
+  width: 100%;
 }
 span.LC_feedback_link {
   background: $feedback_link_bg;
@@ -5537,7 +5259,7 @@ table.LC_prior_tries td {
   background: #FFAAAA ! important;
   color: black;
 }
-.LC_answer_not_charged_try, 
+.LC_answer_not_charged_try,
 .LC_answer_no_grade,
 .LC_answer_late {
   background: #FFFFAA;
@@ -5555,8 +5277,6 @@ table.LC_prior_tries td {
   background: orange;
   color: black;
 }
-
-
 span.LC_prior_numerical,
 span.LC_prior_string,
 span.LC_prior_custom,
@@ -5584,6 +5304,7 @@ table.LC_prior_match tr td {
   border: 1px solid #000000;
 }
 
+td.LC_nobreak,
 span.LC_nobreak {
   white-space: nowrap;
 }
@@ -5599,24 +5320,15 @@ span.LC_cusr_subheading {
 
 table.LC_docs_documents {
   background: #BBBBBB;
-  border-width: 0;
+  border-width: 0px;
   border-collapse: collapse;
 }
-
 table.LC_docs_documents td.LC_docs_document {
   border: 2px solid black;
   padding: 4px;
 }
-
-.LC_docs_course_commands div {
-  float: left;
-  border: 4px solid #AAAAAA;
-  padding: 4px;
-  background: #DDDDCC;
-}
-
 .LC_docs_entry_move {
-  border: none;
+  border: 0px;
   border-collapse: collapse;
 }
 
@@ -5672,7 +5384,7 @@ table.LC_sty_end {
 }
 
 table.LC_double_column {
-  border-width: 0;
+  border-width: 0px;
   border-collapse: collapse;
   width: 100%;
   padding: 2px;
@@ -5687,7 +5399,7 @@ table.LC_double_column tr td.LC_left_col
 
 table.LC_double_column tr td.LC_right_col {
   top: 2px;
-  right: 2px; 
+  right: 2px;
   width: 47%;
   vertical-align: top;
 }
@@ -5712,23 +5424,6 @@ div.LC_clear_float_footer {
 }
 
 
-div.LC_grade_select_mode {
-  font-family: $sans;
-}
-div.LC_grade_select_mode div div {
-  margin: 5px;
-}
-div.LC_grade_select_mode_selector {
-  margin: 5px;
-  float: left;
-}
-div.LC_grade_select_mode_selector_header {
-  font: bold medium $sans;
-}
-div.LC_grade_select_mode_type {
-  clear: left;
-}
-
 div.LC_grade_show_user {
   margin-top: 20px;
   border: 1px solid black;
@@ -5736,7 +5431,8 @@ div.LC_grade_show_user {
 div.LC_grade_user_name {
   background: #DDDDEE;
   border-bottom: 1px solid black;
-  font: bold large $sans;
+  font-weight: bold;
+  font-size: large;
 }
 div.LC_grade_show_user_odd_row div.LC_grade_user_name {
   background: #DDEEDD;
@@ -5755,7 +5451,8 @@ div.LC_grade_show_problem_header,
 div.LC_grade_submissions_header,
 div.LC_grade_message_center_header,
 div.LC_grade_assign_header {
-  font: bold large $sans;
+  font-weight: bold;
+  font-size: large;
 }
 div.LC_grade_show_problem_problem,
 div.LC_grade_submissions_body,
@@ -5766,7 +5463,8 @@ div.LC_grade_assign_body {
   background: #FFFFFF;
 }
 span.LC_grade_check_note {
-  font: normal medium $sans;
+  font-weight: normal;
+  font-size: medium;
   display: inline;
   position: absolute;
   right: 1em;
@@ -5776,12 +5474,13 @@ table.LC_scantron_action {
   width: 100%;
 }
 table.LC_scantron_action tr th {
-  font: normal bold $sans;
+  font-weight:bold;
+  font-style:normal;
 }
-
-div.LC_edit_problem_header, 
+.LC_edit_problem_header,
 div.LC_edit_problem_footer {
-  font: normal medium $sans;
+  font-weight: normal;
+  font-size:  medium;
   margin: 2px;
 }
 div.LC_edit_problem_header,
@@ -5798,12 +5497,14 @@ div.LC_edit_problem_header_edit_row {
   margin-bottom: 5px;
 }
 div.LC_edit_problem_header_title {
-  font: larger bold $sans;
+  font-weight: bold;
+  font-size: larger;
   background: $tabbg;
   padding: 3px;
 }
 table.LC_edit_problem_header_title {
-  font: larger bold $sans;
+  font-size: larger;
+  font-weight:  bold;
   width: 100%;
   border-color: $pgbg;
   border-style: solid;
@@ -5811,7 +5512,7 @@ table.LC_edit_problem_header_title {
 
   background: $tabbg;
   border-collapse: collapse;
-  padding: 0;
+  padding: 0px
 }
 
 div.LC_edit_problem_discards {
@@ -5827,7 +5528,7 @@ hr.LC_edit_problem_divide {
   color: $tabbg;
   background-color: $tabbg;
   height: 3px;
-  border: none;
+  border: 0px;
 }
 img.stift{
   border-width:0;
@@ -5851,15 +5552,458 @@ table#LC_mainmenu td.LC_mainmenu_col_fie
   font-size: small;
   font-weight: bold;
 }
-fieldset#LC_mainmenu_fieldset {
-  margin:0 10px 10px 0;
+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.
+# Don't rely on their current functionality as they might be 
+# changed or removed.
+# --------------------------*/
+
+a: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 20px;
+	line-height:130%;
 }
 
-div.LC_createcourse {
-    margin: 10px 10px 10px 10px;
+h2,h3,h4,h5,h6
+{
+	margin:5px 0px 5px 0px;
+	padding:0px;
+	line-height:130%;
+}
+.LC_hcell{
+        padding:3px 15px 3px 15px;
+        margin:0px;
+	background-color:$tabbg;
+	border-bottom:solid 1px $lg_border_color;
+}
+.LC_noBorder {
+        border:0px;
+}
+
+
+/* Main Header with discription of Person, Course, etc. */
+
+.LC_Right {
+        float: right;
+        margin: 0px;
+        padding: 0px;
+}
+
+p, .LC_ContentBox {
+	padding: 10px;
+
+}
+.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.LC_smallMenu, ol#LC_PathBreadcrumbs {
+	margin: 0px;
+}
+
+ol.LC_smallMenu li {
+	display: inline;
+	padding: 5px 5px 0px 10px;
+	vertical-align: top;
+}
+
+ol.LC_smallMenu li img {
+	vertical-align: bottom;
+}
+
+ol.LC_smallMenu a {
+	font-size: 90%;
+	color: RGB(80, 80, 80);
+	text-decoration: none;
+}
+ol#LC_TabMainMenuContent, ul.LC_TabContent ,
+ul.LC_TabContentBigger {
+	display:block;
+	list-style:none;
+	margin: 0px;
+	padding: 0px;
+}
+
+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);
+	padding: 5px 10px 5px 10px;
+	margin-right:5px;
+	margin-bottom:3px;
+	font-weight: bold;
+	background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+}
+
+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;
+}
+
+ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs {
+	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: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+}
+
+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#LC_MenuBreadcrumbs li a {
+	text-decoration: none;
+	font-size:90%;
+}
+ol#LC_PathBreadcrumbs li a{
+	text-decoration:none;
+	font-size:100%;
+	font-weight:bold;
+}
+.LC_ContentBoxSpecial
+{
+	border: solid 1px $lg_border_color;
+}
+.LC_ContentBoxSpecialContactInfo
+{
+	border: solid 1px $lg_border_color;
+	max-width:25%;
+	min-width:25%;
+}
+.LC_AboutMe_Image
+{
+	float:left;
+	margin-right:10px;
+}
+.LC_Clear_AboutMe_Image
+{
+	clear:left;
+}
+dl.LC_ListStyleClean dt {
+	padding-right: 5px;
+	display: table-header-group;
+}
+
+dl.LC_ListStyleClean dd {
+	display: table-row;
+}
+
+.LC_ListStyleClean,
+.LC_ListStyleSimple,
+.LC_ListStyleNormal,
+.LC_ListStyle_Border,
+.LC_ListStyleSpecial
+	{
+	/*display:block;	*/
+	list-style-position: inside;
+	list-style-type: none;
+	overflow: hidden;
+	padding: 0px;
+}
+
+.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;
+}
+
+.LC_ListStyleClean li,
+.LC_ListStyleClean dd {
+	padding-top: 0px;
+	padding-bottom: 0px;
+}
+
+.LC_ListStyleSimple dd,
+.LC_ListStyleSimple li{
+	border-bottom: solid 1px $lg_border_color;
+}
+
+.LC_ListStyleSpecial li,
+.LC_ListStyleSpecial dd {
+	list-style-type: none;
+	background-color: RGB(220, 220, 220);
+	margin-bottom: 4px;
+}
+
+table.LC_SimpleTable {
+	margin:5px;
+	border:solid 1px $lg_border_color;
+	}
+
+table.LC_SimpleTable tr {
+	padding:0px;
+	border:solid 1px $lg_border_color;
+}
+table.LC_SimpleTable thead{
+	 background:rgb(220,220,220);
+}
+
+div.LC_columnSection {
+	display: block;
+	clear: both;
+	overflow: hidden;
+	margin:0px;
+}
+
+div.LC_columnSection>* {
+	float: left;
+	margin: 10px 20px 10px 0px;
+	overflow:hidden;
+}
+
+.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 {
+	text-align:left;
+	margin : 0 auto;
+	width:65%;
+	padding: 10px;
+	height: auto;
+	background-color:#FFFFFF;
+	border:1px solid #CCCCCC;
+}
+
+
+.LC_loginpage_loginContainer {
+	float:left;
+	width: 182px;
+	border:1px solid #CCCCCC;
+	background-color:$loginbg;
+}
+
+.LC_loginpage_loginContainer h2{
+	margin-top:0;
+	display:block;
+	background:$bgcol;
+	color:$textcol;
+	padding-left:5px;
+}
+.LC_loginpage_loginInfo {
+	margin-left:20px;
+	float:left;
+	width:30%;
+	border:1px solid #CCCCCC;
+	padding:10px;
+}
+
+.LC_loginpage_loginDomain {
+	margin-right:20px;
+	width:20%;
+	float:left;
+	padding:10px;
+}
+
+.LC_loginpage_space {
+	clear: both;
+	margin-bottom: 20px;
+	border-bottom: 1px solid #CCCCCC;
+}
+
+table em{
+	font-weight: bold;
+	font-style: normal;
+}
+table.LC_tableBrowseRes,
+table.LC_tableOfContent{
+        border:none;
+	border-spacing: 1;
+	padding: 3px;
+	background-color: #FFFFFF;
+	font-size: 90%;
+}
+table.LC_tableBrowseRes a,
+table.LC_tableOfContent a {
+        background-color: transparent;
+	text-decoration: none;
+}
+
+table.LC_tableBrowseRes tr.LC_trOdd,
+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;
+}
+
+
 END
 }
 
@@ -5987,8 +6131,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;
 }
@@ -6124,31 +6267,33 @@ sub start_page {
     }
 
     if ($args->{'js_ready'}) {
-	$result = &js_ready($result);
+		$result = &js_ready($result);
     }
     if ($args->{'html_encode'}) {
-	$result = &html_encode($result);
+		$result = &html_encode($result);
     }
-    #Breadcrumbs
+
+	#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);
-            }
-        }
+		&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();
-        }
+		#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()
@@ -6291,7 +6436,7 @@ sub simple_error_page {
     }
 
     sub start_data_table_empty_row {
-	$row_count[0]++;
+#	$row_count[0]++;
 	return  '<tr class="LC_empty_row" >'."\n";;
     }
 
@@ -6373,13 +6518,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';
     }
@@ -6390,37 +6535,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
@@ -6443,7 +6557,7 @@ sub check_user_status {
     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;
@@ -7074,7 +7188,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 .= ' 
@@ -7118,14 +7231,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 />';
                 }
             }
         }
@@ -7162,7 +7273,6 @@ ENDSCRIPT
 
     my $output = <<"END_BLOCK";
 <script type="text/javascript">
-// <![CDATA[
 function validateEntry(callingForm) {
 
     var checkok = 1;
@@ -7231,25 +7341,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;
 }
 
@@ -7481,7 +7594,7 @@ sub get_institutional_codes {
 
 =item * sorted_slots()
 
-Sorts an array of slot names in order of slot start time (earliest first).
+Sorts an array of slot names in order of slot start time (earliest first). 
 
 Inputs:
 
@@ -7523,6 +7636,7 @@ sub sorted_slots {
     return @sorted;
 }
 
+
 =pod
 
 =head1 HTTP Helpers
@@ -7814,9 +7928,9 @@ sub upload_embedded {
                                    '&nbsp;<a href="'.$url.'">'.
                                    $orig_uploaded_filename.'</a><br />';
                     } else {
-                        $output .= '<font size="+2">'.
+                        $output .= '<span class=\"LC_fontsize_large\">'.
                                    &mt('View embedded file: [_1]','<a href="'.$url.'">'.
-                                   $orig_uploaded_filename.'</a>').'</font><br />';
+                                   $orig_uploaded_filename.'</a>').'</span><br />';
                     }
                 }
                 close($fh);
@@ -8121,8 +8235,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());
@@ -8166,7 +8279,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] }))) {
@@ -8820,11 +8933,10 @@ sub restore_settings {
 
 =item * &build_recipient_list()
 
-Build recipient lists for five types of e-mail:
+Build recipient lists for four 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.
+(d) Help requests, generated by
+lonerrorhandler.pm, CHECKRPMS, loncron, and lonsupportreq.pm respectively.
 
 Inputs:
 defmail (scalar - email address of default recipient), 
@@ -8853,7 +8965,7 @@ sub build_recipient_list {
                 my @contacts = ('adminemail','supportemail');
                 foreach my $item (@contacts) {
                     if ($domconfig{'contacts'}{$mailing}{$item}) {
-                        my $addr = $domconfig{'contacts'}{$item};
+                        my $addr = $domconfig{'contacts'}{$item}; 
                         if (!grep(/^\Q$addr\E$/,@recipients)) {
                             push(@recipients,$addr);
                         }
@@ -9133,7 +9245,7 @@ sub assign_categories_table {
                     my $checked = '';
                     if (@currcategories > 0) {
                         if (grep(/^\Q$item\E$/,@currcategories)) {
-                            $checked = ' checked="checked" ';
+                            $checked = ' checked="checked"';
                         }
                     }
                     $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
@@ -9199,7 +9311,7 @@ sub assign_category_rows {
                     if (ref($currcategories) eq 'ARRAY') {
                         if (@{$currcategories} > 0) {
                             if (grep(/^\Q$item\E$/,@{$currcategories})) {
-                                $checked = ' checked="checked" ';
+                                $checked = ' checked="checked"';
                             }
                         }
                     }
@@ -9392,62 +9504,40 @@ sub check_clone {
     my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
     my $clonemsg;
     my $can_clone = 0;
-    my $lctype = lc($args->{'type'});
-    if ($lctype ne 'community') {
-        $lctype = 'course';
-    }
+
     if ($clonehome eq 'no_host') {
-        if ($args->{'type'} 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->{'type'} 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->{'type'} 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;
-                } else {
-                    if ($args->{'type'} 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') {
@@ -9485,9 +9575,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
@@ -9795,22 +9883,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]);
@@ -9870,22 +9948,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) = @_;
@@ -10017,11 +10079,11 @@ sub init_user_environment {
 	}
 
         foreach my $tool ('aboutme','blog','portfolio') {
-            $userenv{'availabletools.'.$tool} =
+            $userenv{'availabletools.'.$tool} = 
                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
         }
 
-        foreach my $crstype ('official','unofficial','community') {
+        foreach my $crstype ('official','unofficial') {
             $userenv{'canrequest.'.$crstype} =
                 &Apache::lonnet::usertools_access($username,$domain,$crstype,
                                                   'reload','requestcourses');
@@ -10039,8 +10101,8 @@ sub init_user_environment {
 	    }
 	    untie(%disk_env);
 	} else {
-	    &Apache::lonnet::logthis("<font color=\"blue\">WARNING: ".
-			   'Could not create environment storage in lonauth: '.$!.'</font>');
+	    &Apache::lonnet::logthis("<span style=\"color:blue;\">WARNING: ".
+			   'Could not create environment storage in lonauth: '.$!.'</span>');
 	    return 'error: '.$!;
 	}
     }