[LON-CAPA-cvs] cvs: rat / lonratedt.pm doc/loncapafiles loncapafiles.lpml loncom loncapa_apache.conf loncom/auth lonauth.pm lonlogout.pm switchserver.pm loncom/homework lonhomework.pm structuretags.pm loncom/html/res/adm/pages menu.html loncom/interface loncommon.pm lonfeedback.pm lonhelper.pm lonmainmenu.pm lonmenu.pm lonnavdisplay.pm lonpreferences.pm lonremote.pm loncom/localize/localize de.pm loncom/publisher lonconstruct.pm lonpubdir.pm loncom/xml lonxml.pm
droeschl
droeschl@source.lon-capa.org
Wed, 10 Mar 2010 21:26:16 -0000
This is a MIME encoded message
--droeschl1268256376
Content-Type: text/plain
droeschl Wed Mar 10 21:26:16 2010 EDT
Removed files:
/loncom/html/res/adm/pages menu.html
/loncom/interface lonremote.pm
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom loncapa_apache.conf
/loncom/auth lonauth.pm lonlogout.pm switchserver.pm
/loncom/homework lonhomework.pm structuretags.pm
/loncom/interface loncommon.pm lonfeedback.pm lonhelper.pm
lonmainmenu.pm lonmenu.pm lonnavdisplay.pm
lonpreferences.pm
/loncom/localize/localize de.pm
/loncom/publisher lonconstruct.pm lonpubdir.pm
/loncom/xml lonxml.pm
/rat lonratedt.pm
Log:
In process of removing remote control, remote navmap and different icon modes code
Also some minor refactoring.
--droeschl1268256376
Content-Type: text/plain
Content-Disposition: attachment; filename="droeschl-20100310212616.txt"
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.675 doc/loncapafiles/loncapafiles.lpml:1.676
--- doc/loncapafiles/loncapafiles.lpml:1.675 Sat Jan 30 18:49:52 2010
+++ doc/loncapafiles/loncapafiles.lpml Wed Mar 10 21:25:14 2010
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.675 2010/01/30 18:49:52 faziophi Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.676 2010/03/10 21:25:14 droeschl Exp $ -->
<!--
@@ -4681,15 +4681,6 @@
<status>works/unverified</status>
</file>
<file>
-<source>loncom/interface/lonremote.pm</source>
-<target dist='default'>home/httpd/lib/perl/Apache/lonremote.pm</target>
-<categoryname>handler</categoryname>
-<description>
-Handler to launch and collapse the remote control.
-</description>
-<status>works/unverified</status>
-</file>
-<file>
<source>loncom/interface/portfolio.pm</source>
<target dist='default'>home/httpd/lib/perl/Apache/portfolio.pm</target>
<categoryname>handler</categoryname>
@@ -6894,14 +6885,6 @@
welcoming page to the LON-CAPA system upon login
</description>
</file>
-<file>
-<source>loncom/html/res/adm/pages/menu.html</source>
-<target dist='default'>home/httpd/html/res/adm/pages/menu.html</target>
-<categoryname>interface file</categoryname>
-<description>
-renders the HTML (including image maps) for the LON-CAPA remote control
-</description>
-</file>
<fileglob>
<glob>*.gif</glob>
<sourcedir>loncom/html/res/adm/pages/indexericons/</sourcedir>
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.192 loncom/loncapa_apache.conf:1.193
--- loncom/loncapa_apache.conf:1.192 Mon Feb 22 22:53:40 2010
+++ loncom/loncapa_apache.conf Wed Mar 10 21:25:22 2010
@@ -1,7 +1,7 @@
##
## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
##
-## $Id: loncapa_apache.conf,v 1.192 2010/02/22 22:53:40 droeschl Exp $
+## $Id: loncapa_apache.conf,v 1.193 2010/03/10 21:25:22 droeschl Exp $
##
#
@@ -503,16 +503,6 @@
ErrorDocument 500 /adm/errorhandler
</Location>
-<Location /adm/remote>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonremote
-ErrorDocument 403 /adm/login
-ErrorDocument 500 /adm/errorhandler
-</Location>
-
<Location /adm/pickauthor>
AuthType LONCAPA
Require valid-user
Index: loncom/auth/lonauth.pm
diff -u loncom/auth/lonauth.pm:1.101 loncom/auth/lonauth.pm:1.102
--- loncom/auth/lonauth.pm:1.101 Wed Jul 22 21:51:03 2009
+++ loncom/auth/lonauth.pm Wed Mar 10 21:25:29 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# User Authentication Module
#
-# $Id: lonauth.pm,v 1.101 2009/07/22 21:51:03 raeburn Exp $
+# $Id: lonauth.pm,v 1.102 2010/03/10 21:25:29 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -111,23 +111,17 @@
}
}
- my $windowinfo=&Apache::lonmenu::open($env{'browser.os'});
- my $startupremote=&Apache::lonmenu::startupremote($destination);
- my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);
- my $setflags=&Apache::lonmenu::setflags();
- my $maincall=&Apache::lonmenu::maincall();
+ my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";');
+ my $header = '<meta HTTP-EQUIV="Refresh" CONTENT="0; url='.$destination.'" />';
my $brcrum = [{'href' => '',
'text' => 'Successful Login'},];
my $start_page=&Apache::loncommon::start_page('Successful Login',
- $startupremote,
+ $header,
{'no_inline_link' => 1,
'bread_crumbs' => $brcrum,});
my $end_page =&Apache::loncommon::end_page();
- my $continuelink;
- if ($env{'environment.remote'} eq 'off') {
- $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
- }
+ my $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
# ------------------------------------------------- Output for successful login
&Apache::loncommon::content_type($r,'text/html');
@@ -142,13 +136,10 @@
);
$r->print(<<ENDSUCCESS);
$start_page
-$setflags
$windowinfo
<h1>$lt{'wel'}</h1>
$lt{'mes'}<p>
<a href="/adm/$lt{'log'}">$lt{'pro'}</a></p>
-$remoteinfo
-$maincall
$continuelink
$end_page
ENDSUCCESS
Index: loncom/auth/lonlogout.pm
diff -u loncom/auth/lonlogout.pm:1.38 loncom/auth/lonlogout.pm:1.39
--- loncom/auth/lonlogout.pm:1.38 Sat May 16 13:50:04 2009
+++ loncom/auth/lonlogout.pm Wed Mar 10 21:25:29 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Logout Handler
#
-# $Id: lonlogout.pm,v 1.38 2009/05/16 13:50:04 droeschl Exp $
+# $Id: lonlogout.pm,v 1.39 2010/03/10 21:25:29 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -89,8 +89,7 @@
return OK if $r->header_only;
# -------------------------------------------------------- Menu script and info
- my $windowinfo=&Apache::lonmenu::close();
- $windowinfo.=&Apache::lonnavmaps::close();
+ my $windowinfo=&Apache::lonnavmaps::close();
# ---------------------------------------------------------------- Get handover
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']);
my $switch='';
Index: loncom/auth/switchserver.pm
diff -u loncom/auth/switchserver.pm:1.22 loncom/auth/switchserver.pm:1.23
--- loncom/auth/switchserver.pm:1.22 Tue Apr 14 23:52:07 2009
+++ loncom/auth/switchserver.pm Wed Mar 10 21:25:29 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Switch Servers Handler
#
-# $Id: switchserver.pm,v 1.22 2009/04/14 23:52:07 raeburn Exp $
+# $Id: switchserver.pm,v 1.23 2010/03/10 21:25:29 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -123,7 +123,6 @@
# -------------------------------------------------------- Menu script and info
my $windowinfo=
- &Apache::lonmenu::close().
&Apache::lonnavmaps::close();
# ---------------------------------------------------------------- Get handover
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.317 loncom/homework/lonhomework.pm:1.318
--- loncom/homework/lonhomework.pm:1.317 Sat Jan 30 22:40:37 2010
+++ loncom/homework/lonhomework.pm Wed Mar 10 21:25:36 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.317 2010/01/30 22:40:37 bisitz Exp $
+# $Id: lonhomework.pm,v 1.318 2010/03/10 21:25:36 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -923,7 +923,6 @@
&Apache::loncommon::resize_textarea_js().
&Apache::structuretags::setmode_javascript().
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
- my $only_body = ($env{'environment.remote'} eq 'off')? 0 : 1;
my $dragmath_button =
&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
@@ -936,7 +935,7 @@
my $start_page =
&Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js,
{'no_auto_mt_title' => 1,
- 'only_body' => $only_body,
+ 'only_body' => 0,
'add_entries' => {
'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
'onload' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.465 loncom/homework/structuretags.pm:1.466
--- loncom/homework/structuretags.pm:1.465 Sun Feb 28 23:28:54 2010
+++ loncom/homework/structuretags.pm Wed Mar 10 21:25:36 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.465 2010/02/28 23:28:54 raeburn Exp $
+# $Id: structuretags.pm,v 1.466 2010/03/10 21:25:36 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -209,9 +209,6 @@
} elsif (!defined($found{'body'})
&& $env{'request.state'} eq 'construct') {
if ($target eq 'web' || $target eq 'edit') {
- if ($env{'environment.remote'} ne 'off') {
- $body_args{'only_body'} = 1;
- }
# Breadcrumbs for Construction Space
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb({
@@ -245,8 +242,7 @@
# $body_args{'no_title'} = 1;
$body_args{'force_register'} = 1;
$body_args{'add_entries'} = \%add_entries;
- if ($env{'environment.remote'} eq 'off'
- && $env{'request.state'} eq 'construct') {
+ if ( $env{'request.state'} eq 'construct') {
$body_args{'only_body'} = 1;
}
}
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.948 loncom/interface/loncommon.pm:1.949
--- loncom/interface/loncommon.pm:1.948 Mon Mar 8 14:51:14 2010
+++ loncom/interface/loncommon.pm Wed Mar 10 21:25:49 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.948 2010/03/08 14:51:14 raeburn Exp $
+# $Id: loncommon.pm,v 1.949 2010/03/10 21:25:49 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1202,12 +1202,7 @@
sub help_open_menu {
my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)
= @_;
- $stayOnPage = 0 if (not defined $stayOnPage);
- # only use pop-up help (stayOnPage == 0)
- # if environment.remote is on (using remote control UI)
- if ($env{'environment.remote'} eq 'off' ) {
- $stayOnPage=1;
- }
+ $stayOnPage = 1;
my $output;
if ($component_help) {
if (!$text) {
@@ -1228,8 +1223,8 @@
sub top_nav_help {
my ($text) = @_;
$text = &mt($text);
- my $stay_on_page =
- ($env{'environment.remote'} eq 'off' );
+ my $stay_on_page = 1;
+
my $link = ($stay_on_page) ? "javascript:helpMenu('display')"
: "javascript:helpMenu('open')";
my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);
@@ -1244,10 +1239,7 @@
sub help_menu_js {
my ($text) = @_;
-
- my $stayOnPage =
- ($env{'environment.remote'} eq 'off' );
-
+ my $stayOnPage = 1;
my $width = 620;
my $height = 600;
my $helptopic=&general_help();
@@ -1304,10 +1296,7 @@
unless ($env{'user.adv'}) { return ''; }
unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }
$text = "" if (not defined $text);
- $stayOnPage = 0 if (not defined $stayOnPage);
- if ($env{'environment.remote'} eq 'off' ) {
$stayOnPage=1;
- }
$width = 600 if (not defined $width);
$height = 600 if (not defined $height);
@@ -1348,10 +1337,7 @@
unless ($env{'user.adv'}) { return ''; }
unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }
$text = "" if (not defined $text);
- $stayOnPage = 0 if (not defined $stayOnPage);
- if ($env{'environment.remote'} eq 'off' ) {
$stayOnPage=1;
- }
$width = 350 if (not defined $width);
$height = 400 if (not defined $height);
@@ -4550,9 +4536,9 @@
=item * $bgcolor, used to override the bgcolor on a webpage to a specific value
-=item * $no_inline_link, if true and in remote mode, don't show the
- 'Switch To Inline Menu' link
-
+#RC =item * $no_inline_link, if true and in remote mode, don't show the
+#RC 'Switch To Inline Menu' link
+#RC
=item * $args, optional argument valid values are
no_auto_mt_title -> prevents &mt()ing the title arg
inherit_jsmath -> when creating popup window in a page,
@@ -4642,7 +4628,6 @@
$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
- if ($env{'environment.remote'} eq 'off') {
# No Remote
if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') {
return $bodytag;
@@ -4698,40 +4683,6 @@
}
return $bodytag;
- }
-
-#
-# Top frame rendering, Remote is up
-#
-
- my $imgsrc = $img;
- if ($img =~ /^\/adm/) {
- $imgsrc = &lonhttpdurl($img);
- }
- my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
-
- # Explicit link to get inline menu
- my $menu= ($no_inline_link?''
- :'<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">
-<tr><td>$upperleft</td>
- <td>$messages </td>
-</tr>
-<tr><td>$titleinfo $dc_info $menu</td>
-</tr>
-</table>
-ENDBODY
}
sub dc_courseid_toggle {
@@ -5111,11 +5062,6 @@
padding: 0;
}
-/* Preliminary fix to hide breadcrumbs inside remote control window */
-#LC_remote #LC_breadcrumbs {
- display:none;
-}
-
#LC_head_subbox {
clear:both;
background: #F8F8F8; /* $sidebg; */
@@ -6106,11 +6052,6 @@
margin: 0;
}
-span.LC_new_message{
- font-weight:bold;
- color: darkred;
-}
-
ol#LC_PathBreadcrumbs {
margin: 0;
}
@@ -6131,6 +6072,11 @@
text-decoration: none;
}
+ol.LC_primary_menu a.LC_new_message {
+ font-weight:bold;
+ color: darkred;
+}
+
ul#LC_secondary_menu {
clear: both;
color: $fontmenu;
@@ -6764,8 +6710,8 @@
skip_phases -> hash ref of
head -> skip the <html><head> generation
body -> skip all <body> generation
- no_inline_link -> if true and in remote mode, don't show the
- 'Switch To Inline Menu' link
+#RC no_inline_link -> if true and in remote mode, don't show the
+#RC 'Switch To Inline Menu' link
no_auto_mt_title -> prevent &mt()ing the title arg
inherit_jsmath -> when creating popup window in a page,
should it have jsmath forced on by the
@@ -6831,7 +6777,8 @@
return $result if $args->{'only_body'};
#Breadcrumbs for Construction Space provided by &bodytag.
- if (($env{'environment.remote'} eq 'off') && ($env{'request.state'} eq 'construct')) {
+ if (
+ $env{'request.state'} eq 'construct') {
return $result;
}
@@ -10690,15 +10637,12 @@
my %userenv = &Apache::lonnet::dump('environment',$domain,$username);
my ($tmp) = keys(%userenv);
if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- # default remote control to off
- if ($userenv{'remote'} ne 'on') { $userenv{'remote'} = 'off'; }
} else {
undef(%userenv);
}
if (($userenv{'interface'}) && (!$form->{'interface'})) {
$form->{'interface'}=$userenv{'interface'};
}
- $env{'environment.remote'}=$userenv{'remote'};
if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; }
# --------------- Do not trust query string to be put directly into environment
@@ -10730,9 +10674,6 @@
$initial_env{"browser.localres"} = $form->{'localres'};
}
- if ($public) {
- $initial_env{"environment.remote"} = "off";
- }
if ($form->{'interface'}) {
$form->{'interface'}=~s/\W//gs;
$initial_env{"browser.interface"} = $form->{'interface'};
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.290 loncom/interface/lonfeedback.pm:1.291
--- loncom/interface/lonfeedback.pm:1.290 Mon Mar 8 17:47:45 2010
+++ loncom/interface/lonfeedback.pm Wed Mar 10 21:25:50 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.290 2010/03/08 17:47:45 bisitz Exp $
+# $Id: lonfeedback.pm,v 1.291 2010/03/10 21:25:50 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -273,10 +273,6 @@
my %anonhash=();
my $anoncnt=0;
my $target='';
- unless ($env{'browser.interface'} eq 'textual' ||
- $env{'environment.remote'} eq 'off' ) {
- $target='target="LONcom"';
- }
my $now = time;
$discinfo{$visitkey} = $visit;
@@ -2515,10 +2511,6 @@
&Apache::lonenc::check_encrypt(\$feedurl);
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
my %onload;
- if ($env{'environment.remote'} ne 'off') {
- $onload{'onload'} =
- "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
- }
my $start_page=
&Apache::loncommon::start_page('Feedback sent',undef,
{'redirect' => [0,$feedurl],
@@ -2552,10 +2544,6 @@
my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
my %onload;
- if ($env{'environment.remote'} ne 'off') {
- $onload{'onload'} =
- "if (window.name!='loncapaclient') { self.window.close(); }";
- }
my %body_options = ('only_body' => 1,
'bgcolor' => '#FFFFFF',
@@ -3564,10 +3552,6 @@
$r->send_http_header;
my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
my %onload;
- if ($env{'environment.remote'} ne 'off') {
- $onload{'onload'} =
- "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
- }
my $start_page=
&Apache::loncommon::start_page('New posts marked as read',undef,
Index: loncom/interface/lonhelper.pm
diff -u loncom/interface/lonhelper.pm:1.178 loncom/interface/lonhelper.pm:1.179
--- loncom/interface/lonhelper.pm:1.178 Tue Jan 26 11:34:47 2010
+++ loncom/interface/lonhelper.pm Wed Mar 10 21:25:50 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.178 2010/01/26 11:34:47 foxr Exp $
+# $Id: lonhelper.pm,v 1.179 2010/03/10 21:25:50 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3661,10 +3661,8 @@
}
my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
my $next = HTML::Entities::encode(&mt("Next"), '<>&"');
- my $target = " target='loncapaclient'";
- if ($env{'environment.remote'} eq 'off') { $target=''; }
$result .= "<p>\n" .
- "<form action='".$actionURL."' method='post' $target>\n" .
+ "<form action='".$actionURL."' method='post' >\n" .
"<input type='button' onclick='history.go(-1)' value='$previous' />" .
"<input type='hidden' name='orgurl' value='$targetURL' />" .
"<input type='hidden' name='selectrole' value='1' />\n" .
Index: loncom/interface/lonmainmenu.pm
diff -u loncom/interface/lonmainmenu.pm:1.8 loncom/interface/lonmainmenu.pm:1.9
--- loncom/interface/lonmainmenu.pm:1.8 Mon Jul 13 08:24:21 2009
+++ loncom/interface/lonmainmenu.pm Wed Mar 10 21:25:50 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# displays the main menu
#
-# $Id: lonmainmenu.pm,v 1.8 2009/07/13 08:24:21 www Exp $
+# $Id: lonmainmenu.pm,v 1.9 2010/03/10 21:25:50 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,10 +31,6 @@
# browser.interface - if this is 'textual', it overrides the second parameter
# and goes to screen reader PDA mode
#
-# environment.remote - if this is 'on', the routines controll the remote
-# control, otherwise they render the main window controls; ignored it
-# browser.interface is 'textual'
-#
package Apache::lonmainmenu;
@@ -52,27 +48,13 @@
return OK if $r->header_only;
my $form;
- if ($env{'environment.remote'} ne 'off') {
- $form=&Apache::lonmenu::serverform();
- }
-
- my $script_tag;
- if ($env{'environment.remote'} ne 'off') {
- my $utility=&Apache::lonmenu::utilityfunctions('/adm/menu');
- $script_tag=(<<ENDSCRIPT);
-<script type="text/javascript">
-$utility
-</script>
-ENDSCRIPT
- }
# ---- Print the screen, pretend to be in text mode to generate text-based menu
# temporarily set interface to "faketextual" and remote to "off", which renders
# the main menu
$env{'browser.interface'}='faketextual';
- $env{'environment.remote'}='off';
$r->print(&Apache::loncommon::start_page( 'Main Menu',
- $script_tag,
+ undef,
{'bread_crumbs' => 1}));
$r->print(&Apache::lonmenu::inlinemenu().$form);
$r->print(&Apache::loncommon::end_page());
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.315 loncom/interface/lonmenu.pm:1.316
--- loncom/interface/lonmenu.pm:1.315 Wed Mar 3 21:33:15 2010
+++ loncom/interface/lonmenu.pm Wed Mar 10 21:25:50 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.315 2010/03/03 21:33:15 droeschl Exp $
+# $Id: lonmenu.pm,v 1.316 2010/03/10 21:25:50 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -28,8 +28,6 @@
#
# There is one parameter controlling the action of this module:
#
-# environment.remote - if this is 'on', the routines controll the remote
-# control, otherwise they render the main window controls;
=head1 NAME
@@ -124,22 +122,8 @@
=item unloadevents()
-=item startupremote()
-
-=item setflags()
-
-=item maincall()
-
-=item load_remote_msg()
-
=item get_menu_name()
-=item reopenmenu()
-
-=item open()
-
-Open the menu
-
=item clear()
=item switch()
@@ -156,10 +140,6 @@
=item rawconfig()
-=item close()
-
-=item footer()
-
=item utilityfunctions()
=item serverform()
@@ -205,10 +185,10 @@
} else { # textual Link
$link = &mt($$menuitem[3]);
}
- if($$menuitem[4] eq 'newmsg'){ #special style for New Messages
- return '<li><a href="'.$$menuitem[0].'"><span class="LC_new_message">'.$link.'</span></a></li>';
- }
- return '<li><a href="'.$$menuitem[0].'">'.$link.'</a></li>';
+ return '<li><a'
+ # highlighting for new messages
+ . ( $$menuitem[4] eq 'newmsg' ? ' class="LC_new_message"' : '')
+ . qq| href="$$menuitem[0]">$link</a></li>|;
}
# primary_menu() evaluates @primary_menu and returns XHTML for the menu
@@ -357,11 +337,6 @@
if ($env{'request.state'} eq 'construct') {
$force_title=&Apache::lonxml::display_title();
}
- if (($env{'environment.remote'} eq 'off') ||
- ((($env{'request.publicaccess'}) ||
- (!&Apache::lonnet::is_on_map(
- &unescape($env{'request.noversionuri'})))) &&
- (!$forcereg))) {
return
$result
.'<script type="text/javascript">'."\n"
@@ -370,16 +345,10 @@
.'// ]]>'."\n"
.'</script>'
.$force_title;
- }
-# Graphical display after login only
- if ($env{'request.registered'} && !$forcereg) { return ''; }
- $result.=&innerregister($forcereg);
- return $result.$force_title;
}
sub innerregister {
my ($forcereg,$titletable,$bread_crumbs) = @_;
- my $result = '';
my ($uname,$thisdisfn);
my $const_space = ($env{'request.state'} eq 'construct');
my $is_const_dir = 0;
@@ -388,23 +357,9 @@
$env{'request.registered'} = 1;
- my $noremote = ($env{'environment.remote'} eq 'off');
-
undef(@inlineremote);
- my $reopen=&Apache::lonmenu::reopenmenu();
-
- my $newmail='';
-
- if (&Apache::lonmsg::newmail() && !$noremote) {
- # We have new mail and remote is up
- $newmail= 'swmenu.setstatus("you have","messages");';
- }
-
- my ($breadcrumb,$separator);
- if ($noremote
- && ($env{'request.symb'})
- && ($env{'request.course.id'})) {
+ if ( $env{'request.symb'} && $env{'request.course.id'} ) {
my ($mapurl,$rid,$resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};
@@ -434,22 +389,11 @@
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb(@crumbs);
#$breadcrumb .= &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0);
- unless (($env{'request.state'} eq 'edit') || ($newmail) ||
- ($env{'request.state'} eq 'construct') ||
- ($env{'form.register'})) {
- $separator = &Apache::loncommon::head_subbox();
- }
- #
}
- if ($env{'request.state'} eq 'construct') {
- $newmail = $titletable;
- }
- my $timesync = ( $noremote ? '' : 'swmenu.syncclock(1000*'.time.');' );
- my $tablestart = ( $noremote ? '<table id="LC_menubuttons">' : '');
- my $tableend = ( $noremote ? '</table>' : '');
# =============================================================================
# ============================ This is for URLs that actually can be registered
- if (($env{'request.noversionuri'}!~m{^/(res/)*adm/}) || ($forcereg)) {
+ return '' unless ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/})
+ || $forcereg );
# -- This applies to homework problems for users with grading privileges
my $crs='/'.$env{'request.course.id'};
if ($env{'request.course.sec'}) {
@@ -619,14 +563,12 @@
s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document
ENDMENUITEMS
}
- if ($noremote) {
if (ref($bread_crumbs) eq 'ARRAY') {
&Apache::lonhtmlcommon::clear_breadcrumbs();
foreach my $crumb (@{$bread_crumbs}){
&Apache::lonhtmlcommon::add_breadcrumb($crumb);
}
}
- }
} elsif ( defined($env{'request.course.id'}) &&
$env{'request.symb'} ne '' ) {
#
@@ -656,13 +598,6 @@
$menuitems.="&anno-[_1]&tations[_1]&annotate()&";
$menuitems.="Make notes and annotations about this resource&&1\n";
- unless ($noremote) {
- my $showreqcrs = &check_for_rcrs();
- if ($showreqcrs) {
- $menuitems.="s&8&1&rcrs.gif&request[_1]&course[_16]".
- "&go('/adm/requestcourse')&Course requests\n";
- }
- }
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) {
$menuitems.=(<<ENDREALRES);
@@ -699,10 +634,8 @@
}
}
- if ($noremote) {
my $addremote=0;
foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
- my $inlinebuttons='';
if ($addremote) {
Apache::lonhtmlcommon::clear_breadcrumb_tools();
@@ -727,154 +660,11 @@
Apache::lonhtmlcommon::add_breadcrumb_tool(
'advtools', @inlineremote[61,71,72,73,92]);
}
-
-# # Registered, textual output
-# if ( $env{'environment.icons'} eq 'iconsonly' ) {
-# $inlinebuttons = (<<ENDARROWSINLINE);
-#<tr><td>
-#$inlineremote[21] $inlineremote[23]
-#ENDARROWSINLINE
-# if ( &hidden_button_check() ne 'yes' ) {
-# $inlinebuttons .= (<<ENDINLINEICONS);
-#$inlineremote[61] $inlineremote[63]
-#$inlineremote[71] $inlineremote[72] $inlineremote[73]
-#$inlineremote[81] $inlineremote[82] $inlineremote[83]
-#$inlineremote[91] $inlineremote[92] $inlineremote[93]</td></tr>
-#ENDINLINEICONS
-# }
-# } else { # not iconsonly
-# if ( $inlineremote[21] ne '' || $inlineremote[23] ne '' ) {
-# $inlinebuttons = (<<ENDFIRSTLINE);
-#<tr><td>$inlineremote[21]</td><td> </td><td>$inlineremote[23]</td></tr>
-#ENDFIRSTLINE
-# }
-# if ( &hidden_button_check() ne 'yes' ) {
-# foreach my $row ( 6 .. 9 ) {
-# if ( $inlineremote[ ${row} . '1' ] ne ''
-# || $inlineremote[ $row . '2' ] ne ''
-# || $inlineremote[ $row . '3' ] ne '' )
-# {
-# $inlinebuttons .= <<"ENDLINE";
-#<tr><td>$inlineremote["${row}1"]</td><td>$inlineremote["${row}2"]</td><td>$inlineremote["${row}3"]</td></tr>
-#ENDLINE
-# }
-# }
-# }
-# }
- }
- $breadcrumb = &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0);
- $result =(<<ENDREGTEXT);
-<script type="text/javascript">
-// BEGIN LON-CAPA Internal
-</script>
-$timesync
-$breadcrumb
-<!-- $tablestart -->
-<!-- $inlinebuttons -->
-<!-- $tableend -->
-$newmail
-<!-- $separator -->
-<script type="text/javascript">
-// END LON-CAPA Internal
-</script>
-
-ENDREGTEXT
-# Registered, graphical output
- } else {
- my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
- $requri=&Apache::lonenc::check_encrypt(&unescape($requri));
- my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
- my $navstatus=&get_nav_status();
- my $clearcstr;
-
- if ($env{'user.adv'}) { $clearcstr='clearbut(6,1)'; }
- $result = (<<ENDREGTHIS);
-
-<script type="text/javascript">
-// <![CDATA[
-// BEGIN LON-CAPA Internal
-var swmenu=null;
-
- function LONCAPAreg() {
- swmenu=$reopen;
- swmenu.clearTimeout(swmenu.menucltim);
- $timesync
- $newmail
- $buttons
- swmenu.currentURL="$requri";
- swmenu.reloadURL=swmenu.currentURL+window.location.search;
- swmenu.currentSymb="$cursymb";
- swmenu.reloadSymb="$cursymb";
- swmenu.currentStale=0;
- $navstatus
- $hwkadd
- $editbutton
- }
-
- function LONCAPAstale() {
- swmenu=$reopen
- swmenu.currentStale=1;
- if (swmenu.reloadURL!='' && swmenu.reloadURL!= null) {
- swmenu.switchbutton
- (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence');
- }
- swmenu.clearbut(7,2);
- swmenu.clearbut(7,3);
- swmenu.menucltim=swmenu.setTimeout(
- 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
- 'clearbut(9,1);clearbut(9,3);clearbut(6,3);$clearcstr',
- 2000);
- }
-
-// END LON-CAPA Internal
-// ]]>
-</script>
-ENDREGTHIS
- }
-# =============================================================================
- } else {
-# ========================================== This can or will not be registered
- if ($noremote) {
-# Not registered
- $result= (<<ENDDONOTREGTEXT);
-ENDDONOTREGTEXT
- } else {
-# Not registered, graphical
- $result = (<<ENDDONOTREGTHIS);
-
-<script type="text/javascript">
-// <![CDATA[
-// BEGIN LON-CAPA Internal
-var swmenu=null;
-
- function LONCAPAreg() {
- swmenu=$reopen
- $timesync
- swmenu.currentStale=1;
- swmenu.clearbut(2,1);
- swmenu.clearbut(2,3);
- swmenu.clearbut(8,1);
- swmenu.clearbut(8,2);
- swmenu.clearbut(8,3);
- if (swmenu.currentURL) {
- swmenu.switchbutton
- (3,1,'reload.gif','return','location','go(currentURL)');
- } else {
- swmenu.clearbut(3,1);
- }
- }
-
- function LONCAPAstale() {
}
-// END LON-CAPA Internal
-// ]]>
-</script>
-ENDDONOTREGTHIS
- }
-# =============================================================================
- }
- return $result;
+ return Apache::lonhtmlcommon::scripttag('', 'start')
+ . Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
+ . Apache::lonhtmlcommon::scripttag('', 'end');
}
sub is_course_upload {
@@ -925,176 +715,22 @@
return 'LONCAPAstale();';
}
-
-sub startupremote {
- my ($lowerurl)=@_;
- if ($env{'environment.remote'} eq 'off') {
- return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
- }
-#
-# The Remote actually gets launched!
-#
- my $configmenu=&rawconfig();
- my $esclowerurl=&escape($lowerurl);
- my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
- return(<<ENDREMOTESTARTUP);
-<script type="text/javascript">
-// <![CDATA[
-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 {
- if (window.status=='/') {
- window.status='-';
- } else {
- if (window.status=='-') {
- window.status='\\\\';
- } else {
- if (window.status=='\\\\') { window.status='|'; }
- }
- }
- }
-}
-
-// ---------------------------------------------------------- The wait function
-var canceltim;
-function wait() {
- if ((menuloaded==1) || (tim==1)) {
- window.status='Done.';
- if (tim==0) {
- clearTimeout(canceltim);
- $configmenu
- window.location='$lowerurl';
- } else {
- window.location='/adm/remote?action=collapse&url=$esclowerurl';
- }
- } else {
- wheelswitch();
- setTimeout('wait();',200);
- }
-}
-
-function main() {
- canceltim=setTimeout('tim=1;',30000);
- window.status='-';
- var date=new Date();
- timestart=date.getTime();
- wait();
-}
-
-// ]]>
-</script>
-ENDREMOTESTARTUP
-}
-
-sub setflags() {
- return(<<ENDSETFLAGS);
-<script type="text/javascript">
-// <![CDATA[
- menuloaded=0;
- tim=0;
-// ]]>
-</script>
-ENDSETFLAGS
-}
-
-sub maincall() {
- if ($env{'environment.remote'} eq 'off') { return ''; }
- return(<<ENDMAINCALL);
-<script type="text/javascript">
-// <![CDATA[
- main();
-// ]]>
-</script>
-ENDMAINCALL
-}
-
-sub load_remote_msg {
- my ($lowerurl)=@_;
-
- if ($env{'environment.remote'} eq 'off') { return ''; }
-
- my $esclowerurl=&escape($lowerurl);
- my $link=&mt('[_1]Continue[_2] on in Inline Menu mode'
- ,'<a href="/adm/remote?action=collapse&url='.$esclowerurl.'">'
- ,'</a>');
- return(<<ENDREMOTEFORM);
-<p>
-<form name="wheel">
-<input name="spin" type="text" size="60" />
-</form>
-</p>
-<p>$link</p>
-ENDREMOTEFORM
-}
-
sub get_menu_name {
my $hostid = $Apache::lonnet::perlvar{'lonHostID'};
$hostid =~ s/\W//g;
return 'LCmenu'.$hostid;
}
-
-sub reopenmenu {
- if ($env{'environment.remote'} eq 'off') { return ''; }
- my $menuname = &get_menu_name();
- my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
- return('window.open('.$nothing.',"'.$menuname.'","",false);');
-}
-
-
-sub open {
- my $returnval='';
- if ($env{'environment.remote'} eq 'off') {
- return
- '<script type="text/javascript">'."\n"
- .'// <![CDATA['."\n"
- .'self.name="loncapaclient";'."\n"
- .'// ]]>'."\n"
- .'</script>';
- }
- my $menuname = &get_menu_name();
-
-# unless (shift eq 'unix') {
-# resizing does not work on linux because of virtual desktop sizes
-# $returnval.=(<<ENDRESIZE);
-#if (window.screen) {
-# self.resizeTo(screen.availWidth-215,screen.availHeight-55);
-# self.moveTo(190,15);
-#}
-#ENDRESIZE
-# }
- $returnval=(<<ENDOPEN);
-// <![CDATA[
-window.status='Opening LON-CAPA Remote Control';
-var menu=window.open("/res/adm/pages/menu.html?inhibitmenu=yes","$menuname",
-"height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
-self.name='loncapaclient';
-// ]]>
-ENDOPEN
- return '<script type="text/javascript">'.$returnval.'</script>';
-}
-
-
# ================================================================== Raw Config
+#SD
+#this is called by
+#lonmenu
+#
sub clear {
my ($row,$col)=@_;
- unless ($env{'environment.remote'} eq 'off') {
- if (($row<1) || ($row>13)) { return ''; }
- return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););
- } else {
- $inlineremote[10*$row+$col]='';
- return '';
- }
+ $inlineremote[10*$row+$col]='';
+ return '';
}
# ============================================ Switch a button or create a link
@@ -1108,22 +744,11 @@
$top=&mt($top);
$bot=&mt($bot);
$desc=&mt($desc);
- if (($env{'environment.remote'} ne 'off') || ($env{'environment.icons'} eq 'classic')) {
- $img=&mt($img);
- }
my $idx=10*$row+$col;
$category_members{$cat}.=':'.$idx;
- unless ($env{'environment.remote'} eq 'off') {
- if (($row<1) || ($row>13)) { return ''; }
-# Remote
- return "\n".
- qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
- } else {
# Inline Remote
- if ($env{'environment.icons'} ne 'classic') {
- $img=~s/\.gif$/\.png/;
- }
+ $img=~s/\.gif$/\.png/;
if ($nobreak==2) { return ''; }
my $text=$top.' '.$bot;
$text=~s/\s*\-\s*//gs;
@@ -1153,6 +778,7 @@
}
} else {
# Inline Menu
+#SD look here
if ($env{'environment.icons'} eq 'iconsonly') {
$inlineremote[$idx]='<a title="'.$desc.'" href="javascript:'.$act.';">'.$pic.'</a>';
} else {
@@ -1161,7 +787,6 @@
'<span class="LC_menubuttons_inline_text">'.$desc.'</span></a>';
}
}
- }
return '';
}
@@ -1179,13 +804,6 @@
return $output;
}
-sub openmenu {
- my $menuname = &get_menu_name();
- if ($env{'environment.remote'} eq 'off') { return ''; }
- my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
- return "window.open(".$nothing.",'".$menuname."');";
-}
-
sub inlinemenu {
undef(@inlineremote);
undef(%category_members);
@@ -1228,13 +846,7 @@
#
my $textualoverride=shift;
my $output='';
- unless ($env{'environment.remote'} eq 'off') {
- $output.=
- "window.status='Opening Remote Control';var swmenu=".&openmenu().
-"\nwindow.status='Configuring Remote Control ';";
- } else {
- unless ($textualoverride) { return ''; }
- }
+ return '' unless $textualoverride;
my $uname=$env{'user.name'};
my $udom=$env{'user.domain'};
my $adv=$env{'user.adv'};
@@ -1408,13 +1020,6 @@
$uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
}
}
- unless ($env{'environment.remote'} eq 'off') {
- $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';";
- if (&Apache::lonmsg::newmail()) {
- $output.='swmenu.setstatus("you have","messages");';
- }
- }
-
return $output;
}
@@ -1440,34 +1045,8 @@
return $showreqcrs;
}
-# ======================================================================= Close
-
-sub close {
- if ($env{'environment.remote'} eq 'off') { return ''; }
- my $menuname = &get_menu_name();
- return(<<ENDCLOSE);
-<script type="text/javascript">
-// <![CDATA[
-window.status='Accessing Remote Control';
-menu=window.open("/adm/rat/empty.html","$menuname",
- "height=350,width=150,scrollbars=no,menubar=no");
-window.status='Disabling Remote Control';
-menu.active=0;
-menu.autologout=0;
-window.status='Closing Remote Control';
-menu.close();
-window.status='Done.';
-// ]]>
-</script>
-ENDCLOSE
-}
-
# ====================================================================== Footer
-sub footer {
-
-}
-
sub nav_control_js {
my $nav=($env{'environment.remotenavmap'} eq 'on');
return (<<NAVCONTROL);
@@ -1511,16 +1090,10 @@
}
sub utilityfunctions {
- my $caller = shift;
- unless ($env{'environment.remote'} eq 'off' ||
- $caller eq '/adm/menu') {
- return ''; }
-
my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
- if ($currenturl =~ m{^/adm/wrapper/ext/}) {
- if ($env{'request.external.querystring'}) {
+ if ($currenturl =~ m{^/adm/wrapper/ext/}
+ && $env{'request.external.querystring'} ) {
$currenturl .= ($currenturl=~/\?/)?'&':'?'.$env{'request.external.querystring'};
- }
}
$currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
Index: loncom/interface/lonnavdisplay.pm
diff -u loncom/interface/lonnavdisplay.pm:1.13 loncom/interface/lonnavdisplay.pm:1.14
--- loncom/interface/lonnavdisplay.pm:1.13 Tue Sep 8 20:56:47 2009
+++ loncom/interface/lonnavdisplay.pm Wed Mar 10 21:25:50 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavdisplay.pm,v 1.13 2009/09/08 20:56:47 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.14 2010/03/10 21:25:50 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -72,23 +72,15 @@
if ($ENV{QUERY_STRING} eq 'collapseExternal') {
&Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
&Apache::lonnet::appenv({'environment.remotenavmap' => 'off'});
- my $menu=&Apache::lonmenu::reopenmenu();
+ my $menu='';
my $navstatus=&Apache::lonmenu::get_nav_status();
- if ($menu) {
- $menu=(<<MENU)
- swmenu=$menu
- swmenu.clearTimeout(swmenu.menucltim);
- $navstatus
+ my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
+ my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
+ $menu=(<<MENU);
+ swmenu=$mainwindow
+ $navstatus
MENU
- } else {
- my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
- my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
- $menu=(<<MENU)
- swmenu=$mainwindow
- $navstatus
-MENU
- }
- $r->send_http_header;
+ $r->send_http_header;
my $js =<<"ENDSUBM";
<script type="text/javascript">
function submitthis() {
@@ -111,7 +103,7 @@
if ($ENV{QUERY_STRING} =~ /^launchExternal/) {
&Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
&Apache::lonnet::appenv({'environment.remotenavmap' => 'on'});
- my $menu=&Apache::lonmenu::reopenmenu();
+ my $menu='';
my $navstatus=&Apache::lonmenu::get_nav_status();
if ($menu) {
$r->print(<<MENU);
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.184 loncom/interface/lonpreferences.pm:1.185
--- loncom/interface/lonpreferences.pm:1.184 Wed Mar 10 20:36:01 2010
+++ loncom/interface/lonpreferences.pm Wed Mar 10 21:25:50 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.184 2010/03/10 20:36:01 faziophi Exp $
+# $Id: lonpreferences.pm,v 1.185 2010/03/10 21:25:50 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -117,7 +117,7 @@
my $switchon=&mt('Enable WYSIWYG editor');
my $warning='';
if ($env{'user.adv'}) {
- $warning.="<p>".&mt("The WYSIWYG editor only supports simple HTML and is in many cases unsuited for advanced authoring. In a number of cases, it may destroy advanced authoring involving LaTeX and script function calls.")."</p>";
+ $warning.='<p class="LC_warning">'.&mt("The WYSIWYG editor only supports simple HTML and is in many cases unsuited for advanced authoring. In a number of cases, it may destroy advanced authoring involving LaTeX and script function calls.")."</p>";
}
$r->print(<<ENDLSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
@@ -1875,25 +1875,6 @@
},
]
},
- { categorytitle=>'Page Display Settings',
- items =>[
- { linktext => 'Color Scheme',
- url => '/adm/preferences?action=changecolors',
- permission => 'F',
- #help => 'Change_Colors',
- icon => 'preferences-desktop-theme.png',
- linktitle => 'Change LON-CAPA default colors.'
- },
- { linktext => 'Menu Display',
- url => '/adm/preferences?action=changeicons',
- permission => 'F',
- #help => '',
- icon => 'preferences-system-windows.png',
- linktitle => 'Change whether the menus are displayed with buttons, icons or icons and text.'
- }
-
- ]
- },
{ categorytitle=>'Content Display Settings',
items =>[
{ linktext => 'Language',
@@ -1919,6 +1900,25 @@
},
]
},
+ { categorytitle=>'Page Display Settings',
+ items =>[
+ { linktext => 'Color Scheme',
+ url => '/adm/preferences?action=changecolors',
+ permission => 'F',
+ #help => 'Change_Colors',
+ icon => 'preferences-desktop-theme.png',
+ linktitle => 'Change LON-CAPA default colors.'
+ },
+ { linktext => 'Menu Display',
+ url => '/adm/preferences?action=changeicons',
+ permission => 'F',
+ #help => '',
+ icon => 'preferences-system-windows.png',
+ linktitle => 'Change whether the menus are displayed with buttons, icons or icons and text.'
+ }
+
+ ]
+ },
{ categorytitle=>'Messages & Notifications',
items =>[
{ linktext => 'Messages & Notifications',
@@ -1960,25 +1960,6 @@
linktitle => 'Change your password.',
});
}
- if ($env{'environment.remote'} eq 'off') {
-push(@{ $menu[1]->{items} }, {
- linktext => 'Launch Remote Control',
- url => '/adm/remote?url=/adm/preferences&action=launch',
- permission => 'F',
- #help => '',
- icon => 'remotecontrol.png',
- linktitle => 'Launch the remote control for LON-CAPA.',
- });
- }else{
-push(@{ $menu[1]->{items} }, {
- linktext => 'Collapse Remote Control',
- url => '/adm/remote?url=/adm/preferences&action=collapse',
- permission => 'F',
- #help => '',
- icon => 'remotecontrol.png',
- linktitle => 'Collapse the remote control for LON-CAPA.',
- });
- }
my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
if (keys(%author_roles) > 0) {
push(@{ $menu[4]->{items} }, {
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.365 loncom/localize/localize/de.pm:1.366
--- loncom/localize/localize/de.pm:1.365 Wed Mar 10 18:11:10 2010
+++ loncom/localize/localize/de.pm Wed Mar 10 21:25:56 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.365 2010/03/10 18:11:10 bisitz Exp $
+# $Id: de.pm,v 1.366 2010/03/10 21:25:56 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -365,9 +365,6 @@
'Instructor'
=> 'Dozent',
- 'Launch Remote Control'
-=> 'Fernbedienung aktivieren',
-
'Main Menu'
=> 'Hauptmenü',
@@ -5702,9 +5699,6 @@
'Has New Discussion'
=> 'Neue Diskussionsbeiträge',
- '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.'
-=> 'Das Starten der Fernbedienung wird scheitern, wenn ein Filter gegen Pop-Up-Fenster aktiviert ist. Um die Fernbedienung zu verwenden, deaktivieren Sie diesen Filter für diese Webseite.',
-
'Navigate Course Content'
=> 'Inhaltsverzeichnis',
@@ -5762,30 +5756,9 @@
'Sorted by'
=> 'Sortiert nach',
- 'The external menu (Remote Control) has been disabled, and you will be working with the smaller inline menu.'
-=> 'Die Fernbedienung wurde deaktiviert und durch das Kopfzeilenmenu ersetzt.',
-
- 'You may have either closed the Remote Control window, or it was blocked by a pop-up window filter in your browser.'
-=> 'Sie haben entweder das Fernbedienungsfenster geschlossen oder es wurde durch einen Filter für Pop-Up-Fenster von Ihrem Webbrowser geblockt.',
-
- 'To use the Remote Control, disable the filter for this site, and re-launch the Remote Control.'
-=> ' Um die Fernbedienung zu verwenden, deaktivieren Sie den Filter für diese Webseite und aktivieren Sie erneut die Fernbedienung.',
-
- 'Re-launch Remote Control'
-=> 'Fernbedienung erneut aktivieren',
-
- 'Continue without Remote Control'
-=> 'Weiter ohne Fernbedienung',
-
- '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].'
-=> 'Vorausgesetzt, dass keine Pop-Up-Blocker aktiv sind, können Sie die Fernbedienung in den [_1]Benutzereinstellungen[_2] (erreichbar über das [_3]Hauptmenü[_2]) jederzeit erneut aktivieren.',
-
'There are several possibilities of where to go next'
=> 'Es gibt mehrere Möglichkeiten, wohin Sie als nächstes gehen können',
- 'To use the Remote Control, disable the filter for this site, and re-launch the Remote Control from the inline menu.'
-=> 'Um die Fernbedienung zu verwenden, deaktivieren Sie den Filter gegen Pop-Up-Fenster für diese Webseite und starten die Fernbedienung aus dem Kopfzeilenmenü erneut.',
-
'Toggle read/unread'
=> 'Umschalten zwischen gelesen/ungelesen',
@@ -7060,7 +7033,6 @@
=> 'Auswahl der anzuzeigenden Aufgabenteile',
'Set Parameter Setting Default Actions'
-#SD => 'Setze Parameter-Einstellungen für Default-Aktionen',
=> 'Standardaktionen für Parametereinstellungen',
'Set Portfolio Metadata'
@@ -16308,7 +16280,6 @@
'If a course or community is [_1]not[_2] in your list of current courses and communities below, you may be able to enroll if self-enrollment is permitted.'
=> 'Falls ein Kurs in der folgenden Liste Ihrer derzeitigen Kurse [_1]nicht[_2] angezeigt wird, können Sie sich in der Kursübersicht in diesen Kurs selbst eintragen, sofern die Selbsteintragung für diesen Kurs aktiviert ist.',
-#SD begin 2008-07-02
'When'
=> 'Wann',
@@ -16528,8 +16499,6 @@
'An error occurred when saving changes to self-enrollment settings in this course.'
=> 'Ein Fehler trat während des Speicherns der Änderungen an den Selbsteintragungs-Einstellungen in diesem Kurs auf.',
-#SD end 2008-07-02
-
'Server Switch Required'
=> 'Serverwechsel erforderlich',
Index: loncom/publisher/lonconstruct.pm
diff -u loncom/publisher/lonconstruct.pm:1.35 loncom/publisher/lonconstruct.pm:1.36
--- loncom/publisher/lonconstruct.pm:1.35 Wed Nov 19 19:15:02 2008
+++ loncom/publisher/lonconstruct.pm Wed Mar 10 21:26:04 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Page Wrapper for Construction
#
-# $Id: lonconstruct.pm,v 1.35 2008/11/19 19:15:02 jms Exp $
+# $Id: lonconstruct.pm,v 1.36 2010/03/10 21:26:04 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -117,16 +117,6 @@
$lowerframe.='?editmode=Edit&problemmode=edit';
}
-#
-# Checking to see if we should display the topframe
-#
- my $toprows = 0;
- my $topsrc = '';
- if ($env{'environment.remote'} ne 'off') {
- $toprows = '110';
- $topsrc = '/adm/localize/adm/publisher.html';
- }
-
my $js=qq|
<script type="text/javascript">
var lastknownpriv="$lowerframe";
@@ -137,14 +127,16 @@
&Apache::loncommon::start_page('Construction Space',$js,
{'frameset' => 1,
'add_entries' => {
- 'rows' => "$toprows,*",
+ 'rows' => "0,*",
'border' => "0",}});
my $end_page=
&Apache::loncommon::end_page({'frameset' => 1});
+
+#SD this entire frameset should be obsolete?!
$r->print(<<ENDPAGE);
$start_page
-<frame src='$topsrc' />
+<frame src='' />
<frame src="$lowerframe" name="LONCAPAToBePublished" />
$end_page
ENDPAGE
Index: loncom/publisher/lonpubdir.pm
diff -u loncom/publisher/lonpubdir.pm:1.125 loncom/publisher/lonpubdir.pm:1.126
--- loncom/publisher/lonpubdir.pm:1.125 Wed Nov 18 20:48:06 2009
+++ loncom/publisher/lonpubdir.pm Wed Mar 10 21:26:04 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.125 2009/11/18 20:48:06 droeschl Exp $
+# $Id: lonpubdir.pm,v 1.126 2010/03/10 21:26:04 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -93,12 +93,8 @@
my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
&startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page.
- if ($env{'environment.remote'} eq 'off') {
- &dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory,
+ &dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory,
# browse/upload + new file page.
- } else {
- &pubbuttons($r,$uname,$thisdisfn);
- }
&resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.
my $numdir = 0;
@@ -209,13 +205,8 @@
# breadcrumbs (and tools) will be created
# in start_page->bodytag->innerregister
- if ($env{'environment.remote'} eq 'off') {
- $env{'request.noversionuri'}=$currdir.'/';
- $r->print(&Apache::loncommon::start_page('Construction Space',undef));
- } else {
- $r->print(&Apache::loncommon::start_page('Construction Space',undef,
- { 'only_body' => 1,}));
- }
+ $env{'request.noversionuri'}=$currdir.'/';
+ $r->print(&Apache::loncommon::start_page('Construction Space',undef));
$r->print(&Apache::loncommon::head_subbox(
&Apache::loncommon::CSTR_pageheader(1)));
@@ -331,11 +322,6 @@
</script>
ENDPUBDIRSCRIPT
$r->print($pubdirscript);
-
- if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) &&
- $env{'environment.remote'} ne 'off') {
- $r->print('<h3>'.&mt('Co-Author [_1]',$uname.':'.$udom).'</h3>');
- }
}
sub dircontrols {
@@ -448,17 +434,6 @@
END
}
-sub pubbuttons {
- my ($r,$uname,$thisdisfn) = @_;
- $r->print('<form method="post" action="/adm/publish" target="_parent">'.
- '<table><tr><td><input type="hidden" name="filename" value="/~'.
- $uname.$thisdisfn.'/" />'.
- '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
-'<input type="button" onclick="window.location='."'/~".
- $uname.$thisdisfn."/default.meta'".'" value="'.
-&mt('Edit Directory Metadata').'" /></td></tr></table></form>');
-}
-
sub resourceactions {
my ($r,$uname,$udom,$thisdisfn) = @_;
$r->print(<<END);
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.505 loncom/xml/lonxml.pm:1.506
--- loncom/xml/lonxml.pm:1.505 Mon Feb 8 00:35:06 2010
+++ loncom/xml/lonxml.pm Wed Mar 10 21:26:10 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.505 2010/02/08 00:35:06 raeburn Exp $
+# $Id: lonxml.pm,v 1.506 2010/03/10 21:26:10 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1855,26 +1855,22 @@
'<tr><td><b><pre>'.$result.
'</pre></b></td></tr></table>';
}
- if ($env{'environment.remote'} eq 'off') {
- my $brcrum;
- if ($env{'request.state'} eq 'construct') {
- $brcrum = [{'href' => &Apache::loncommon::authorspace(),
- 'text' => 'Construction Space'},
- {'href' => '',
- 'text' => $breadcrumbtext}];
- } else {
- $brcrum = ''; # FIXME: Where are we?
- }
- my %options = ('bread_crumbs' => $brcrum,
- 'bgcolor' => '#FFFFFF');
- $result =
- &Apache::loncommon::start_page(undef,undef,\%options)
- .$controls
- .$result
- .&Apache::loncommon::end_page();
+ my $brcrum;
+ if ($env{'request.state'} eq 'construct') {
+ $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+ 'text' => 'Construction Space'},
+ {'href' => '',
+ 'text' => $breadcrumbtext}];
} else {
- $result = $controls.$result;
+ $brcrum = ''; # FIXME: Where are we?
}
+ my %options = ('bread_crumbs' => $brcrum,
+ 'bgcolor' => '#FFFFFF');
+ $result =
+ &Apache::loncommon::start_page(undef,undef,\%options)
+ .$controls
+ .$result
+ .&Apache::loncommon::end_page();
}
}
}
@@ -1905,10 +1901,6 @@
$header = &Apache::loncommon::head_subbox(
&Apache::loncommon::CSTR_pageheader());
}
- if ($env{'environment.remote'} ne 'off') {
- $options{'bgcolor'} = '#FFFFFF';
- $options{'only_body'} = 1;
- }
my $js =
&Apache::edit::js_change_detection().
&Apache::loncommon::resize_textarea_js();
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.98 rat/lonratedt.pm:1.99
--- rat/lonratedt.pm:1.98 Fri Dec 4 11:13:58 2009
+++ rat/lonratedt.pm Wed Mar 10 21:26:15 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.98 2009/12/04 11:13:58 bisitz Exp $
+# $Id: lonratedt.pm,v 1.99 2010/03/10 21:26:15 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -43,12 +43,8 @@
# --------------------------------------------------------- Build up RAT screen
sub ratedt {
my ($r,$url)=@_;
- my %layout = ('border' => "0");
- if ($env{'environment.remote'} eq 'off') {
- $layout{'rows'} = "1,250,*";
- } else {
- $layout{'rows'} = "1,70,*";
- }
+ my %layout = ('border' => "0",
+ 'rows' => "1,250,*");
my $js ='
<script type="text/javascript">
var flag=0;
--droeschl1268256376--