--- loncom/interface/Attic/lonremote.pm	2006/03/16 22:17:30	1.20
+++ loncom/interface/Attic/lonremote.pm	2009/10/01 23:04:07	1.31.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonremote.pm,v 1.20 2006/03/16 22:17:30 albertel Exp $
+# $Id: lonremote.pm,v 1.31.2.1 2009/10/01 23:04:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,17 +39,23 @@ use Apache::lonlocal;
 sub launchremote {
     my ($r,$lowerurl)=@_;
     &Apache::lonnet::put('environment',{'remote' => 'on'});
-    &Apache::lonnet::appenv('environment.remote' => 'on');
+    &Apache::lonnet::appenv({'environment.remote' => 'on'});
 # -------------------------------------------------------- Menu script and info
+    my $brcrum = [{href=>"/adm/preferences",text=>"Set User Preferences"},
+                  {href=>"/adm/remote?url=/adm/preferences&action=launch",text=>"Launch Remote Control"}];
     my $windowinfo=&Apache::lonmenu::open($env{'browser.os'});
     my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
-    my $start_page = &Apache::loncommon::start_page('Remote Control',
-						    $startupremote);
+    my $start_page = &Apache::loncommon::start_page('Launch Remote Control',
+                                                    $startupremote,
+                                                    {'bread_crumbs' => $brcrum,});
     my $end_page   = &Apache::loncommon::end_page();
     my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);
     my $setflags=&Apache::lonmenu::setflags();
     my $maincall=&Apache::lonmenu::maincall();
-    my $message=&mt("Launching of the Remote Control menu will fail if pop-up window filters are active. To use the Remote Control, disable the filter for this site.");
+    my $message='<p class="LC_info">'
+               .&mt('Launching of the Remote Control menu will fail if pop-up window filters are active.'
+                   .' To use the Remote Control, disable the filter for this site.')
+               .'</p>';
     $r->print(<<ENDLAUNCH);
 $start_page
 $setflags
@@ -64,22 +70,36 @@ ENDLAUNCH
 sub collapseremote {
     my ($r,$lowerurl)=@_;
 # -------------------------------------------------------- Menu script and info
-    my $start_page = &Apache::loncommon::start_page('Collapse Remote Control');
+    my $brcrum = [{href=>"/adm/preferences",text=>"Set User Preferences"},
+                  {href=>"/adm/remote?url=/adm/preferences&action=collapse",text=>"Collapse Remote Control"}];
+    my $start_page = 
+        &Apache::loncommon::start_page('Collapse Remote Control',
+                                       undef,
+                                       {'bread_crumbs' => $brcrum,
+                                        'no_inline_link' => 1,});
     my $end_page  =  &Apache::loncommon::end_page();
     my $windowinfo=&Apache::lonmenu::close();
-#    my $switch='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'">';
-    my $message='<p>'.&mt("The external menu (Remote Control) has been disabled, and you will be working with the smaller inline menu.\nYou may have either closed the Remote Control window, or it was blocked by a pop-up window filter in your browser.\nTo use the Remote Control, disable the filter for this site, and re-launch the Remote Control from the inline menu.").'</p>'; 
+#    my $switch='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />';
+    my $message='<div class="LC_warning"><b>'.&mt('The external menu (Remote Control) has been disabled, and you will be working with the smaller inline menu.').'</b></div>'."\n".
+                '<p>'.&mt('You may have either closed the Remote Control window, or it was blocked by a pop-up window filter in your browser.').'<br />'."\n".
+                &mt('To use the Remote Control, disable the filter for this site, and re-launch the Remote Control.').'</p>'."\n".
+                '<table><tr><td><fieldset><legend><b>'.&mt('Actions').'</b></legend><table><tr>'."\n".
+                '<td align="left">'.
+                '<a class="LC_menubuttons_link" href="/adm/remote?action=launch"><img alt="Launch Remote Control" src="/res/adm/pages/remotecontrol.png" border="0" />'.
+                &mt('Re-launch Remote Control').'</a></td><td>'.('&nbsp;'x3).'</td>'.
+                '<td align="right">'.
+                '<a class="LC_menubuttons_link" href="'.$lowerurl.'"><img alt="Launch Remote Control" src="/res/adm/pages/forw.png" class="LC_noBorder" />'.
+                &mt('Continue without Remote Control').'</a></td></tr></table>'.
+                '</fieldset></td></tr></table>'."\n".
+                '<p>'.&mt('Assuming no pop-up blocking, the Remote Control can be launched at any time from the [_1]Set User Preferences[_2] page, linked to in the [_3]Main Menu[_2].','<a href="/adm/preferences">','</a>','<a href="/adm/menu">').'</span></p>';
     $r->print(<<ENDCOLLAPSE);
 $start_page
 $windowinfo
-<p>
 $message
-</p>
-<a href="$lowerurl">Continue</a>
 $end_page
 ENDCOLLAPSE
-   &Apache::lonnet::put('environment',{'remote' => 'off'});
-   &Apache::lonnet::appenv('environment.remote' => 'off');
+    &Apache::lonnet::put('environment',{'remote' => 'off'});
+    &Apache::lonnet::appenv({'environment.remote' => 'off'});
 }
 
 sub handler {