--- loncom/interface/loncommon.pm	2009/05/30 22:03:32	1.835
+++ loncom/interface/loncommon.pm	2010/09/19 18:50:48	1.925.2.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.835 2009/05/30 22:03:32 bisitz Exp $
+# $Id: loncommon.pm,v 1.925.2.13 2010/09/19 18:50:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -482,28 +482,22 @@ ENDAUTHORBRW
 }
 
 sub coursebrowser_javascript {
-    my ($domainfilter,$sec_element,$formname)=@_;
-    my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
-   my $output = '
+    my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;
+    my $wintitle = &mt('Course Browser');
+    if ($crstype ne '') {
+        $wintitle = &mt($crstype);
+    }
+    my $id_functions = &javascript_index_functions();
+    my $output = '
 <script type="text/javascript" language="JavaScript">
 // <![CDATA[
     var stdeditbrowser;'."\n";
-   $output .= <<"ENDSTDBRW";
-    function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
+
+    $output .= <<"ENDSTDBRW";
+    function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,type,type_elem) {
         var url = '/adm/pickcourse?';
-        var domainfilter = '';
         var formid = getFormIdByName(formname);
-        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;
-                }
-            }
-        }
+        var domainfilter = getDomainFromSelectbox(formname,udom);
         if (domainfilter != null) {
            if (domainfilter != '') {
                url += 'domainfilter='+domainfilter+'&';
@@ -529,57 +523,163 @@ sub coursebrowser_javascript {
                 }
             }     
         }
-        if (multflag !=null && multflag != '') {
-            url += '&multiple='+multflag;
+        if (type != null && type != '') {
+            url += '&type='+type;
         }
-        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 (type_elem != null && type_elem != '') {
+            url += '&typeelement='+type_elem;
         }
-        if (crstype !=null && crstype != '') {
-            url += '&type='+crstype;
+        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;
         }
-        var title = 'Course_Browser';
+        if (multflag !=null && multflag != '') {
+            url += '&multiple='+multflag;
+        }
+        var title = '$wintitle';
         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 getFormIdByName(formname) {
-        for (var i=0;i<document.forms.length;i++) {
-            if (document.forms[i].name == formname) {
-                return i;
-            }
+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 -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;
+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;
             }
         }
-        return -1;
     }
-ENDSTDBRW
-    if ($sec_element ne '') {
-        $output .= &setsec_javascript($sec_element,$formname);
+    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+'&';
+       }
     }
-    $output .= '
-// ]]>
-</script>';
-    return $output;
+    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;
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+$id_functions
+ENDUSERBRW
 }
 
 sub setsec_javascript {
-    my ($sec_element,$formname) = @_;
+    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 $setsections = qq|
 function setSect(sectionlist) {
     var sectionsArray = new Array();
@@ -613,19 +713,66 @@ 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)=@_;
+   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.'","'.$selecttype.'");'
-         ."'>".&mt('Select Course').'</a>'
+         .'","'.$multflag.'","'.$type.'","'.$typeelement.'");'
+         ."'>".$linktext.'</a>'
          .'</span>';
 }
 
@@ -635,6 +782,14 @@ 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) {
@@ -1015,7 +1170,7 @@ sub general_help {
     my $helptopic='Student_Intro';
     if ($env{'request.role'}=~/^(ca|au)/) {
 	$helptopic='Authoring_Intro';
-    } elsif ($env{'request.role'}=~/^cc/) {
+    } elsif ($env{'request.role'}=~/^(cc|co)/) {
 	$helptopic='Course_Coordination_Intro';
     } elsif ($env{'request.role'}=~/^dc/) {
         $helptopic='Domain_Coordination_Intro';
@@ -1111,8 +1266,8 @@ sub help_menu_js {
 
     my $template .= <<"ENDTEMPLATE";
 <script type="text/javascript">
-// <!-- BEGIN LON-CAPA Internal
 // <![CDATA[
+// <!-- BEGIN LON-CAPA Internal
 var banner_link = '';
 function helpMenu(target) {
     var caller = this;
@@ -1137,8 +1292,8 @@ function writeHelp(caller) {
     caller.document.close()
     caller.focus()
 }
-// ]]>
 // END LON-CAPA Internal -->
+// ]]>
 </script>
 ENDTEMPLATE
     return $template;
@@ -1722,7 +1877,7 @@ sub select_form {
         $selectform.=
 	    '<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.
             ($key eq $def ? 'selected="selected" ' : '').
-                ">".&mt($hash{$key})."</option>\n";
+                ">".$hash{$key}."</option>\n";
     }
     $selectform.="</select>";
     return $selectform;
@@ -1787,7 +1942,7 @@ sub select_level_form {
 
 =pod
 
-=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$autosubmit)
+=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select the domain to preform an operation in.  
@@ -1798,18 +1953,24 @@ selected");
 
 If the $showdomdesc flag is set, the domain name is followed by the domain description.
 
-If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action.  
+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. 
 
 =cut
 
 #-------------------------------------------
 sub select_dom_form {
-    my ($defdom,$name,$includeempty,$showdomdesc,$autosubmit) = @_;
-    my $onchange;
-    if ($autosubmit) {
-        $onchange = ' onchange="this.form.submit()"';
+    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 @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) {
@@ -1817,7 +1978,16 @@ sub select_dom_form {
             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
         if ($showdomdesc) {
             if ($dom ne '') {
-                my $domdesc = &Apache::lonnet::domain($dom,'description');
+                my $domdesc;
+                if ($name eq 'srchdomain') {
+                    if ($dom eq 'gci') {
+                        $domdesc = 'Faculty';
+                    } else {
+                        $domdesc = 'Students';
+                    }
+                } else {
+                    $domdesc = &Apache::lonnet::domain($dom,'description');
+                }
                 if ($domdesc ne '') {
                     $selectdomain .= ' ('.$domdesc.')';
                 }
@@ -2308,9 +2478,11 @@ sub authform_internal{
     }
     $autharg = '<input type="password" size="10" name="intarg" value="'.
                $intarg.'" onchange="'.$jscall.'" />';
-    $result = &mt
-        ('[_1] Internally authenticated (with initial password [_2])',
-         '<label>'.$authtype,'</label>'.$autharg);
+    my $authtext = '[_1] Internally authenticated (with initial password [_2])';
+    if ($in{'caller'} eq 'requestcrs') {
+        $authtext = "[_1] Students' password, if none in the uploaded file: [_2]";
+    }
+    $result = &mt($authtext,'<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>';
     return $result;
 }
@@ -2862,7 +3034,7 @@ sub messagewrapper {
 sub noteswrapper {
     my ($link,$un,$do)=@_;
     return 
-"<a href='/adm/email?recordftf=retrieve&recname=$un&recdom=$do'>$link</a>";
+"<a href='/adm/email?recordftf=retrieve&amp;recname=$un&amp;recdom=$do'>$link</a>";
 }
 
 # ------------------------------------------------------------- Aboutme Wrapper
@@ -2872,7 +3044,7 @@ sub aboutmewrapper {
     if (!defined($username)  && !defined($domain)) {
         return;
     }
-    return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
+    return '<a href="/adm/'.$domain.'/'.$username.'/aboutme?forcestudent=1"'.
 	($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'</a>';
 }
 
@@ -2886,7 +3058,7 @@ sub syllabuswrapper {
 # -----------------------------------------------------------------------------
 
 sub track_student_link {
-    my ($linktext,$sname,$sdom,$target,$start) = @_;
+    my ($linktext,$sname,$sdom,$target,$start,$only_body) = @_;
     my $link ="/adm/trackstudent?";
     my $title = 'View recent activity';
     if (defined($sname) && $sname !~ /^\s*$/ &&
@@ -2900,6 +3072,7 @@ 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>}.
@@ -3576,6 +3749,7 @@ sub findallcourses {
         if (!%roles) {
             %roles = (
                        cc => 1,
+                       co => 1,
                        in => 1,
                        ep => 1,
                        ta => 1,
@@ -3766,7 +3940,7 @@ sub blockcheck {
                  ($env{'request.role'} !~ m{^st\./\Q$cdom\E/\Q$cnum\E}));
         next if ($no_userblock);
 
-        # Retrieve blocking times and identity of blocker for course
+        # Retrieve blocking times and identity of locker for course
         # of specified user, unless user has 'evb' privilege.
         
         my ($start,$end)=&get_blocks($setters,$activity,$cdom,$cnum);
@@ -3831,103 +4005,51 @@ sub parse_block_record {
     return ($setuname,$setudom,$title,$blocks);
 }
 
-sub build_block_table {
-    my ($startblock,$endblock,$setters) = @_;
-    my %lt = &Apache::lonlocal::texthash(
-        'cacb' => 'Currently active communication blocks',
-        'cour' => 'Course',
-        'dura' => 'Duration',
-        'blse' => 'Block set by'
-    );
-    my $output;
-    $output = '<br />'.$lt{'cacb'}.':<br />';
-    $output .= &start_data_table();
-    $output .= '
-<tr>
- <th>'.$lt{'cour'}.'</th>
- <th>'.$lt{'dura'}.'</th>
- <th>'.$lt{'blse'}.'</th>
-</tr>
-';
-    foreach my $course (keys(%{$setters})) {
-        my %courseinfo=&Apache::lonnet::coursedescription($course);
-        for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
-            my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
-            my $fullname = &plainname($uname,$udom);
-            if (defined($env{'user.name'}) && defined($env{'user.domain'})
-                && $env{'user.name'} ne 'public' 
-                && $env{'user.domain'} ne 'public') {
-                $fullname = &aboutmewrapper($fullname,$uname,$udom);
-            }
-            my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
-            $openblock = &Apache::lonlocal::locallocaltime($openblock);
-            $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
-            $output .= &Apache::loncommon::start_data_table_row().
-                       '<td>'.$courseinfo{'description'}.'</td>'.
-                       '<td>'.$openblock.' to '.$closeblock.'</td>'.
-                       '<td>'.$fullname.'</td>'.
-                        &Apache::loncommon::end_data_table_row();
-        }
-    }
-    $output .= &end_data_table();
-}
-
 sub blocking_status {
-    my ($activity,$uname,$udom) = @_;
-    my %setters;
-    my ($blocked,$output,$ownitem,$is_course);
-    my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
-    if ($startblock && $endblock) {
-        $blocked = 1;
-        if (wantarray) {
-            my $category;
-            if ($activity eq 'boards') {
-                $category = 'Discussion posts in this course';
-            } elsif ($activity eq 'blogs') {
-                $category = 'Blogs';
-            } elsif ($activity eq 'port') {
-                if (defined($uname) && defined($udom)) {
-                    if ($uname eq $env{'user.name'} &&
-                        $udom eq $env{'user.domain'}) {
-                        $ownitem = 1;
-                    }
-                }
-                $is_course = &Apache::lonnet::is_course($udom,$uname);
-                if ($ownitem) { 
-                    $category = 'Your portfolio files';  
-                } elsif ($is_course) {
-                    my $coursedesc;
-                    foreach my $course (keys(%setters)) {
-                        my %courseinfo =
-                             &Apache::lonnet::coursedescription($course);
-                        $coursedesc = $courseinfo{'description'};
-                    }
-                    $category = "Group portfolio in the course '$coursedesc'";
-                } else {
-                    $category = 'Portfolio files belonging to ';
-                    if ($env{'user.name'} eq 'public' && 
-                        $env{'user.domain'} eq 'public') {
-                        $category .= &plainname($uname,$udom);
-                    } else {
-                        $category .= &aboutmewrapper(&plainname($uname,$udom),$uname,$udom);  
-                    }
-                }
-            } elsif ($activity eq 'groups') {
-                $category = 'Groups in this course';
-            }
-            my $showstart = &Apache::lonlocal::locallocaltime($startblock);
-            my $showend = &Apache::lonlocal::locallocaltime($endblock);
-            $output = '<br />'.&mt('[_1] will be inaccessible between [_2] and [_3] because communication is being blocked.',$category,$showstart,$showend).'<br />';
-            if (!($activity eq 'port' && !($ownitem) && !($is_course))) { 
-                $output .= &build_block_table($startblock,$endblock,\%setters);
-            }
-        }
-    }
-    if (wantarray) {
-        return ($blocked,$output);
-    } else {
-        return $blocked;
-    }
+  my ($activity,$uname,$udom) = @_;
+  my %setters;
+
+  # check for active blocking
+  my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
+
+  my $blocked = $startblock && $endblock ? 1 : 0;
+
+  # caller just wants to know whether a block is active
+  if (!wantarray) { return $blocked; }
+
+  # build a link to a popup window containing the details
+  my $querystring  = "?activity=$activity";
+  # $uname and $udom decide whose portfolio the user is trying to look at
+     $querystring .= "&amp;udom=$udom"      if $udom;
+     $querystring .= "&amp;uname=$uname"    if $uname;
+
+  my $output .= <<'END_MYBLOCK';
+    function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
+        var options = "width=" + w + ",height=" + h + ",";
+        options += "resizable=yes,scrollbars="+scrollbar+",status=no,";
+        options += "menubar=no,toolbar="+toolbar+",location=no,directories=no";
+        var newWin = window.open(url, wdwName, options);
+        newWin.focus();
+    }
+END_MYBLOCK
+
+  $output = Apache::lonhtmlcommon::scripttag($output);
+  
+  my $popupUrl = "/adm/blockingstatus/$querystring";
+  my $text = mt('Communication Blocked');
+
+  $output .= <<"END_BLOCK";
+<div class='LC_comblock'>
+  <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
+  title='$text'>
+  <img class='LC_noBorder LC_middle' title='$text' src='/res/adm/pages/comblock.png' alt='$text'/></a>
+  <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring' 
+  title='$text'>$text</a>
+</div>
+
+END_BLOCK
+
+  return ($blocked, $output);
 }
 
 ###############################################
@@ -4005,7 +4127,7 @@ sub determinedomain {
     my $domain=shift;
     if (! $domain) {
         # Determine domain if we have not been given one
-        $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+        $domain = &Apache::lonnet::default_login_domain();
         if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
         if ($env{'request.role.domain'}) { 
             $domain=$env{'request.role.domain'}; 
@@ -4223,7 +4345,7 @@ Returns: HTML div with $content
 sub head_subbox {
     my ($content)=@_;
     my $output =
-        '<div id="LC_head_subbox2">' #FIXME: solve conflicts with lonhtmlcommon:breadcrumbs LC_head_subbox
+        '<div id="LC_head_subbox">'
        .$content
        .'</div>'
 }
@@ -4256,18 +4378,30 @@ sub CSTR_pageheader {
     } else {
         $lastitem = $thisdisfn;
     }
-    return
+
+    my $output =
          '<div>'
         .&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
         .'<b>'.&mt('Construction Space:').'</b> '
         .'<form name="dirs" method="post" action="'.$formaction
-        .'" target="_top"><tt><b>' #FIXME lonpubdir: target="_parent"
-        .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."$lastitem</b></tt><br />"
+        .'" target="_top">' #FIXME lonpubdir: target="_parent"
+        .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv',undef,undef);
+
+    if ($lastitem) {
+        $output .=
+             '<span class="LC_filename">'
+            .$lastitem
+            .'</span>';
+    }
+    $output .=
+         '<br />'
         #FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />"
         .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
         .'</form>'
         .&Apache::lonmenu::constspaceform()
         .'</div>';
+
+    return $output;
 }
 
 ###############################################
@@ -4344,6 +4478,10 @@ sub bodytag {
 		   'link'    => &designparm($function.'.link',$domain),);
     @design{keys(%$addentries)} = @$addentries{keys(%$addentries)}; 
 
+    my $custommenu;
+    if ($env{'environment.remote'} eq 'off') {
+        $custommenu = &needs_gci_custom();
+    }
  # role and realm
     my ($role,$realm) = split(/\./,$env{'request.role'},2);
     if ($role  eq 'ca') {
@@ -4353,11 +4491,22 @@ sub bodytag {
 # realm
     if ($env{'request.course.id'}) {
         if ($env{'request.role'} !~ /^cr/) {
-            $role = &Apache::lonnet::plaintext($role,&course_type());
+            if (($custommenu) && ($role eq 'cm')) {
+                undef($role);
+            } else {
+                $role = &Apache::lonnet::plaintext($role,&course_type());
+            }
         }
+        if ($env{'request.course.sec'}) {
+            $role .= ('&nbsp;'x2).'-&nbsp;'.&mt('section:').'&nbsp;'.$env{'request.course.sec'};
+        }   
 	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
     } else {
-        $role = &Apache::lonnet::plaintext($role);
+        if (($custommenu) && ($role eq 'cm')) {
+            undef($role);
+        } else {
+            $role = &Apache::lonnet::plaintext($role);
+        }
     }
 
     if (!$realm) { $realm='&nbsp;'; }
@@ -4381,21 +4530,6 @@ sub bodytag {
 	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
     }
     
-    my $roleinfo=(<<ENDROLE);
-<td class="LC_title_bar_who">
-<div class="LC_title_bar_name">
-    $name
-    &nbsp;
-</div>
-<div class="LC_title_bar_role">
-$role&nbsp;
-</div>
-<div class="LC_title_bar_realm">
-$realm&nbsp;
-</div>
-</td>
-ENDROLE
-
     my $titleinfo = '<h1>'.$title.'</h1>';
     #
     # Extra info if you are the DC
@@ -4404,38 +4538,83 @@ ENDROLE
                         $env{'course.'.$env{'request.course.id'}.
                                  '.domain'}.'/'})) {
         my $cid = $env{'request.course.id'};
-        $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
+        $dc_info = $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
         $dc_info =~ s/\s+$//;
-        $dc_info = '('.$dc_info.')';
     }
 
-    if (($env{'environment.remote'} eq 'off') || ($args->{'suppress_header_logos'})) {
-        # No Remote
-	if ($env{'request.state'} eq 'construct') {
-	    $forcereg=1;
-	}
+    $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
+    &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
 
-    if ($env{'request.state'} eq 'construct') {
-        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
-    }
+    if ($env{'environment.remote'} eq 'off') {
+        # No Remote
+        if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { 
+            return $bodytag; 
+        } 
 
-        my $titletable = '<table id="LC_title_bar">'
-                        ."<tr><td> $titleinfo $dc_info</td>".$roleinfo
-                        .'</tr></table>';
+        if ($env{'request.state'} eq 'construct') { $forcereg=1; }
 
-	if ($no_nav_bar) {
-	    $bodytag .= $titletable;
-	} else {
-        $bodytag .= qq|<div id="LC_nav_bar">$name ($role)<br />
-            <em>$realm</em> $dc_info</div>|;
-	    if ($env{'request.state'} eq 'construct') {
-                $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
-							  $titletable);
-            } else {
-                $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg).
-		    $titletable;
-            }
+        #    if ($env{'request.state'} eq 'construct') {
+        #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
+        #    }
+
+        my $role_selector;
+        if (($custommenu) && ($env{'request.course.id'}) && 
+            ($env{'course.'.$env{'request.course.id'}.'.domain'} eq 'gcitest') &&
+            ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) {
+            $role_selector = &Apache::lonmenu::roles_selector(
+                        $env{'course.' . $env{'request.course.id'} . '.domain'},
+                        $env{'course.' . $env{'request.course.id'} . '.num'}  );
+            if ($role_selector) {
+                $role_selector = '<br />'.$role_selector;
+            }
+        }
+
+        if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
+             if ($dc_info) {
+                 $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
+             }
+             $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
+                <em>$realm</em> $dc_info</div>|;
+            return $bodytag;
+        }
+
+        $bodytag .= qq|<div id="LC_nav_bar">$name $role $role_selector</div>|;
+
+        $bodytag .= Apache::lonhtmlcommon::scripttag(
+            Apache::lonmenu::utilityfunctions('',$custommenu), 'start');
+
+        $bodytag .= Apache::lonmenu::primary_menu();
+
+        if ($dc_info) {
+            $dc_info = &dc_courseid_toggle($dc_info);
+        }
+        $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
+
+        #don't show menus for public users
+        if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
+            if (($custommenu) && 
+                ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) {
+                $bodytag .= &Apache::lonmenu::gci_secondary_menu();
+            } else { 
+                $bodytag .= Apache::lonmenu::secondary_menu();
+            }
+            $bodytag .= Apache::lonmenu::serverform();
+            $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
+            if ($env{'request.state'} eq 'construct') {
+                $bodytag .= &Apache::lonmenu::innerregister($forcereg,'',
+                                $args->{'bread_crumbs'});
+            } elsif ($forcereg) { 
+                $bodytag .= &Apache::lonmenu::innerregister($forcereg);
+            }
+        }else{
+            # this is to seperate menu from content when there's no secondary
+            # menu. Especially needed for public accessible ressources.
+            $bodytag .= '<hr style="clear:both" />';
+            $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); 
         }
+
+        #SD testing
+        #$bodytag .= Apache::lonmenu::menubuttons($forcereg);
         return $bodytag;
     }
 
@@ -4451,8 +4630,16 @@ ENDROLE
 
     # Explicit link to get inline menu
     my $menu= ($no_inline_link?''
-	       :'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
-    #
+	       :'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');
+
+    if ($dc_info) {
+        $dc_info = qq|<span class="LC_cusr_subheading">($dc_info)</span>|;
+    }
+
+    $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>
+            <ol class="LC_primary_menu LC_right">
+                <li>$menu</li>
+            </ol><div id="LC_realm"> $realm $dc_info</div>| unless $env{'form.inhibitmenu'};
     return(<<ENDBODY);
 $bodytag
 <table id="LC_title_bar" class="LC_with_remote">
@@ -4460,12 +4647,19 @@ $bodytag
     <td>$messages&nbsp;</td>
 </tr>
 <tr><td>$titleinfo $dc_info $menu</td>
-$roleinfo
 </tr>
 </table>
 ENDBODY
 }
 
+sub dc_courseid_toggle {
+    my ($dc_info) = @_;
+    return ' <span id="dccidtext" class="LC_cusr_subheading">'.
+           '<a href="javascript:showCourseID();">'.
+           &mt('(More ...)').'</a></span>'.
+           '<div id="dccid" class="LC_dccid">'.$dc_info.'</div>';
+}
+
 sub make_attr_string {
     my ($register,$attr_ref) = @_;
 
@@ -4582,9 +4776,9 @@ sub standard_css {
 
     my $sans                 = 'Verdana,Arial,Helvetica,sans-serif';
     my $mono                 = 'monospace';
-    my $data_table_head      = $tabbg;
-    my $data_table_light     = '#EEEEEE';
-    my $data_table_dark      = '#DDDDDD';
+    my $data_table_head      = $sidebg;
+    my $data_table_light     = '#FAFAFA';
+    my $data_table_dark      = '#F0F0F0';
     my $data_table_darker    = '#CCCCCC';
     my $data_table_highlight = '#FFFF00';
     my $mail_new             = '#FFBB77';
@@ -4597,49 +4791,48 @@ 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'     ) ? '0 2px 0 2px'
+                                             : '0 3px 0 4px';
 
 
     return <<END;
 body {
-   font-family: $sans;
-   line-height:130%;
-   font-size:0.83em;
-   color:$font;
+  font-family: $sans;
+  line-height:130%;
+  font-size:0.83em;
+  color:$font;
 }
 
-a:link, a:visited { 
-  font-size:100%; 
-}
-
-a:focus { 
+a:focus {
   color: red;
-  background: yellow 
+  background: yellow;
 }
 
-form, .inline { 
-   display: inline; 
+form, .inline {
+  display: inline;
 }
 
 .LC_right {
-   text-align:right;
+  text-align:right;
 }
 
 .LC_middle {
-   vertical-align:middle;
+  vertical-align:middle;
 }
 
 /* just for tests */
-.LC_400Box {width:400px; }
+.LC_400Box {
+  width:400px;
+}
 /* end */
 
 .LC_filename {
   font-family: $mono;
   white-space:pre;
+  font-size: 120%;
 }
 
 .LC_fileicon {
@@ -4694,35 +4887,35 @@ div.LC_confirm_box .LC_success img {
 }
 
 .LC_discussion {
-   background: $tabbg;
-   border: 1px solid black;
-   margin: 2px;
+  background: $tabbg;
+  border: 1px solid black;
+  margin: 2px;
 }
 
 .LC_disc_action_links_bar {
-   background: $tabbg;
-   border: none;
-   margin: 4px;
+  background: $tabbg;
+  border: none;
+  margin: 4px;
 }
 
 .LC_disc_action_left {
-   text-align: left;
+  text-align: left;
 }
 
 .LC_disc_action_right {
-   text-align: right;
+  text-align: right;
 }
 
 .LC_disc_new_item {
-   background: white;
-   border: 2px solid red;
-   margin: 2px;
+  background: white;
+  border: 2px solid red;
+  margin: 2px;
 }
 
 .LC_disc_old_item {
-   background: white;
-   border: 1px solid black;
-   margin: 2px;
+  background: white;
+  border: 1px solid black;
+  margin: 2px;
 }
 
 table.LC_pastsubmission {
@@ -4730,9 +4923,7 @@ table.LC_pastsubmission {
   margin: 2px;
 }
 
-table#LC_top_nav,
-table#LC_menubuttons,
-table#LC_nav_location {
+table#LC_menubuttons {
   width: 100%;
   background: $pgbg;
   border: 2px;
@@ -4743,10 +4934,10 @@ table#LC_nav_location {
 table#LC_title_bar a {
   color: $fontmenu;
 }
-    
+
 table#LC_title_bar {
   clear: both;
-  /*display: none;*/
+  display: none;
 }
 
 table#LC_title_bar,
@@ -4763,128 +4954,121 @@ table#LC_title_bar.LC_with_remote {
   margin: 0;
 }
 
-table.LC_docs_path {
-  width: 100%;
-  border: 0;
-  background: $pgbg;
-  border-collapse: collapse;
-  padding: 0;
+dl.LC_GCI_Menu {
+    width:300px;
+    float:left;
+    margin-right:2em;
 }
 
-table#LC_title_bar td {
-  background: $tabbg;
+dl.LC_GCI_Menu dt {
+    font-weight: bold;
+    font-size:0.9em;
+    margin-bottom:0.7em;
 }
 
-table#LC_title_bar .LC_title_bar_who {
-  background: $tabbg;
-  color: $fontmenu;
-  font: small;
-  text-align: right;
-  margin: 0;
+dl.LC_GCI_Menu dd {
+    font-size:0.8em;
+    margin:0 0 2em 0;
+    padding-left:4.5em;
+    line-height:1.5em;
+    background:none no-repeat left top;
 }
 
-table#LC_title_bar div.LC_title_bar_name {
-  margin: 0;
-}
+/* #SD START (work in progress)*/
 
-table#LC_title_bar div.LC_title_bar_role {
-  margin: 0;
+ul.LC_bct {
+    margin: 0;
+    padding: 0;
 }
-
-table#LC_title_bar div.LC_title_bar_realm {
-  margin: 0;
+ul.LC_bct ol {
+    display: inline;
 }
-
-table#LC_menubuttons img{
-  border: none;
+ul.LC_bct ul {
+    display: inline;
+    padding: 0;
 }
-
-table#LC_top_nav td {
-  background: $tabbg;
-  border: none;
-  font-size: small;
-  vertical-align:top;
-  padding:2px 5px 2px 5px;
+ul.LC_bct li {
+    list-style-type: none;
+    display: inline;
 }
 
-table#LC_top_nav td a,
-div#LC_top_nav a {
-  color: $font;
-}
 
-table#LC_top_nav td.LC_top_nav_logo {
-  background: $tabbg;
-  text-align: left;
-  white-space: nowrap;
-  width: 31px;
+ul.LC_breadcrumb_tools {
 }
 
-table#LC_top_nav td.LC_top_nav_logo img {
-  border: none;
-  vertical-align: bottom;
+li.LC_breadcrumb_tools {
 }
-
-table#LC_top_nav td.LC_top_nav_exit,
-table#LC_top_nav td.LC_top_nav_help {
-  width: 2.0em;
+li.LC_breadcrumb_tools img{
+    vertical-align: middle;
 }
 
-table#LC_top_nav td.LC_top_nav_login {
-  width: 4.0em;
-  text-align: center;
+.LC_breadcrumb_tools_A {
+    margin: 0 0 0 1em;
+}
+.LC_breadcrumb_tools_B {
+    float: right;
+    margin-top: 0.4em;
+}
+.LC_breadcrumb_tools_C {
+    margin: 0 1em 0 0;
+    float: right;
 }
+/* #SD END */
 
-table.LC_breadcrumbs td,
-table.LC_docs_path td  {
+table#LC_title_bar td {
   background: $tabbg;
-  color: $fontmenu;
-  font-size: smaller;
 }
 
-table.LC_breadcrumbs td.LC_breadcrumbs_component,
-table.LC_docs_path td.LC_docs_path_component {
-  background: $tabbg;
-  color: $fontmenu;
-  font-size: larger;
-  text-align: right;
+table#LC_menubuttons img {
+  border: none;
+}
+
+.LC_breadcrumbs_component {
+  float: right;
+  margin: 0 1em;
+}
+.LC_breadcrumbs_component img {
+  vertical-align: middle;
 }
 
 td.LC_table_cell_checkbox {
   text-align: center;
 }
 
-table#LC_mainmenu td.LC_mainmenu_column {
-    vertical-align: top;
+.LC_fontsize_small {
+  font-size: 70%;
 }
 
-.LC_fontsize_small {
- font-size: 70%;
+#LC_breadcrumbs {
+  clear:both;
+  background: $sidebg;
+  border-bottom: 1px solid $lg_border_color;
+  line-height: 2.5em;
+     /* SD working here 
+     height: 2.5em;
+     overflow: hidden; */
+  margin: 0;
+  padding: 0;
 }
 
-#LC_head_subbox {
- clear:both;
- background: $sidebg;
- border-bottom: 1px solid $lg_border_color;
- height: 32px;
- line-height: 32px; 
- margin: 0;
- padding: 0;
+/* Preliminary fix to hide breadcrumbs inside remote control window */
+#LC_remote #LC_breadcrumbs {
+  display:none;
 }
 
-#LC_head_subbox2 { /* FIXME: replace by LC_head_subbox once lonhtmlcommon::breadcrumbs has been fixed */
- clear:both;
- background: #F8F8F8; /* $sidebg; */
- border-bottom: 1px solid $lg_border_color;
- margin: 0 0 10px 0;
- padding: 5px;
+#LC_head_subbox {
+  clear:both;
+  background: #F8F8F8; /* $sidebg; */
+  border: 1px solid $sidebg;
+  margin: 0 0 10px 0;      
 }
 
 .LC_fontsize_medium {
- font-size: 85%;
+  font-size: 85%;
 }
 
 .LC_fontsize_large {
- font-size: 120%;
+  font-size: 120%;
 }
 
 .LC_menubuttons_inline_text {
@@ -4905,26 +5089,13 @@ table#LC_mainmenu td.LC_mainmenu_column
 }
 
 td.LC_menubuttons_text {
- 	color: $font;
+  color: $font;
 }
 
 .LC_current_location {
   background: $tabbg;
 }
 
-.LC_new_mail {
-  background: $tabbg;
-  font-weight: bold;
-}
-
-.LC_roleslog_note {
-  font-size: small;
-}
-
-.LC_mail_functions {
-    font-weight: bold;
-}
-
 table.LC_data_table,
 table.LC_mail_list {
   border: 1px solid #000000;
@@ -4944,6 +5115,7 @@ table.LC_nested_outer {
   width: 100%;
 }
 
+table.LC_innerpickbox,
 table.LC_nested {
   border: none;
   border-collapse: collapse;
@@ -4951,32 +5123,48 @@ table.LC_nested {
   width: 100%;
 }
 
-table.LC_data_table tr th, 
-table.LC_calendar tr th, 
+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_prior_tries tr th,
+table.LC_innerpickbox tr th {
   font-weight: bold;
   background-color: $data_table_head;
   color:$fontmenu;
   font-size:90%;
 }
 
+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_data_table tr.LC_odd_row > td {
+  background-color: $data_table_light;
+  padding: 2px;
+  vertical-align: top;
+}
+
 table.LC_pick_box tr > td.LC_odd_row {
   background-color: $data_table_light;
+  vertical-align: top;
+}
+
+table.LC_data_table tr.LC_even_row > td {
+  background-color: $data_table_dark;
   padding: 2px;
+  vertical-align: top;
 }
 
-table.LC_data_table tr.LC_even_row > td,
 table.LC_pick_box tr > td.LC_even_row {
   background-color: $data_table_dark;
-  padding: 2px;
+  vertical-align: top;
 }
 
 table.LC_data_table tr.LC_data_table_highlight td {
@@ -4997,6 +5185,9 @@ table.LC_nested tr.LC_empty_row td {
   padding: 8px;
 }
 
+table.LC_caption {
+}
+
 table.LC_nested tr.LC_empty_row td {
   padding: 4ex
 }
@@ -5061,6 +5252,7 @@ table.LC_createuser tr.LC_info_row td  {
 table.LC_calendar {
   border: 1px solid #000000;
   border-collapse: collapse;
+  width: 98%;
 }
 
 table.LC_calendar_pickdate {
@@ -5070,6 +5262,7 @@ table.LC_calendar_pickdate {
 table.LC_calendar tr td {
   border: 1px solid #000000;
   vertical-align: top;
+  width: 14%;
 }
 
 table.LC_calendar tr td.LC_calendar_day_empty {
@@ -5088,12 +5281,6 @@ 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;
 }
@@ -5120,7 +5307,7 @@ table.LC_mail_list tr.LC_mail_other:hove
 
 table.LC_data_table tr > td.LC_browser_file,
 table.LC_data_table tr > td.LC_browser_file_published {
-  background: #CCFF88;
+  background: #AAEE77;
 }
 
 table.LC_data_table tr > td.LC_browser_file_locked,
@@ -5129,20 +5316,20 @@ table.LC_data_table tr > td.LC_browser_f
 }
 
 table.LC_data_table tr > td.LC_browser_file_obsolete {
-  background: #AAAAAA;
+  background: #888888;
 }
 
 table.LC_data_table tr > td.LC_browser_file_modified,
 table.LC_data_table tr > td.LC_browser_file_metamodified {
-  background: #FFFF77;
+  background: #F8F866;
 }
 
 table.LC_data_table tr.LC_browser_folder > td {
-  background: #CCCCFF;
+  background: #E0E8FF;
 }
 
 table.LC_data_table tr > td.LC_roles_is {
-/*  background: #77FF77; */
+  /* background: #77FF77; */
 }
 
 table.LC_data_table tr > td.LC_roles_future {
@@ -5190,7 +5377,8 @@ span.LC_parm_part {
   color: blue;
 }
 
-span.LC_parm_folder, span.LC_parm_symb {
+span.LC_parm_folder,
+span.LC_parm_symb {
   font-size: x-small;
   font-family: $mono;
   color: #AAAAAA;
@@ -5226,7 +5414,6 @@ table#LC_helpmenu {
 
 table#LC_helpmenu fieldset legend {
   font-size: larger;
-  font-weight: bold;
 }
 
 table#LC_helpmenu_links {
@@ -5279,22 +5466,14 @@ table.LC_pick_box {
 }
 
 table.LC_pick_box td.LC_pick_box_title {
-  background: $tabbg;
+  background: $sidebg;
   font-weight: bold;
-  text-align: right;
+  text-align: left;
   vertical-align: top;
   width: 184px;
   padding: 8px;
 }
 
-table.LC_pick_box td.LC_selfenroll_pick_box_title {
-  background: $tabbg;
-  font-weight: bold;
-  text-align: right;
-  width: 350px;
-  padding: 8px;
-}
-
 table.LC_pick_box td.LC_pick_box_value {
   text-align: left;
   padding: 8px;
@@ -5327,40 +5506,6 @@ table.LC_pick_box td.LC_oddrow_value {
   background-color: $data_table_light;
 }
 
-table.LC_helpform_receipt {
-  width: 620px;
-  border-collapse: separate;
-  background: white;
-  border: 1px solid black;
-  border-spacing: 1px;
-}
-
-table.LC_helpform_receipt td.LC_pick_box_title {
-  background: $tabbg;
-  font-weight: bold;
-  text-align: right;
-  width: 184px;
-  padding: 8px;
-}
-
-table.LC_helpform_receipt td.LC_evenrow_value {
-  text-align: left;
-  padding: 8px;
-  background-color: $data_table_light;
-}
-
-table.LC_helpform_receipt td.LC_oddrow_value {
-  text-align: left;
-  padding: 8px;
-  background-color: $data_table_light;
-}
-
-table.LC_helpform_receipt td.LC_pick_box_separator {
-  padding: 0;
-  height: 1px;
-  background: black;
-}
-
 span.LC_helpform_receipt_cat {
   font-weight: bold;
 }
@@ -5415,15 +5560,17 @@ table.LC_notify_front_page td {
 
 .LC_topic_bar {
   font-weight: bold;
-  width: 100%;
   background: $tabbg;
-  vertical-align: middle;
-  margin: 2ex 0ex 2ex 0ex;
+  margin: 1em 0em 1em 2em;
   padding: 3px;
+  font-size: 1.2em;
 }
 
 .LC_topic_bar span {
+  left: 0.5em;
+  position: absolute;
   vertical-align: middle;
+  font-size: 1.2em;
 }
 
 .LC_topic_bar img {
@@ -5453,19 +5600,34 @@ div.LC_feedback_link {
 
 div.LC_feedback_link img {
   height: 22px;
+  vertical-align:middle;
 }
 
-div.LC_feedback_link a{
+div.LC_feedback_link a {
   text-decoration: none;
 }
 
+div.LC_comblock {
+  display:inline;
+  color:$font;
+  font-size:90%;
+}
+
+div.LC_feedback_link div.LC_comblock {
+  padding-left:5px;
+}
+
+div.LC_feedback_link div.LC_comblock a {
+  color:$font;
+}
+
 span.LC_feedback_link {
-  //background: $feedback_link_bg;
+  /* background: $feedback_link_bg; */
   font-size: larger;
 }
 
 span.LC_message_link {
-  //background: $feedback_link_bg;
+  /* background: $feedback_link_bg; */
   font-size: larger;
   position: absolute;
   right: 1em;
@@ -5524,12 +5686,12 @@ span.LC_prior_string,
 span.LC_prior_custom,
 span.LC_prior_reaction,
 span.LC_prior_math {
-  font-family: monospace;
+  font-family: $mono;
   white-space: pre;
 }
 
 span.LC_prior_string {
-  font-family: monospace;
+  font-family: $mono;
   white-space: pre;
 }
 
@@ -5538,7 +5700,7 @@ table.LC_prior_option {
   border-collapse: collapse;
 }
 
-table.LC_prior_rank, 
+table.LC_prior_rank,
 table.LC_prior_match {
   border-collapse: collapse;
 }
@@ -5549,8 +5711,7 @@ table.LC_prior_match tr td {
   border: 1px solid #000000;
 }
 
-td.LC_nobreak,
-span.LC_nobreak {
+.LC_nobreak {
   white-space: nowrap;
 }
 
@@ -5563,32 +5724,24 @@ span.LC_cusr_subheading {
   font-size: 85%;
 }
 
-table.LC_docs_documents {
-  background: #BBBBBB;
-  border-width: 0;
-  border-collapse: collapse;
-}
-
-table.LC_docs_documents td.LC_docs_document {
-  border: 2px solid black;
-  padding: 4px;
-}
-
-.LC_docs_entry_move {
-  border: none;
-  border-collapse: collapse;
-}
-
-.LC_docs_entry_move td {
-  border: 2px solid #BBBBBB;
+div.LC_docs_entry_move {
+  border: 1px solid #BBBBBB;
   background: #DDDDDD;
+  width: 22px;
+  padding: 1px;
+  margin: 0;
 }
 
-.LC_docs_editor td.LC_docs_entry_commands {
+table.LC_data_table tr > td.LC_docs_entry_commands,
+table.LC_data_table tr > td.LC_docs_entry_parameter {
   background: #DDDDDD;
   font-size: x-small;
 }
 
+.LC_docs_entry_parameter {
+  white-space: nowrap;
+}
+
 .LC_docs_copy {
   color: #000099;
 }
@@ -5610,17 +5763,6 @@ table.LC_docs_documents td.LC_docs_docum
   font-size: x-small;
 }
 
-.LC_docs_editor td.LC_docs_entry_title,
-.LC_docs_editor td.LC_docs_entry_icon {
-  background: #FFFFBB;
-}
-
-.LC_docs_editor td.LC_docs_entry_parameter {
-  background: #BBBBFF;
-  font-size: x-small;
-  white-space: nowrap;
-}
-
 table.LC_docs_adddocs td,
 table.LC_docs_adddocs th {
   border: 1px solid #BBBBBB;
@@ -5657,10 +5799,6 @@ table.LC_double_column tr td.LC_right_co
   vertical-align: top;
 }
 
-span.LC_role_level {
-  font-weight: bold;
-}
-
 div.LC_left_float {
   float: left;
   padding-right: 5%;
@@ -5781,38 +5919,24 @@ div.LC_edit_problem_saves {
   padding-bottom: 5px;
 }
 
-hr.LC_edit_problem_divide {
-  clear: both;
-  color: $tabbg;
-  background-color: $tabbg;
-  height: 3px;
-  border: none;
-}
-
-img.stift{
+img.stift {
   border-width: 0;
   vertical-align: middle;
 }
 
-table#LC_mainmenu{
- margin-top:10px;
- width:80%;
-}
-
-table#LC_mainmenu td.LC_mainmenu_col_fieldset{
+table td.LC_mainmenu_col_fieldset {
   vertical-align: top;
-  width: 45%;
 }
 
-.LC_mainmenu_fieldset_category {
-  color: $font;
-  background: $pgbg;
-  font-size: small;
-  font-weight: bold;
+div.LC_createcourse {
+  margin: 10px 10px 10px 10px;
 }
 
-div.LC_createcourse {
-    margin: 10px 10px 10px 10px;
+.LC_dccid {
+  margin: 0.2em 0 0 0;
+  padding: 0;
+  font-size: 90%;
+  display:none;
 }
 
 /* ---- Remove when done ----
@@ -5823,257 +5947,310 @@ div.LC_createcourse {
 # --------------------------*/
 
 a:hover,
-ol.LC_smallMenu a:hover,
+ol.LC_primary_menu a:hover,
 ol#LC_MenuBreadcrumbs a:hover,
 ol#LC_PathBreadcrumbs a:hover,
-ul#LC_TabMainMenuContent a:hover,
+ul#LC_secondary_menu a:hover,
 .LC_FormSectionClearButton input:hover
 ul.LC_TabContent   li:hover a {
-	color:#BF2317;
-        text-decoration:none;
+  color:#BF2317;
+  text-decoration:none;
 }
 
 h1 {
-	padding: 0;
-	line-height:130%;
+  padding: 0;
+  line-height:130%;
 }
 
-h2,h3,h4,h5,h6 {
-	margin: 5px 0 5px 0;
-	padding: 0;
-	line-height:130%;
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 5px 0 5px 0;
+  padding: 0;
+  line-height:130%;
 }
 
 .LC_hcell {
-        padding:3px 15px 3px 15px;
-        margin: 0;
-	background-color:$tabbg;
-	color:$fontmenu;
-	border-bottom:solid 1px $lg_border_color;
+  padding:3px 15px 3px 15px;
+  margin: 0;
+  background-color:$tabbg;
+  color:$fontmenu;
+  border-bottom:solid 1px $lg_border_color;
 }
 
-.LC_ContentBoxSpecial > .LC_hcell {
-    margin: 0 -10px 10px -10px;
+.LC_Box > .LC_hcell {
+  margin: 0 -10px 10px -10px;
 }
 
 .LC_noBorder {
-        border: 0;
-}
-
-
-/* Main Header with discription of Person, Course, etc. */
-
-.LC_Right {
-        float: right;
-        margin: 0;
-        padding: 0;
+  border: 0;
 }
 
 .LC_FormSectionClearButton input {
-        background-color:transparent;
-        border: none;
-        cursor:pointer;
-        text-decoration:underline;
+  background-color:transparent;
+  border: none;
+  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;
-/*		vertical-align: middle; */
+  color: #FFFFFF;
+  background-color: #EEEEFF;
+  margin: 1px;
+  padding: 4px;
+  border: 1px solid #000033;
+  white-space: nowrap;
+  /* vertical-align: middle; */
 }
 
-dl,ul,div,fieldset {
-	margin: 10px 10px 10px 0;
-/*	overflow: hidden; */
+dl,
+ul,
+div,
+fieldset {
+  margin: 10px 10px 10px 0;
+  /* overflow: hidden; */
+}
+
+fieldset > legend {
+  font-weight: bold;
+  padding: 0 5px 0 5px;
 }
 
 #LC_nav_bar {
-    float: left;
-    margin: 0;
+  float: left;
+  margin: 0.2em 0 0 0;
 }
 
-#LC_nav_bar em{
-    font-weight: bold;
-    font-style: normal;
+#LC_realm {
+  margin: 0.2em 0 0 0;
+  padding: 0;
+  font-weight: bold;
+  text-align: center;
 }
 
-ol.LC_smallMenu {
-    float: right;
+#LC_nav_bar em {
+  font-weight: bold;
+  font-style: normal;
 }
 
-ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
-	margin: 0;
+ol.LC_primary_menu {
+  float: right;
+  margin: 0.2em 0 0 0;
 }
 
-ol.LC_smallMenu li {
-	display: inline;
-	padding: 5px 5px 0 10px;
-	vertical-align: top;
+ol#LC_PathBreadcrumbs {
+  margin: 0;
 }
 
-ol.LC_smallMenu li img {
-	vertical-align: bottom;
+ol.LC_primary_menu li {
+  display: inline;
+  padding: 5px 5px 0 10px;
+  vertical-align: top;
 }
 
-ol.LC_smallMenu a {
-	font-size: 90%;
-	color: RGB(80, 80, 80);
-	text-decoration: none;
+ol.LC_primary_menu li img {
+  vertical-align: bottom;
 }
 
-ul#LC_TabMainMenuContent {
-    clear: both;
-    color: $fontmenu;
-    background: $tabbg;
-    list-style: none;
-    padding: 0;
-    margin: 0;
-    float:left;
-    width: 100%;
+ol.LC_primary_menu a {
+  font-size: 90%;
+  color: RGB(80, 80, 80);
+  text-decoration: none;
 }
 
-ul#LC_TabMainMenuContent li {
-    float: left;
-    font-weight: bold;
-    line-height: 1.8em;
-    padding: 0 0.8em; 
-    border-right: 1px solid black;
-    display: inline;
-    vertical-align: middle;
+ul#LC_secondary_menu {
+  clear: both;
+  color: $fontmenu;
+  background: $tabbg;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  width: 100%;
 }
 
-ul.LC_TabContent ,
-ul.LC_TabContentBigger {
-	display:block;
-	list-style:none;
-	margin: 0;
-	padding: 0;
+ul#LC_secondary_menu li {
+  font-weight: bold;
+  line-height: 1.8em;
+  padding: 0 0.8em;
+  border-right: 1px solid black;
+  display: inline;
+  vertical-align: middle;
+}
+
+ul.LC_TabContent {
+  display:block;
+  background: $sidebg;
+  border-bottom: solid 1px $lg_border_color;
+  list-style:none;
+  margin: 0 -10px;
+  padding: 0;
 }
 
 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;
+  float:left;
 }
 
-ul#LC_TabMainMenuContent li a {
-    color: $fontmenu;
-	text-decoration: none;
+ul#LC_secondary_menu li a {
+  color: $fontmenu;
+  text-decoration: none;
 }
 
 ul.LC_TabContent {
-	min-height:1.6em;
+  min-height:1.5em;
 }
 
 ul.LC_TabContent li {
-	vertical-align:middle;
-	padding: 0 10px 0 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;
+  vertical-align:middle;
+  padding: 0 10px 0 10px;
+  background-color:$tabbg;
+  border-bottom:solid 1px $lg_border_color;
 }
 
-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_TabContent .right {
+  float:right;
+}
+
+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 2px #FFFFFF;
+  padding-right: 16px;
 }
 
-ul.LC_TabContentBigger li:hover, 
-ul.LC_TabContentBigger li.active {
-	background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom;
+#maincoursedoc {
+  clear:both;
 }
 
-ul.LC_TabContentBigger li, 
+ul.LC_TabContentBigger {
+  display:block;
+  list-style:none;
+  padding: 0;
+}
+
+ul.LC_TabContentBigger li {
+  vertical-align:bottom;
+  height: 30px;
+  font-size:110%;
+  font-weight:bold;
+  color: #737373;
+}
+
+
 ul.LC_TabContentBigger li a {
-	font-size:110%;
-	font-weight:bold;
+  background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat;
+  height: 30px;
+  line-height: 30px;
+  text-align: center;
+  display: block;
+  text-decoration: none;
+}
+
+ul.LC_TabContentBigger li:hover a,
+ul.LC_TabContentBigger li.active a {
+  background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat;
+  color:$font;
+  text-decoration: underline;
+}
+
+
+ul.LC_TabContentBigger li b {
+  background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom;
+  display: block;
+  float: left;
+  padding: 0 30px;
 }
 
-ol#LC_MenuBreadcrumbs, 
-ol#LC_PathBreadcrumbs, 
-ul#LC_CourseBreadcrumbs {
-	padding-left: 10px;
-	margin: 0;
-	list-style-position: inside;
-}
-
-ol#LC_MenuBreadcrumbs li, 
-ol#LC_PathBreadcrumbs li, 
-ul#LC_CourseBreadcrumbs li {
-	display: inline;
-	padding: 0 0 0 10px;
-	overflow:hidden;
+ul.LC_TabContentBigger li:hover b,
+ul.LC_TabContentBigger li.active b {
+  background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;
+  color:$font;
+  border-bottom: 1px solid #FFFFFF;
+}
+
+
+ul.LC_CourseBreadcrumbs {
+  background: $sidebg;
+  line-height: 32px;
+  padding-left: 10px;
+  margin: 0 0 10px 0;
+  list-style-position: inside;
+
+}
+
+ol#LC_MenuBreadcrumbs,
+ol#LC_PathBreadcrumbs {
+  padding-left: 10px;
+  margin: 0;
+  list-style-position: inside;
+    /* SD working here 
+    white-space: nowrap; */
+}
+
+ol#LC_MenuBreadcrumbs li,
+ol#LC_PathBreadcrumbs li,
+ul.LC_CourseBreadcrumbs li {
+  display: inline;
+  white-space: nowrap;
+    /* SD working here  
+    white-space: normal; */ 
 }
 
 ol#LC_MenuBreadcrumbs li a,
-ul#LC_CourseBreadcrumbs li a {
-	text-decoration: none;
-	font-size:90%;
+ul.LC_CourseBreadcrumbs li a {
+  text-decoration: none;
+  font-size:90%;
 }
 
 ol#LC_PathBreadcrumbs li a {
-	text-decoration:none;
-	font-size:100%;
-	font-weight:bold;
+  text-decoration:none;
+  font-size:100%;
+  font-weight:bold;
 }
 
-.LC_ContentBoxSpecial {
-    border: solid 1px $lg_border_color;
-    padding: 0 10px 10px 10px;
+.LC_Box {
+  border: solid 1px $lg_border_color;
+  padding: 0 10px 10px 10px;
 }
 
 .LC_AboutMe_Image {
-	float:left;
-	margin-right:10px;
+  float:left;
+  margin-right:10px;
 }
 
 .LC_Clear_AboutMe_Image {
-	clear:left;
+  clear:left;
 }
 
 dl.LC_ListStyleClean dt {
-	padding-right: 5px;
-	display: table-header-group;
+  padding-right: 5px;
+  display: table-header-group;
 }
 
 dl.LC_ListStyleClean dd {
-	display: table-row;
+  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: 0;
+  /* display:block; */
+  list-style-position: inside;
+  list-style-type: none;
+  overflow: hidden;
+  padding: 0;
 }
 
 .LC_ListStyleSimple li,
@@ -6082,218 +6259,254 @@ dl.LC_ListStyleClean dd {
 .LC_ListStyleNormal dd,
 .LC_ListStyleSpecial li,
 .LC_ListStyleSpecial dd {
-	margin: 0;
-	padding: 5px 5px 5px 10px;
-	clear: both;
+  margin: 0;
+  padding: 5px 5px 5px 10px;
+  clear: both;
 }
 
 .LC_ListStyleClean li,
 .LC_ListStyleClean dd {
-	padding-top: 0;
-	padding-bottom: 0;
+  padding-top: 0;
+  padding-bottom: 0;
 }
 
 .LC_ListStyleSimple dd,
 .LC_ListStyleSimple li {
-	border-bottom: solid 1px $lg_border_color;
+  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;
+  list-style-type: none;
+  background-color: RGB(220, 220, 220);
+  margin-bottom: 4px;
 }
 
 table.LC_SimpleTable {
-	margin:5px;
-	border:solid 1px $lg_border_color;
+  margin:5px;
+  border:solid 1px $lg_border_color;
 }
 
 table.LC_SimpleTable tr {
-	padding: 0;
-	border:solid 1px $lg_border_color;
+  padding: 0;
+  border:solid 1px $lg_border_color;
 }
 
 table.LC_SimpleTable thead {
-	 background:rgb(220,220,220);
+  background:rgb(220,220,220);
 }
 
 div.LC_columnSection {
-	display: block;
-	clear: both;
-	overflow: hidden;
-	margin: 0;
+  display: block;
+  clear: both;
+  overflow: hidden;
+  margin: 0;
 }
 
 div.LC_columnSection>* {
-	float: left;
-	margin: 10px 20px 10px 0;
-	overflow:hidden;
-}
-
-.clear {
-	clear: both;
-	line-height: 0;
-	font-size: 0;
-	height: 0;
+  float: left;
+  margin: 10px 20px 10px 0;
+  overflow:hidden;
 }
 
 .LC_loginpage_container {
-	text-align:left;
-	margin : 0 auto;
-	width:90%;
-	padding: 10px;
-	height: auto;
-	background-color:#FFFFFF;
-	border:1px solid #CCCCCC;
+  text-align:left;
+  margin : 0 auto;
+  width:90%;
+  padding: 10px;
+  height: auto;
+  background-color:#FFFFFF;
+  border:1px solid #CCCCCC;
 }
 
 
 .LC_loginpage_loginContainer {
-	float:left;
-	width: 182px;
-	padding: 2px;
-	border:1px solid #CCCCCC;
-	background-color:$loginbg;
+  float:left;
+  width: 182px;
+  padding: 2px;
+  border:1px solid #CCCCCC;
+  background-color:$loginbg;
 }
 
 .LC_loginpage_loginContainer h2 {
-	margin-top: 0;
-	display:block;
-	background:$bgcol;
-	color:$textcol;
-	padding-left:5px;
+  margin-top: 0;
+  display:block;
+  background:$bgcol;
+  color:$textcol;
+  padding-left:5px;
 }
 
 .LC_loginpage_loginInfo {
-	float:left;
-	width:182px;
-	border:1px solid #CCCCCC;
-	padding:2px;
+  float:left;
+  width:182px;
+  border:1px solid #CCCCCC;
+  padding:2px;
 }
 
 .LC_loginpage_space {
-	clear: both;
-	margin-bottom: 20px;
-	border-bottom: 1px solid #CCCCCC;
+  clear: both;
+  margin-bottom: 20px;
+  border-bottom: 1px solid #CCCCCC;
 }
 
 .LC_loginpage_floatLeft {
-	float: left;
-	width: 200px;
-	margin: 0;
+  float: left;
+  width: 200px;
+  margin: 0;
 }
 
 table em {
-	font-weight: bold;
-	font-style: normal;
+  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%;
+  border:none;
+  border-spacing: 1px;
+  padding: 3px;
+  background-color: #FFFFFF;
+  font-size: 90%;
 }
 
-table.LC_tableOfContent{
-    border-collapse: collapse;
+table.LC_tableOfContent {
+  border-collapse: collapse;
 }
 
 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;
+  background-color: transparent;
+  text-decoration: none;
 }
 
 table.LC_tableOfContent img {
-	border: none;
-	height: 1.3em;
-	vertical-align: text-bottom;
-	margin-right: 0.3em;
+  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);
+  background-image:url(/res/adm/pages/open-first-problem.gif);
 }
 
 a#LC_content_toolbar_launchnav {
-	background-image:url(/res/adm/pages/start-navigation.gif);
+  background-image:url(/res/adm/pages/start-navigation.gif);
 }
 
 a#LC_content_toolbar_closenav {
-	background-image:url(/res/adm/pages/close-navigation.gif);
+  background-image:url(/res/adm/pages/close-navigation.gif);
 }
 
 a#LC_content_toolbar_everything {
-	background-image:url(/res/adm/pages/show-all.gif);
+  background-image:url(/res/adm/pages/show-all.gif);
 }
 
 a#LC_content_toolbar_uncompleted {
-	background-image:url(/res/adm/pages/show-incomplete-problems.gif);
+  background-image:url(/res/adm/pages/show-incomplete-problems.gif);
 }
 
 #LC_content_toolbar_clearbubbles {
-	background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
+  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 ;
+  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);
+  background-image:url(/res/adm/pages/open-all-folders.gif);
 }
 
 ul#LC_toolbar li a:hover {
-	background-position: bottom center;
+  background-position: bottom center;
 }
 
 ul#LC_toolbar {
-	padding: 0;
-	margin: 2px;
-	list-style:none;
-	position:relative;
-	background-color:white;
+  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;
-} 
+  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: none;
-	background-repeat:no-repeat;
-	background-color:transparent;
+  display:block;
+  padding: 0;
+  margin: 0;
+  height: 32px;
+  width: 32px;
+  color:white;
+  border: none;
+  background-repeat:no-repeat;
+  background-color:transparent;
 }
 
-ul.LC_functionslist li {
-  float: left;
+ul.LC_funclist {
+    margin: 0;
+    padding: 0.5em 1em 0.5em 0;
+}
+
+ul.LC_funclist + ul.LC_funclist {
+    /* 
+       left border as a seperator if we have more than
+       one list 
+    */
+    border-left: 1px solid $sidebg;
+    /* 
+       this hides the left border behind the border of the 
+       outer box if element is wrapped to the next 'line' 
+    */
+    margin-left: -1px;
+}
+
+ul.LC_funclist li {
+  display: inline;
   white-space: nowrap;
-  height: 35px; /* at least as high as heighest list item */
-  margin: 0 15px 15px 10px;
+  margin: 0 0 0 25px;
+  line-height: 150%;
 }
 
+#gciheader {
+  float:left;
+  width:100%;
+  background:#DAE0D2 url("/gcimenu_bg.gif") repeat-x bottom;
+  font-size:93%;
+  line-height:normal;
+}
+#gciheader ul {
+  margin:0;
+  padding:10px 10px 0;
+  list-style:none;
+}
+#gciheader li {
+  float:left;
+  background:url("/gcimenu_left.gif") no-repeat left top;
+  margin:0;
+  padding:0 0 0 9px;
+}
+#gciheader a {
+  display:block;
+  background:url("/gcimenu_right.gif") no-repeat right top;
+  padding:5px 15px 4px 6px;
+}
+#gciheader #current {
+  background-image:url("/gcimenu_left_on.gif");
+}
+#gciheader #current a {
+  background-image:url("/gcimenu_right_on.gif");
+  padding-bottom:5px;
+}
 
 END
 }
@@ -6422,7 +6635,8 @@ 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>';
+	$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">';
     }
     return $output;
 }
@@ -6509,6 +6723,8 @@ $args - additional optional args support
              inherit_jsmath -> when creating popup window in a page,
                                     should it have jsmath forced on by the
                                     current page
+             bread_crumbs ->             Array containing breadcrumbs
+             bread_crumbs_components ->  if exists show it as headline else show only the breadcrumbs
 
 =back
 
@@ -6567,6 +6783,11 @@ sub start_page {
     # Don't add anything more if only_body wanted
     return $result if $args->{'only_body'};
 
+    #Breadcrumbs for Construction Space provided by &bodytag. 
+    if (($env{'environment.remote'} eq 'off') && ($env{'request.state'} eq 'construct')) {
+        return $result;
+    }
+ 
     #Breadcrumbs
     if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
 		&Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -6714,14 +6935,14 @@ sub simple_error_page {
 	my ($add_class) = @_;
 	$row_count[0]++;
 	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
-	$css_class = (join(' ',$css_class,$add_class));
+	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
 	return  '<tr class="'.$css_class.'">'."\n";;
     }
     
     sub continue_data_table_row {
 	my ($add_class) = @_;
 	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
-	$css_class = (join(' ',$css_class,$add_class));
+	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');;
 	return  '<tr class="'.$css_class.'">'."\n";;
     }
 
@@ -6745,6 +6966,11 @@ sub simple_error_page {
     sub end_data_table_header_row {
 	return '</tr>'."\n";;
     }
+
+    sub data_table_caption {
+        my $caption = shift;
+        return "<caption class=\"LC_caption\">$caption</caption>";
+    }
 }
 
 =pod
@@ -6815,7 +7041,7 @@ sub get_users_function {
     if ($env{'request.role'}=~/^(st)/) {
         $function='student';
     }
-    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
+    if ($env{'request.role'}=~/^(cc|co|in|ta|ep)/) {
         $function='coordinator';
     }
     if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
@@ -6886,7 +7112,7 @@ sub check_user_status {
     my $active_chk = 'none';
     my $now = time;
     if (@uroles > 0) {
-        if (($role eq 'cc') || ($sec eq '') || (!defined($sec))) {
+        if (($role eq 'cc') || ($role eq 'co') || ($sec eq '') || (!defined($sec))) {
             $srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
         } else {
             $srchstr = '/'.$cdom.'/'.$crs.'/'.$sec.'_'.$role;
@@ -7507,9 +7733,9 @@ sub user_picker {
                     'whse'      => "When searching by last,first you must include at least one character in the first name.",
                      'thfo'     => "The following need to be corrected before the search can be run:",
                                        );
-    my $domform = &select_dom_form($currdom,'srchdomain',1,1);
+    my $domform = &select_dom_form($currdom,'srchdomain',undef,1);
     my $srchinsel = ' <select name="srchin">';
-
+     
     my @srchins = ('crs','dom','alc','instd');
 
     foreach my $option (@srchins) {
@@ -7517,13 +7743,15 @@ 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'});
+        next if ($option eq 'instd');
         if ($curr_selected{'srchin'} eq $option) {
             $srchinsel .= ' 
-   <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+       <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
         } else {
             $srchinsel .= '
-   <option value="'.$option.'">'.$lt{$option}.'</option>';
+    <option value="'.$option.'">'.$lt{$option}.'</option>';
         }
     }
     $srchinsel .= "\n  </select>\n";
@@ -7567,9 +7795,9 @@ sub user_picker {
                     );
                     $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>')
+                                      .'<br />'
+                                      .&mt('Enter a valid e-mail address as the username for the new user.').' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.'
+                                      ,'<a href="'.$helplink.'">','</a>')
                                       .'</p><br />';
                 }
             }
@@ -7681,24 +7909,20 @@ $newuserscript
 
 $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;
 }
 
@@ -8571,7 +8795,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&nbsp;[_1]',($sample+1)).'</th>'); }
+        $r->print('<th>'.&mt('Column [_1]',($sample+1)).'</th>'); }
     $r->print(&end_data_table_header_row());
     foreach my $hash (@$samples) {
 	$r->print(&start_data_table_row());
@@ -8615,7 +8839,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] }))) {
@@ -9269,10 +9493,11 @@ sub restore_settings {
 
 =item * &build_recipient_list()
 
-Build recipient lists for four types of e-mail:
+Build recipient lists for five types of e-mail:
 (a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
-(d) Help requests, generated by
-lonerrorhandler.pm, CHECKRPMS, loncron, and lonsupportreq.pm respectively.
+(d) Help requests, (e) Course requests needing approval,  generated by
+lonerrorhandler.pm, CHECKRPMS, loncron, lonsupportreq.pm and
+loncoursequeueadmin.pm respectively.
 
 Inputs:
 defmail (scalar - email address of default recipient), 
@@ -9442,6 +9667,8 @@ 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;
                 }
@@ -9554,12 +9781,14 @@ cathash - reference to hash of categorie
 
 currcat - scalar with an & separated list of categories assigned to a course. 
 
+type    - scalar contains course type (Course or Community).
+
 Returns: $output (markup to be displayed) 
 
 =cut
 
 sub assign_categories_table {
-    my ($cathash,$currcat) = @_;
+    my ($cathash,$currcat,$type) = @_;
     my $output;
     if (ref($cathash) eq 'HASH') {
         my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
@@ -9568,15 +9797,20 @@ 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];
-                    my $css_class = $itemcount%2?' class="LC_odd_row"':'';
                     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"':'';
                     my $item = &escape($parent).'::0';
                     my $checked = '';
                     if (@currcategories > 0) {
@@ -9584,18 +9818,26 @@ sub assign_categories_table {
                             $checked = ' checked="checked"';
                         }
                     }
-                    $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 $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>';
                     my $depth = 1;
                     push(@path,$parent);
-                    $output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
+                    $table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
                     pop(@path);
-                    $output .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
+                    $table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
                     $itemcount ++;
                 }
-                $output .= &Apache::loncommon::end_data_table();
+                if ($itemcount) {
+                    $output = &Apache::loncommon::start_data_table().
+                              $table.
+                              &Apache::loncommon::end_data_table();
+                }
             }
         }
     }
@@ -9840,12 +10082,26 @@ 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') {
-        $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'});     
+        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'});
+        }     
     } else {
 	my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
-	if ($env{'request.role.domain'} eq $args->{'clonedomain'}) {
+        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'],
@@ -9856,15 +10112,23 @@ sub check_clone {
             } 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'],['cc'],
+                                         'userroles',['active'],[$ccrole],
 					 [$args->{'clonedomain'}]);
-	        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
+	        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) || (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'});
+                    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'});
+                    }
 	        }
 	    }
         }
@@ -9873,7 +10137,7 @@ sub check_clone {
 }
 
 sub construct_course {
-    my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_;
+    my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum,$category) = @_;
     my $outcome;
     my $linefeed =  '<br />'."\n";
     if ($context eq 'auto') {
@@ -9911,7 +10175,8 @@ sub construct_course {
                                              $args->{'crscode'},
                                              $args->{'ccuname'}.':'.
                                              $args->{'ccdomain'},
-                                             $args->{'crstype'});
+                                             $args->{'crstype'},
+                                             $cnum,$context,$category);
 
     # Note: The testing routines depend on this being output; see 
     # Utils::Course. This needs to at least be output as a comment
@@ -10198,6 +10463,21 @@ sub construct_course {
         $outcome .= ($fatal?$errtext:'write ok').$linefeed;
     }
 
+    if ($args->{'cloneroster'}) {
+        my ($numadded,$clisterror) = &Apache::lonclonecourse::copyroster($cloneid,$$courseid,$args->{'startaccess'},$args->{'endaccess'});
+        if ($clisterror) {
+            $outcome .= "\0".&mt('An error occurred when copying the student roster from the old course to the new course; the error was: [_1].',$clisterror).$linefeed;
+            if ($numadded) {
+                $outcome .= &mt('Although [quant,_1,student] have received roles in the new course the roster does not report this. It is  ').$linefeed;
+            } 
+        } else {
+            if ($numadded) {
+                $outcome .= "\0".&mt('[quant,_1,student] copied from roster for old course to roster for new course.',$numadded).$linefeed;
+            } else {
+                $outcome .= "\0".&mt('No students have been enrolled in the new Concept Test.').' '.&mt('This is because either (a) an error occurred, or (b) there were no students with either current access or access which ended on/after the current default end date set for access to the old course.').$linefeed;
+            }
+        }
+    }
     return (1,$outcome);
 }
 
@@ -10220,11 +10500,21 @@ sub group_term {
     my $crstype = &course_type();
     my %names = (
                   'Course' => 'group',
-                  'Group' => 'team',
+                  'Community' => 'group',
                 );
     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]);
@@ -10413,7 +10703,7 @@ sub init_user_environment {
                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
         }
 
-        foreach my $crstype ('official','unofficial') {
+        foreach my $crstype ('official','unofficial','community') {
             $userenv{'canrequest.'.$crstype} =
                 &Apache::lonnet::usertools_access($username,$domain,$crstype,
                                                   'reload','requestcourses');
@@ -10454,6 +10744,60 @@ sub _add_to_env {
     }
 }
 
+sub new_roles_update {
+    my $rolecount = 0;
+    foreach my $envkey (keys(%env)) {
+        next unless ($envkey =~ /^user\.role\./);
+        $rolecount ++;
+    }
+    my $newrolecount = 0;
+    if (!$rolecount) {
+        my %userenv;
+        foreach my $crstype ('official','unofficial','community') {
+            $userenv{'canrequest.'.$crstype} =
+                &Apache::lonnet::usertools_access($env{'user.name'},
+                $env{'user.domain'},$crstype,'reload','requestcourses');
+        }
+        my $then=$env{'user.login.time'};
+        my $refresh=time;
+        my (%userroles,%allroles,%allgroups,@newroles);
+        my %roleshash =
+            &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',['active','future','previous'],undef,undef,1);
+        foreach my $item (keys(%roleshash)) {
+            my ($uname,$udom,$role,$section) = split(':',$item);
+            my $where = '/'.$udom.'/'.$uname;
+            my ($tstart,$tend) = split(':',$roleshash{$item});
+            if ($section ne '') {
+                $where .= '/'.$section;
+            }
+            my $spec = $role.'.'.$where;
+            &Apache::lonnet::set_arearole($role,$where,$tstart,$tend,
+                                          $env{'user.domain'},$env{'user.name'});
+            $userroles{'user.role.'.$spec} = $tstart.'.'.$tend;
+            $newrolecount ++;
+            unless (grep(/^\Q$role\E$/,@newroles)) {
+                push(@newroles,$role);
+            }
+            my $status =
+                &Apache::lonnet::curr_role_status($tstart,$tend,$refresh,$then);
+            if ($status eq 'active') {
+                &Apache::lonnet::gather_roleprivs(\%allroles,\%allgroups,\%userroles,
+                                                  $where,$role,$tstart,$tend);
+            }
+        }
+        if (@newroles) {
+            my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles,
+                                                               \%allgroups);
+            &Apache::lonnet::appenv(\%userroles,[@newroles,'cm']);
+            $userenv{'user.adv'} = $adv;
+            $userenv{'user.author'} = $author;
+            $userenv{'user.refresh.time'} = $refresh;
+        }
+        &Apache::lonnet::appenv(\%userenv);
+    }
+    return $newrolecount;
+}
+
 # --- Get the symbolic name of a problem and the url
 sub get_symb {
     my ($request,$silent) = @_;
@@ -10495,6 +10839,76 @@ sub clean_symb {
     return ($symb,$enc);
 }
 
+sub needs_gci_custom {
+    my $custommenu;
+    my $numdc = &check_for_gci_dc();
+    unless ($numdc) {
+        my $then=$env{'user.login.time'};
+        my $now = time;
+        my %cnums = (
+                        review => '9615072b469884921gcil1',
+                        submit => '1H96711d710194bfegcil1',
+                    );
+        if ($env{'user.role.st./gci/'.$cnums{'review'}}) {
+            my ($start,$end) =
+                split('.',$env{'user.role.st./gci/'.$cnums{'review'}});
+            if (((!$start) || ($start && $start <= $now)) &&
+                ((!$end) || ($end > $now))) {
+                $custommenu = 1;
+                if ($env{'user.role.cc./gci/'.$cnums{'review'}}) {
+                    my ($ccstart,$ccend) =
+                        split('.',$env{'user.role.cc./gci/'.$cnums{'review'}});
+                    if (((!$start) || ($start && $start <= $now)) &&
+                            ((!$end) || ($end > $now))) {
+                        $custommenu = '';
+                    }
+                }
+            }
+        }
+    }
+    return $custommenu;
+}
+
+sub check_for_gci_dc {
+    my $then=$env{'user.login.time'};
+    my $numdc = 0;
+    foreach my $dom ('gci','gcitest') {
+        if ($env{'user.role.dc./'.$dom.'/'}) {
+            my $livedc = 1;
+            my ($tstart,$tend)=split(/\./,$env{'user.role.dc./'.$dom.'/'});
+            if ($tstart && $tstart>$then) { $livedc = 0; }
+            if ($tend   && $tend  <$then) { $livedc = 0; }
+            if ($livedc) {
+                $numdc++;
+            }
+        }
+    }
+    return $numdc;
+}
+
+sub existing_gcitest_courses {
+    my ($role) = @_;
+    my %courses;
+    my $cdom = 'gcitest';
+    my $now = time;
+    foreach my $envkey (keys(%env)) {
+        my $cnum;
+        if ($envkey =~ m{^user\.role\.\Q$role\E\./\Q$cdom\E/($match_courseid)$}) {
+            $cnum = $1;
+        } else {
+            next;
+        }
+        my ($tstart,$tend) = split('.',$env{$envkey});
+        if (((!$tstart) || ($tstart < $now)) && ((!$tend) || ($tend > $now))) {
+            my $descr = $env{'course.'.$cdom.'_'.$cnum.'.description'};
+            if ($descr ne '') {
+                $courses{$cdom.'_'.$cnum}{'description'} = $descr;
+            }
+        }
+    }
+    return %courses;
+}
+
 =pod
 
 =back