--- loncom/interface/lonmenu.pm	2004/09/18 16:28:35	1.116
+++ loncom/interface/lonmenu.pm	2004/11/01 04:31:03	1.121
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.116 2004/09/18 16:28:35 albertel Exp $
+# $Id: lonmenu.pm,v 1.121 2004/11/01 04:31:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -167,7 +167,7 @@ $utility
 $reloadlink
 $navmaps
 <td bgcolor="$tabbg">
-<a href="/adm/remote?action=launch&url=$escurl">
+<a href="/adm/remote?action=launch&url=$escurl" target="_top">
 <font color="$font">$lt{'launch'}</font></a></td>
 <td bgcolor="$tabbg">
 <img align="right" src="/adm/lonIcons/minilogo.gif" />
@@ -226,6 +226,14 @@ sub innerregister {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
+    my ($uname,$thisdisfn);
+    my $const_space = 0;
+    if ($ENV{'request.filename'} =~ /^\/home\/([^\/]+)\/public_html\/(.*)/) {
+        $const_space = 1;
+        $uname = $1;
+        $thisdisfn = $2;
+    }
+
     if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
 
     $Apache::lonxml::registered=1;
@@ -244,6 +252,38 @@ sub innerregister {
     if ($noremote) {
 	$newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
     }
+    if ($textual && $const_space) {
+        my $formaction='/priv/'.$uname.'/'.$thisdisfn;
+        $formaction=~s/\/+/\//g;
+        my $titleinfo = '<form name="dirs" method="post" action="'.$formaction
+              .'" target="_top">'.
+        &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn,'_top','/priv','','-1').
+        &Apache::lonhtmlcommon::select_recent('construct','recent',
+                 'this.form.action=this.form.recent.value;this.form.submit()').
+              '</form>';
+        &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
+        $newmail .= &constspaceform();
+# role and realm
+        my ($role,$realm) = &Apache::lonnet::plaintext((split(/\./,$ENV{'request.role'}))[0]);
+        unless ($realm) { $realm='&nbsp;'; }
+        $newmail .= <<END;
+<table width="100%" cellspacing="0" border="0" cellpadding="0">
+<tr>
+<td>
+$titleinfo
+</td>
+<td align="right">
+<font size="2" face="Arial, Helvetica, sans-serif">
+    $ENV{'environment.firstname'}
+    $ENV{'environment.middlename'}
+    $ENV{'environment.lastname'}
+    $ENV{'environment.generation'}
+    </font>&nbsp;<br />
+    <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
+</td></tr>
+</table>
+END
+    }
     if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
 	my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'});
         $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
@@ -348,7 +388,7 @@ sub innerregister {
                 }
             }        
             # Finally, turn the button on or off
-            if ($cfile) {
+            if ($cfile && !$const_space) {
                 $editbutton=&switch
                     ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
@@ -359,7 +399,19 @@ sub innerregister {
         ###
         ###
 # Prepare the rest of the buttons
-	my $menuitems=(<<ENDMENUITEMS);
+        my $menuitems;
+        if ($const_space) {
+            my $currdir = '/priv/'.$uname.'/'.$thisdisfn;
+            $currdir =~ s#[^/]+$##;
+            $menuitems=(<<ENDMENUITEMS);
+s&6&1&list.gif&list[_1]&dir[_1]&go('$currdir')&List current directory
+s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retreive old version
+s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$thisdisfn')&Publish this resource
+s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$thisdisfn')&Delete this resource
+s&7&2&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document
+ENDMENUITEMS
+        } else {
+	    $menuitems=(<<ENDMENUITEMS);
 c&3&1
 s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
 s&2&3&forw.gif&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
@@ -370,13 +422,14 @@ s&8&3&prt.gif&prepare[_1]&printout[_1]&g
 s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&2
 s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&2
 ENDMENUITEMS
-        unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
-	    $menuitems.=(<<ENDREALRES);
+            unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
+	        $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
 s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
 s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
 ENDREALRES
-	}
+	    }
+        }
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
@@ -532,11 +585,18 @@ sub startupremote {
 #
     my $configmenu=&rawconfig();
     my $esclowerurl=&Apache::lonnet::escape($lowerurl);
-
+    my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
     return(<<ENDREMOTESTARTUP);
 <script>
-
+var timestart;
 function wheelswitch() {
+    if (typeof(document.wheel) != 'undefined') {
+	if (typeof(document.wheel.spin) != 'undefined') {
+	    var date=new Date();
+	    var waited=Math.round(30-((date.getTime()-timestart)/1000));
+	    document.wheel.spin.value=$message;
+	}
+    }
    if (window.status=='|') { 
       window.status='/'; 
    } else {
@@ -573,6 +633,8 @@ function wait() {
 function main() {
    canceltim=setTimeout('tim=1;',30000);
    window.status='-';
+   var date=new Date();
+   timestart=date.getTime();
    wait();
 }
 
@@ -598,6 +660,25 @@ sub maincall() {
 </script>
 ENDMAINCALL
 }
+
+sub load_remote_msg {
+    my ($lowerurl)=@_;
+
+    if (($ENV{'browser.interface'} eq 'textual') ||
+        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+
+    my $esclowerurl=&Apache::lonnet::escape($lowerurl);
+    my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
+		    "/adm/remote?action=collapse?url=$esclowerurl");
+    return(<<ENDREMOTEFORM);
+<p>
+<form name="wheel">
+<input name="spin" type="text" size="60" />
+</form>
+</p>
+<p>$link</p>
+ENDREMOTEFORM
+}
 # ================================================================= Reopen menu
 
 sub reopenmenu {
@@ -915,6 +996,20 @@ function gocmd(url,cmd) {
    }
 }
 
+function gocstr(url,filename) {
+    if (url == '/adm/cfile?action=delete') {
+        this.document.cstrdelete.filename.value = filename
+        this.document.cstrdelete.submit();
+        return;
+    }
+    if (url !='') {
+        this.document.constspace.filename.value = filename;
+        this.document.constspace.action = url;
+        this.document.constspace.submit();
+    }
+}
+
+
 function catalog_info() {
    loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
 }
@@ -937,6 +1032,19 @@ sub serverform {
 ENDSERVERFORM
 }
 
+sub constspaceform {
+    return(<<ENDCONSTSPACEFORM);
+<form name="constspace" action="/adm/logout" method="post" target="_top">
+<input type="hidden" name="filename" value="" />
+</form>
+<form name="cstrdelete" action="/adm/cfile" method="post" target="_top">
+<input type="hidden" name="action" value="delete" /> 
+<input type="hidden" name="filename" value="" />
+</form>
+ENDCONSTSPACEFORM
+}
+
+
 sub get_nav_status {
     my $navstatus="swmenu.w_loncapanav_flag=";
     if ($ENV{'environment.remotenavmap'} eq 'on') {