[LON-CAPA-cvs] cvs: loncom /interface lonremote.pm

[raeburn]

raeburn		Sun Mar 29 22:14:12 2009 EDT

  Modified files:              
    /loncom/interface	lonremote.pm 
  Log:
  Bug 5930.
  - Provide a "Re-launch" remote control link on the "Collapse Remote Control" page.
  
  
Index: loncom/interface/lonremote.pm
diff -u loncom/interface/lonremote.pm:1.29 loncom/interface/lonremote.pm:1.30
--- loncom/interface/lonremote.pm:1.29	Sun Mar 29 19:44:56 2009
+++ loncom/interface/lonremote.pm	Sun Mar 29 22:14:12 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonremote.pm,v 1.29 2009/03/29 19:44:56 raeburn Exp $
+# $Id: lonremote.pm,v 1.30 2009/03/29 22:14:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,19 +74,26 @@
     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. You may have either closed the Remote Control window, or it was blocked by a pop-up window filter in your browser. To use the Remote Control, disable the filter for this site, and re-launch the Remote Control from the [_1]"Launch Remote Control"[_2] option in [_3]"Set my user preferences"[_2], accessible via the [_4]Main Menu[_2]','<a href="/adm/remote?action=launch">','</a>','<a href="/adm/preferences">','<a href="/adm/menu">').'</p>'; 
-    my $continue = &mt('Continue');
+    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 class="LC_menubuttons_text" align="left">'.
+                '<a class="LC_menubuttons_link" href="/adm/remote?action=launch"><img alt="Launch Remote Control" src="/res/adm/pages/network-wireless.png" class="LC_noBorder" />'.
+                &mt('Re-launch Remote Control').'</a></td><td>'.('&nbsp;'x3).'</td>'.
+                '<td class="LC_menubuttons_link" 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 {