--- loncom/interface/lonmenu.pm	2023/07/06 16:55:43	1.533
+++ loncom/interface/lonmenu.pm	2023/09/28 15:56:48	1.538
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.533 2023/07/06 16:55:43 raeburn Exp $
+# $Id: lonmenu.pm,v 1.538 2023/09/28 15:56:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -968,6 +968,18 @@ sub innerregister {
                     $$showncrumbsref = 1;
                 }
                 return $trail;
+            } elsif (($resurl eq '/public'.$courseurl.'/syllabus') &&
+                     ($env{'form.folderpath'})) {
+                if ($env{'form.title'}) {
+                    $title = $env{'form.title'};
+                } else {
+                    $title = 'Syllabus';
+                }
+                &prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname);
+                $title = &HTML::Entities::encode($title,'\'"<>&');
+                my ($trail) =
+                    &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
+                return $trail;
             }
             unless ($env{'request.state'} eq 'construct') {
                 &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -1093,15 +1105,17 @@ sub innerregister {
                 $leftvis = 'inline';
                 $defdom = $cdom;
             }
-            my $sellink = &Apache::loncommon::selectstudent_link('userview','vuname','vudom');
+            my $sellink = &Apache::loncommon::selectstudent_link('userview','vuname','vudom','','','vuidentifier');
             my $selscript=&Apache::loncommon::studentbrowser_javascript();
             my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($env{'request.symb'}),'<>&"');
-            my $input = &mt('User: [_1] or ID: [_2] at: [_3]',
-                            '<input name="vuname" type="text" size="8" value="'.$vuname.'" />',
-                            '<input name="vid" type="text" size="8" value="'.$vid.'" />',
-                            &Apache::loncommon::select_dom_form($defdom,'vudom')).
-                            '<input name="LC_viewas" type="hidden" value="'.$viewas.'" />',
-                            '<input name="symb" type="hidden" value="'.$shownsymb.'" />';
+            my $input = &mt('[_1]Username:[_2] or [_3]ID:[_4] | ',
+                            '<label><input type="radio" name="vuidentifier" value="uname" checked="checked" onclick="javascript:toggleIdentifier(this.form);" />',
+                            '</label><input name="vuname" type="text" size="6" value="'.$vuname.'" id="LC_vuname" />',
+                            '<label><input type="radio" name="vuidentifier" value="uid" onclick="javascript:toggleIdentifier(this.form);" />',
+                            '</label><input name="vid" type="hidden" size="6" value="'.$vid.'" id="LC_vid" />').
+                        '<input name="vudom" type="hidden" value="'.$defdom.'" />'.
+                        '<input name="LC_viewas" type="hidden" value="'.$viewas.'" />',
+                        '<input name="symb" type="hidden" value="'.$shownsymb.'" />';
             my $chooser = <<END;
 $selscript
 <a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link">
@@ -1130,7 +1144,7 @@ END
 # End course context
 
 # Prepare the rest of the buttons
-        my ($menuitems,$got_prt,$got_wishlist);
+        my ($menuitems,$got_prt,$got_wishlist,$crsauthor);
         if ($const_space) {
 #
 # We are in construction space
@@ -1139,15 +1153,17 @@ END
             my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
 	    my ($udom,$uname,$thisdisfn) =
 		($env{'request.filename'}=~m{^\Q$londocroot/priv/\E([^/]+)/([^/]+)/(.*)$});
+            my $crsauthor;
+            if (($env{'request.course.id'}) &&
+                ($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname) &&
+                ($env{'course.'.$env{'request.course.id'}.'.domain'} eq $udom)) {
+                $crsauthor = 1;
+            }
             my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn;
             if ($currdir =~ m-/$-) {
                 $is_const_dir = 1;
-                if ($thisdisfn eq '') {
-                    unless (($env{'request.course.id'}) && 
-                            ($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname) &&
-                            ($env{'course.'.$env{'request.course.id'}.'.domain'} eq $udom)) { 
-                        $is_const_dir = 2;
-                    }
+                if (($thisdisfn eq '') && ($crsauthor)) {
+                    $is_const_dir = 2;
                 }
                 my $esc_currdir = &Apache::loncommon::escape_single($currdir);
                 $menuitems=(<<ENDMENUITEMS);
@@ -1170,12 +1186,19 @@ ENDMENUITEMS
 #
 # Probably should be in mydesk.tab
 #
-                $menuitems=(<<ENDMENUITEMS);
+                if (($crsauthor) && ($pubfile eq "/res/$udom/$uname/default.rights")) {
+                    $menuitems=(<<ENDMENUITEMS);
+s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory
+s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource
+ENDMENUITEMS
+                } else {
+                    $menuitems=(<<ENDMENUITEMS);
 s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory
 s&6&2&rtrv.png&Retrieve&version[_1]&gocstr('/adm/retrieve','/priv/$udom/$uname/$cleandisfn')&Retrieve old version
 s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource
 s&7&3&copy.png&Copy&resource[_4]&gocstr('/adm/cfile?action=copy','/priv/$udom/$uname/$cleandisfn')&Copy this resource
 ENDMENUITEMS
+                }
 #
 # Rename and Delete only available if obsolete or unpublished
 #
@@ -1261,8 +1284,12 @@ ENDMENUITEMS
             $got_prt = 1;
             if (($env{'user.adv'}) && ($env{'request.uri'} =~ /^\/res/)
                 && (!$env{'request.enc'})) {
-                my ($cnum,$cdom) = &Apache::loncommon::crsauthor_url($env{'request.uri'});
-                unless ($cnum) {
+                my $privurl = $env{'request.uri'};
+                $privurl =~ s{^/res/}{/priv/};
+                my ($cnum,$cdom) = &Apache::loncommon::crsauthor_url($privurl);
+                if ($cnum) {
+                    $crsauthor = 1;
+                } else {
                     # wishlist is only available for users with access to resource-pool
                     # and links can only be set for resources within the resource-pool
                     $menuitems .= (<<ENDMENUITEMS);
@@ -1317,7 +1344,7 @@ s&8&3&prt.png&Print&printout[_1]&gopost(
 ENDMENUITEMS
                 $got_prt = 1;
             }
-            unless ($got_wishlist) {
+            unless (($got_wishlist) || ($crsauthor)) {
                 if (($env{'user.adv'}) && (!$env{'request.enc'})) {
                     # wishlist is only available for users with access to resource-pool
                     $menuitems .= (<<ENDMENUITEMS);
@@ -2336,23 +2363,28 @@ sub view_as_js {
     return <<"END";
 
 function toggleViewAsUser(change) {
-    var seluserid = document.getElementById('LC_selectuser');
-    var currstyle = seluserid.style.display;
-    if (change == 'off') {
-        document.userview.elements['LC_viewas'].value = '';
-        document.userview.elements['vuname'].value = '';
-        document.userview.elements['vid'].value = '';
-        document.userview.submit();
-        return;
-    }
-    if (currstyle == 'inline') {
-        seluserid.style.display = 'none';
-        document.getElementById('usexpand').innerHTML='&#9658;&nbsp;';
-        document.getElementById('uscollapse').innerHTML='';
-    } else {
-        seluserid.style.display = 'inline';
-        document.getElementById('usexpand').innerHTML='';
-        document.getElementById('uscollapse').innerHTML='&#9668;&nbsp;';
+    if (document.getElementById('LC_selectuser')) {
+        var seluserid = document.getElementById('LC_selectuser');
+        var currstyle = seluserid.style.display;
+        if (change == 'off') {
+            document.userview.elements['LC_viewas'].value = '';
+            document.userview.elements['vuname'].value = '';
+            document.userview.elements['vid'].value = '';
+            document.userview.submit();
+            return;
+        }
+        if ((document.getElementById('usexpand')) && (document.getElementById('uscollapse'))) {
+            if (currstyle == 'inline') {
+                seluserid.style.display = 'none';
+                document.getElementById('usexpand').innerHTML='&#9658;&nbsp;';
+                document.getElementById('uscollapse').innerHTML='';
+            } else {
+                seluserid.style.display = 'inline';
+                document.getElementById('usexpand').innerHTML='';
+                document.getElementById('uscollapse').innerHTML='&#9668;&nbsp;';
+                toggleIdentifier(document.userview);
+            }
+        }
     }
     return;
 }
@@ -2360,7 +2392,7 @@ function toggleViewAsUser(change) {
 function validCourseUser(form,change) {
     var possuname = form.elements['vuname'].value;
     var possuid = form.elements['vid'].value;
-    var possudom = form.elements['vudom'].options[form.elements['vudom'].selectedIndex].value;
+    var possudom = form.elements['vudom'].value;
     if ((possuname == '') && (possuid == '')) {
         if (change == 'off') {
             form.elements['LC_viewas'].value = '';
@@ -2396,6 +2428,30 @@ function validCourseUser(form,change) {
     return false;
 }
 
+function toggleIdentifier(form) {
+    if ((document.getElementById('LC_vuname')) && (document.getElementById('LC_vid'))) {
+        var radioelem = form.elements['vuidentifier'];
+        if (radioelem.length > 0) {
+            var i;
+            for (i=0; i<radioelem.length; i++) {
+                if (radioelem[i].checked == true) {
+                    if (radioelem[i].value == 'uname') {
+                        document.getElementById('LC_vuname').type = 'text';
+                        document.getElementById('LC_vid').type = 'hidden';
+                        document.getElementById('LC_vid').value = '';
+                    } else {
+                        document.getElementById('LC_vuname').type = 'hidden';
+                        document.getElementById('LC_vuname').value = '';
+                        document.getElementById('LC_vid').type = 'text';
+                    }
+                    break;
+                }
+            }
+        }
+    }
+    return;
+}
+
 END
 }