[LON-CAPA-cvs] cvs: rat / lonpage.pm lonpageflip.pm doc/loncapafiles loncapafiles.lpml loncom/auth lonlogout.pm lonroles.pm switchserver.pm loncom/homework lonhomework.pm loncom/html/res/adm/pages close-navigation.gif homeworkmenu.html imgmaps.html start-navigation.gif loncom/interface loncommon.pm lonmenu.pm lonnavdisplay.pm lonnavmaps.pm lonpreferences.pm mydesk.tab loncom/localize/localize de.pm
droeschl
droeschl@source.lon-capa.org
Tue, 16 Mar 2010 19:56:03 -0000
This is a MIME encoded message
--droeschl1268769363
Content-Type: text/plain
droeschl Tue Mar 16 19:56:03 2010 EDT
Removed files:
/loncom/html/res/adm/pages close-navigation.gif homeworkmenu.html
imgmaps.html start-navigation.gif
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom/auth lonlogout.pm lonroles.pm switchserver.pm
/loncom/homework lonhomework.pm
/loncom/interface loncommon.pm lonmenu.pm lonnavdisplay.pm
lonnavmaps.pm lonpreferences.pm mydesk.tab
/loncom/localize/localize de.pm
/rat lonpage.pm lonpageflip.pm
Log:
In process of removing remote control, remote navmap and different icon modes code
- mostly remote navmap related code and files removed
- some minor refactoring
- some translations added/removed
--droeschl1268769363
Content-Type: text/plain
Content-Disposition: attachment; filename="droeschl-20100316195603.txt"
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.678 doc/loncapafiles/loncapafiles.lpml:1.679
--- doc/loncapafiles/loncapafiles.lpml:1.678 Mon Mar 15 00:14:05 2010
+++ doc/loncapafiles/loncapafiles.lpml Tue Mar 16 19:55:25 2010
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.678 2010/03/15 00:14:05 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.679 2010/03/16 19:55:25 droeschl Exp $ -->
<!--
@@ -4670,7 +4670,7 @@
<target dist='default'>home/httpd/lib/perl/Apache/lonmenu.pm</target>
<categoryname>handler</categoryname>
<description>
-Has routines which control the remote control.
+Has routines which control the inline menu.
</description>
<status>works/unverified</status>
</file>
@@ -4727,15 +4727,6 @@
<status>works/unverified</status>
</file>
<file>
-<source>loncom/html/res/adm/pages/homeworkmenu.html</source>
-<target dist='default'>home/httpd/html/res/adm/pages/homeworkmenu.html</target>
-<categoryname>handler</categoryname>
-<description>
-Homework remote control.
-</description>
-<status>works/unverified</status>
-</file>
-<file>
<source>loncom/html/res/adm/pages/chatroom.html</source>
<target dist='default'>home/httpd/html/res/adm/pages/chatroom.html</target>
<categoryname>handler</categoryname>
@@ -6592,7 +6583,6 @@
<filenames>
chat.gif;
close-all-folders.gif;
-close-navigation.gif;
dempty.gif;
empty.gif;
feedback.gif;
@@ -6611,7 +6601,6 @@
qempty.gif;
show-all.gif;
show-incomplete-problems.gif;
-start-navigation.gif;
</filenames>
</fileglob>
<fileglob>
@@ -6756,14 +6745,6 @@
</description>
</file>
<file>
-<source>loncom/html/res/adm/pages/imgmaps.html</source>
-<target dist='default'>home/httpd/html/res/adm/pages/imgmaps.html</target>
-<categoryname>interface file</categoryname>
-<description>
-image maps for the LON-CAPA remote control
-</description>
-</file>
-<file>
<source>loncom/html/res/adm/pages/index.html</source>
<target dist='default'>home/httpd/html/res/adm/pages/index.html</target>
<categoryname>interface file</categoryname>
Index: loncom/auth/lonlogout.pm
diff -u loncom/auth/lonlogout.pm:1.39 loncom/auth/lonlogout.pm:1.40
--- loncom/auth/lonlogout.pm:1.39 Wed Mar 10 21:25:29 2010
+++ loncom/auth/lonlogout.pm Tue Mar 16 19:55:31 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Logout Handler
#
-# $Id: lonlogout.pm,v 1.39 2010/03/10 21:25:29 droeschl Exp $
+# $Id: lonlogout.pm,v 1.40 2010/03/16 19:55:31 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -89,7 +89,6 @@
return OK if $r->header_only;
# -------------------------------------------------------- Menu script and info
- my $windowinfo=&Apache::lonnavmaps::close();
# ---------------------------------------------------------------- Get handover
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']);
my $switch='';
@@ -150,7 +149,6 @@
# --------------------------------------------------------------- Screen Output
$r->print(<<ENDDOCUMENT);
$start_page
-$windowinfo
$relogmessage
$end_page
ENDDOCUMENT
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.244 loncom/auth/lonroles.pm:1.245
--- loncom/auth/lonroles.pm:1.244 Mon Jan 18 17:15:47 2010
+++ loncom/auth/lonroles.pm Tue Mar 16 19:55:31 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.244 2010/01/18 17:15:47 raeburn Exp $
+# $Id: lonroles.pm,v 1.245 2010/03/16 19:55:31 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -145,19 +145,11 @@
sub redirect_user {
- my ($r,$title,$url,$msg,$launch_nav) = @_;
+ my ($r,$title,$url,$msg) = @_;
$msg = $title if (! defined($msg));
&Apache::loncommon::content_type($r,'text/html');
&Apache::loncommon::no_cache($r);
$r->send_http_header;
- my $swinfo=&Apache::lonmenu::rawconfig();
- my $navwindow;
- if ($launch_nav eq 'on') {
- $navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef,
- ($url =~ m-^/adm/whatsnew-));
- } else {
- $navwindow.=&Apache::lonnavmaps::close();
- }
# Breadcrumbs
my $brcrum = [{'href' => $url,
@@ -172,12 +164,6 @@
$url=~s/ /\%20/g;
$r->print(<<ENDREDIR);
$start_page
-<script type="text/javascript">
-// <![CDATA[
-$swinfo
-// ]]>
-</script>
-$navwindow
<p>$msg</p>
$end_page
ENDREDIR
@@ -503,10 +489,9 @@
my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&');
$dest .= '?symb='.$esc_symb;
}
- &redirect_user($r,&mt('Entering [_1]',
- $env{'course.'.$courseid.'.description'}),
- $dest,$msg,
- $env{'environment.remotenavmap'});
+ &redirect_user($r, &mt('Entering [_1]',
+ $env{'course.'.$courseid.'.description'}),
+ $dest, $msg);
return OK;
}
if (&Apache::lonnet::allowed('whn',
@@ -519,9 +504,8 @@
unless ($startpage eq 'firstres') {
$msg = &mt('Entering [_1] ...',
$env{'course.'.$courseid.'.description'});
- &redirect_user($r,&mt('New in course'),
- '/adm/whatsnew?refpage=start',$msg,
- $env{'environment.remotenavmap'});
+ &redirect_user($r, &mt('New in course'),
+ '/adm/whatsnew?refpage=start', $msg);
return OK;
}
}
@@ -533,10 +517,9 @@
}
$msg = &mt('Entering [_1] ...',
$env{'course.'.$courseid.'.description'});
- &redirect_user($r,&mt('Entering [_1]',
- $env{'course.'.$courseid.'.description'}),
- $furl,$msg,
- $env{'environment.remotenavmap'});
+ &redirect_user($r, &mt('Entering [_1]',
+ $env{'course.'.$courseid.'.description'}),
+ $furl, $msg);
}
return OK;
}
Index: loncom/auth/switchserver.pm
diff -u loncom/auth/switchserver.pm:1.23 loncom/auth/switchserver.pm:1.24
--- loncom/auth/switchserver.pm:1.23 Wed Mar 10 21:25:29 2010
+++ loncom/auth/switchserver.pm Tue Mar 16 19:55:31 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Switch Servers Handler
#
-# $Id: switchserver.pm,v 1.23 2010/03/10 21:25:29 droeschl Exp $
+# $Id: switchserver.pm,v 1.24 2010/03/16 19:55:31 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -122,8 +122,6 @@
}
# -------------------------------------------------------- Menu script and info
- my $windowinfo=
- &Apache::lonnavmaps::close();
# ---------------------------------------------------------------- Get handover
my %info=('ip' => $ENV{'REMOTE_ADDR'},
@@ -150,7 +148,7 @@
'&token='.$token;
# --------------------------------------------------------------- Screen Output
&Apache::lonnet::flushcourselogs();
- return &do_redirect($r,$url,0,$windowinfo);
+ return &do_redirect($r, $url, 0);
}
1;
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.318 loncom/homework/lonhomework.pm:1.319
--- loncom/homework/lonhomework.pm:1.318 Wed Mar 10 21:25:36 2010
+++ loncom/homework/lonhomework.pm Tue Mar 16 19:55:37 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.318 2010/03/10 21:25:36 droeschl Exp $
+# $Id: lonhomework.pm,v 1.319 2010/03/16 19:55:37 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -170,16 +170,6 @@
# return ';$external::target='.$target.';';
}
-sub createmenu {
- my ($which,$request)=@_;
- if ($which eq 'grade') {
- $request->print('<script type="text/javascript" language="JavaScript">
- hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote",
- "height=350,width=150,menubar=no");
- </script>');
- }
-}
-
sub proctor_checked_in {
my ($slot_name,$slot,$type)=@_;
my @possible_proctors=split(",",$slot->{'proctor'});
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.952 loncom/interface/loncommon.pm:1.953
--- loncom/interface/loncommon.pm:1.952 Tue Mar 16 16:00:42 2010
+++ loncom/interface/loncommon.pm Tue Mar 16 19:55:49 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.952 2010/03/16 16:00:42 onken Exp $
+# $Id: loncommon.pm,v 1.953 2010/03/16 19:55:49 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4536,6 +4536,7 @@
=item * $bgcolor, used to override the bgcolor on a webpage to a specific value
+#SD
#RC =item * $no_inline_link, if true and in remote mode, don't show the
#RC 'Switch To Inline Menu' link
#RC
@@ -4714,22 +4715,8 @@
delete($attr_ref->{$key});
}
}
- $attr_ref->{'onload'} =
- &Apache::lonmenu::loadevents(). $on_load;
- $attr_ref->{'onunload'}=
- &Apache::lonmenu::unloadevents().$on_unload;
- }
-
-# Accessibility font enhance
- if ($env{'browser.fontenhance'} eq 'on') {
- my $style;
- foreach my $key (keys(%{$attr_ref})) {
- if (lc($key) eq 'style') {
- $style.=$attr_ref->{$key}.';';
- delete($attr_ref->{$key});
- }
- }
- $attr_ref->{'style'}=$style.'; font-size: x-large;';
+ $attr_ref->{'onload'} = $on_load;
+ $attr_ref->{'onunload'}= $on_unload;
}
my $attr_string;
@@ -6419,14 +6406,6 @@
background-image:url(/res/adm/pages/open-first-problem.gif);
}
-a#LC_content_toolbar_launchnav {
- background-image:url(/res/adm/pages/start-navigation.gif);
-}
-
-a#LC_content_toolbar_closenav {
- background-image:url(/res/adm/pages/close-navigation.gif);
-}
-
a#LC_content_toolbar_everything {
background-image:url(/res/adm/pages/show-all.gif);
}
@@ -6569,7 +6548,7 @@
$result .= &Apache::lonhtmlcommon::htmlareaheaders();
}
if ($args->{'force_register'}) {
- $result .= &Apache::lonmenu::registerurl(1);
+ $result .= &Apache::lonmenu::registerurl();
}
if (!$args->{'no_nav_bar'}
&& !$args->{'only_body'}
@@ -10488,6 +10467,8 @@
############################################################
############################################################
+#SD
+# only Community and Course, or anything else?
sub course_type {
my ($cid) = @_;
if (!defined($cid)) {
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.317 loncom/interface/lonmenu.pm:1.318
--- loncom/interface/lonmenu.pm:1.317 Thu Mar 11 16:35:12 2010
+++ loncom/interface/lonmenu.pm Tue Mar 16 19:55:49 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.317 2010/03/11 16:35:12 droeschl Exp $
+# $Id: lonmenu.pm,v 1.318 2010/03/16 19:55:49 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -118,12 +118,6 @@
This gets called in order to register a URL, both with the Remote
and in the body of the document
-=item loadevents()
-
-=item unloadevents()
-
-=item get_menu_name()
-
=item clear()
=item switch()
@@ -259,13 +253,9 @@
&& $crstype eq 'Community';
next if $$menuitem[4] eq 'mdcCommunity'
&& $crstype ne 'Community';
- next if $$menuitem[4] =~ /^remotenav/
- && $env{'environment.remotenavmap'} ne 'on';
- next if $$menuitem[4] =~ /noremotenav/
- && $env{'environment.remotenavmap'} eq 'on';
- next if $$menuitem[4] =~ /^(no|)remotenav$/
+ next if $$menuitem[4] =~ /^Course$/
&& $crstype eq 'Community';
- next if $$menuitem[4] =~ /^(no|)remotenavCommunity$/
+ next if $$menuitem[4] =~ /^Community$/
&& $crstype ne 'Community';
next if $$menuitem[4] =~ /showgroups$/
&& !$canviewgrps
@@ -279,15 +269,6 @@
$menu .= $roles_selector ? "<li>$roles_selector</li>"
: '';
- } elsif ($env{'environment.remotenavmap'} eq 'on') {
- # open link using javascript when remote navmap is activated
- my @items = @{$menuitem};
- if ($menuitem->[4] eq 'remotenav') {
- $items[0] = "javascript:gonav('$menuitem->[0]');";
- } else {
- $items[0] = "javascript:go('$menuitem->[0]');";
- }
- $menu .= &prep_menuitem(\@items);
} else {
$menu .= &prep_menuitem(\@$menuitem);
}
@@ -330,21 +311,8 @@
sub registerurl {
- my ($forcereg) = @_;
- my $result = '';
if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
- my $force_title='';
- if ($env{'request.state'} eq 'construct') {
- $force_title=&Apache::lonxml::display_title();
- }
- return
- $result
- .'<script type="text/javascript">'."\n"
- .'// <![CDATA['."\n"
- .'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n"
- .'// ]]>'."\n"
- .'</script>'
- .$force_title;
+ return Apache::lonxml::display_title();
}
sub innerregister {
@@ -366,13 +334,12 @@
my $maptitle = &Apache::lonnet::gettitle($mapurl);
my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());
- my $contentstext;
- if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
- $contentstext = &mt('Community Contents');
- } else {
- $contentstext = &mt('Course Contents');
- }
- my @crumbs = ({text => $contentstext,
+
+#SD
+#course_type only Course and Community?
+#
+ my @crumbs = ({text => Apache::loncommon::course_type()
+ . ' Contents',
href => "Javascript:gonav('/adm/navmaps')"});
if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) {
@@ -703,24 +670,6 @@
return $cfile;
}
-sub loadevents() {
- if ($env{'request.state'} eq 'construct' ||
- $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
- return 'LONCAPAreg();';
-}
-
-sub unloadevents() {
- if ($env{'request.state'} eq 'construct' ||
- $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
- return 'LONCAPAstale();';
-}
-
-sub get_menu_name {
- my $hostid = $Apache::lonnet::perlvar{'lonHostID'};
- $hostid =~ s/\W//g;
- return 'LCmenu'.$hostid;
-}
-
# ================================================================== Raw Config
#SD
@@ -748,7 +697,6 @@
$category_members{$cat}.=':'.$idx;
# Inline Remote
-#RC $img=~s/\.gif$/\.png/;
if ($nobreak==2) { return ''; }
my $text=$top.' '.$bot;
$text=~s/\s*\-\s*//gs;
@@ -778,14 +726,9 @@
}
} else {
# Inline Menu
-#SD look here
- if ($env{'environment.icons'} eq 'iconsonly') {
- $inlineremote[$idx]='<a title="'.$desc.'" href="javascript:'.$act.';">'.$pic.'</a>';
- } else {
$inlineremote[$idx]=
'<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.
'<span class="LC_menubuttons_inline_text">'.$desc.'</span></a>';
- }
}
return '';
}
@@ -1045,25 +988,6 @@
return $showreqcrs;
}
-# ====================================================================== Footer
-
-sub nav_control_js {
- my $nav=($env{'environment.remotenavmap'} eq 'on');
- return (<<NAVCONTROL);
- var w_loncapanav_flag="$nav";
-
-
-function gonav(url) {
- if (w_loncapanav_flag != 1) {
- gopost(url,'');
- } else {
- navwindow=window.open(url,
- "loncapanav","height=600,width=400,scrollbars=1");
- }
-}
-NAVCONTROL
-}
-
sub dc_popup_js {
my %lt = &Apache::lonlocal::texthash(
more => '(More ...)',
@@ -1098,7 +1022,6 @@
$currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
- my $nav_control=&nav_control_js();
my $dc_popup_cid;
if ($env{'user.adv'} && exists($env{'user.role.dc./'.
@@ -1133,7 +1056,6 @@
var reloadURL="$currenturl";
var currentSymb="$currentsymb";
-$nav_control
$dc_popup_cid
function go(url) {
@@ -1309,19 +1231,7 @@
ENDCONSTSPACEFORM
}
-
-sub get_nav_status {
- my $navstatus="swmenu.w_loncapanav_flag=";
- if ($env{'environment.remotenavmap'} eq 'on') {
- $navstatus.="1";
- } else {
- $navstatus.="-1";
- }
- return $navstatus;
-}
-
sub hidden_button_check {
- my $hidden;
if ( $env{'request.course.id'} eq ''
|| $env{'request.role.adv'} ) {
Index: loncom/interface/lonnavdisplay.pm
diff -u loncom/interface/lonnavdisplay.pm:1.14 loncom/interface/lonnavdisplay.pm:1.15
--- loncom/interface/lonnavdisplay.pm:1.14 Wed Mar 10 21:25:50 2010
+++ loncom/interface/lonnavdisplay.pm Tue Mar 16 19:55:49 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavdisplay.pm,v 1.14 2010/03/10 21:25:50 droeschl Exp $
+# $Id: lonnavdisplay.pm,v 1.15 2010/03/16 19:55:49 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -69,55 +69,6 @@
my %toplinkitems=();
&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'blank','',
"Select Action");
- if ($ENV{QUERY_STRING} eq 'collapseExternal') {
- &Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
- &Apache::lonnet::appenv({'environment.remotenavmap' => 'off'});
- my $menu='';
- my $navstatus=&Apache::lonmenu::get_nav_status();
- my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
- my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
- $menu=(<<MENU);
- swmenu=$mainwindow
- $navstatus
-MENU
- $r->send_http_header;
- my $js =<<"ENDSUBM";
- <script type="text/javascript">
- function submitthis() {
- $menu
- self.close();
- }
-
- </script>
-ENDSUBM
- $r->print(&Apache::loncommon::start_page(undef,$js,
- {'only_body' => 1,
- 'bgcolor' => '#FFFFFF',
- 'add_entries' =>
- {'onload' =>
- "submitthis()"}}).
- &Apache::loncommon::end_page());
-
- return OK;
- }
- if ($ENV{QUERY_STRING} =~ /^launchExternal/) {
- &Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
- &Apache::lonnet::appenv({'environment.remotenavmap' => 'on'});
- my $menu='';
- my $navstatus=&Apache::lonmenu::get_nav_status();
- if ($menu) {
- $r->print(<<MENU);
- <script type="text/javascript">
- swmenu=$menu
- swmenu.clearTimeout(swmenu.menucltim);
- $navstatus
- </script>
-MENU
- }
- }
- if ($ENV{QUERY_STRING} eq 'turningOffExternal') {
- $env{'environment.remotenavmap'}='off';
- }
# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new();
@@ -134,32 +85,14 @@
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
# ----------------------------------------------------- Force menu registration
- my $body_only='';
- my $js;
- if ($env{'environment.remotenavmap'} eq 'on') {
- $js='<script type="text/javascript">
- function collapse() {
- this.document.location="/adm/navmaps?collapseExternal";
- }
- </script>';
- $body_only=1;
- }
-
# Header
my $course_type = &Apache::loncommon::course_type();
- my ($title,$breadcrumb_text);
- if ($course_type eq 'Community') {
- $title = 'Community Contents';
- $breadcrumb_text = &mt('Community Contents');
- } else {
- $title = 'Course Contents';
- $breadcrumb_text = &mt('Course Contents');
- }
- $r->print(&Apache::loncommon::start_page($title,
- $js,
- {'only_body' => $body_only,
- 'force_register' => $env{'form.register'},
- 'bread_crumbs' => [{text => $breadcrumb_text }],}));
+ my $title = $course_type . ' Contents';
+ my $breadcrumb_text = mt($course_type . ' Contents');
+ $r->print(&Apache::loncommon::start_page($title, '',
+ { 'force_register' => $env{'form.register'},
+ 'bread_crumbs' => [{text => $breadcrumb_text }],}));
+#SD
$r->print('<script type="text/javascript">window.focus();</script>');
$r->rflush();
@@ -197,27 +130,6 @@
}
}
- if ($ENV{QUERY_STRING} eq 'launchExternal') {
- $r->print('
- <form name="returnwin" action="/adm/flip?postdata=navlaunch%3a"
- method="post" target="loncapaclient">
- </form>');
- $r->print('
- <script type="text/javascript">
- this.document.returnwin.submit();
- </script>');
- }
-
- if ($env{'environment.remotenavmap'} ne 'on') {
- $r->print(&launch_win('link','yes',\%toplinkitems));
- }
- if ($env{'environment.remotenavmap'} eq 'on') {
- &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'closenav',
- 'collapse()',
- "Close navigation window");
- }
-
-
# Check to see if the student is jumping to next open, do-able problem
if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) {
# Find the next homework problem that they can do.
@@ -337,35 +249,6 @@
return OK;
}
-sub launch_win {
- my ($mode,$script,$toplinkitems,$firsttime)=@_;
- my $result;
- if ($script ne 'no') {
- $result.='<script type="text/javascript">';
- }
- if ($firsttime) {
- $result.='function launch_navmapwin() {
- newWindow=open(\'/adm/navmaps?launchExternalRoles\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
- }';
- } else {
- $result.='function launch_navmapwin() {
- newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
- }';
- }
- if ($mode eq 'now') {
- $result.="\nlaunch_navmapwin();\n";
- }
- if ($script ne 'no') {
- $result.='</script>';
- }
- if ($mode eq 'link') {
- &Apache::lonnavmaps::add_linkitem($toplinkitems,'launchnav',
- 'launch_navmapwin()',
- "Launch navigation window");
- }
- return $result;
-}
-
1;
__END__
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.444 loncom/interface/lonnavmaps.pm:1.445
--- loncom/interface/lonnavmaps.pm:1.444 Sun Feb 28 22:36:38 2010
+++ loncom/interface/lonnavmaps.pm Tue Mar 16 19:55:49 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.444 2010/02/28 22:36:38 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.445 2010/03/16 19:55:49 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
@@ -538,35 +538,6 @@
my $future_slots_checked = 0;
my $future_slots = 0;
-sub close {
- if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
- return(<<ENDCLOSE);
-<script type="text/javascript">
-window.status='Accessing Nav Control';
-menu=window.open("/adm/rat/empty.html","loncapanav",
- "height=600,width=400,scrollbars=1");
-window.status='Closing Nav Control';
-menu.close();
-window.status='Done.';
-</script>
-ENDCLOSE
-}
-
-sub update {
- if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
- if (!$env{'request.course.id'}) { return ''; }
- if ($ENV{'REQUEST_URI'}=~m|^/adm/navmaps|) { return ''; }
- return(<<ENDUPDATE);
-<form name="navform"></form>
-<script type="text/javascript">
-this.document.navform.action='/adm/navmaps#curloc';
-this.document.navform.target='loncapanav';
-this.document.navform.submit();
-</script>
-ENDUPDATE
-}
-
-
sub addToFilter {
my $hashIn = shift;
my $addition = shift;
@@ -1015,12 +986,8 @@
$nonLinkedText .= ' ('.&mt('[_1] parts', $resource->countParts()).')';
}
- my $target;
- if ($env{'environment.remotenavmap'} eq 'on') {
- $target=' target="loncapaclient" ';
- }
if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
- $result .= "$curMarkerBegin<a $target href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
+ $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
} else {
$result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
}
@@ -1033,11 +1000,7 @@
my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = "";
my $link = $params->{"resourceLink"};
- my $target;
- if ($env{'environment.remotenavmap'} eq 'on') {
- $target=' target="loncapaclient" ';
- }
- my $linkopen = "<a $target href=\"$link\">";
+ my $linkopen = "<a href=\"$link\">";
my $linkclose = "</a>";
my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
if ($resource->hasDiscussion()) {
@@ -1050,7 +1013,7 @@
my $feedback = $resource->getFeedback();
foreach my $msgid (split(/\,/, $feedback)) {
if ($msgid) {
- $feedbackHTML .= ' <a '.$target.' href="/adm/email?display='
+ $feedbackHTML .= ' <a href="/adm/email?display='
. &escape($msgid) . '">'
. '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" title="'.&mt('New E-mail').'"/></a>';
}
@@ -1064,7 +1027,7 @@
last if ($errorcount>=10); # Only output 10 bombs maximum
if ($msgid) {
$errorcount++;
- $errorHTML .= ' <a '.$target.' href="/adm/email?display='
+ $errorHTML .= ' <a href="/adm/email?display='
. &escape($msgid) . '">'
. '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" title="'.&mt('New Error').'"/></a>';
}
@@ -1084,11 +1047,7 @@
$params->{'multipart'} && $part eq "0";
my $link = $params->{"resourceLink"};
- my $target;
- if ($env{'environment.remotenavmap'} eq 'on') {
- $target=' target="loncapaclient" ';
- }
- my $linkopen = "<a $target href=\"$link\">";
+ my $linkopen = "<a href=\"$link\">";
my $linkclose = "</a>";
$result .= '<td class="LC_middle">';
@@ -1494,22 +1453,13 @@
if ($args->{'caller'} eq 'navmapsdisplay') {
$result .= '<table><tr><td>'.
&Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td>';
- if ($env{'environment.remotenavmap'} ne 'on') {
$result .= '<td> </td>';
- } else {
- $result .= '</tr><tr>';
- }
$result.="<td class=\"LC_middle\">".mt('Tools:')."</td>";
$result.=&show_linkitems_toolbar($args->{'linkitems'});
if ($args->{'sort_html'}) {
- if ($env{'environment.remotenavmap'} ne 'on') {
- $result.='<td> </td><td> </td><td> </td>'.
- '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
- } else {
- $result.='</tr><tr><td align="left"><br />'.
- $args->{'sort_html'}.'</td></tr>';
- }
- }
+ $result.='<td> </td><td> </td><td> </td>'.
+ '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
+ }
$result .= '</table>';
} elsif ($args->{'sort_html'}) {
$result.=$args->{'sort_html'};
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.186 loncom/interface/lonpreferences.pm:1.187
--- loncom/interface/lonpreferences.pm:1.186 Fri Mar 12 15:09:23 2010
+++ loncom/interface/lonpreferences.pm Tue Mar 16 19:55:49 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.186 2010/03/12 15:09:23 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.187 2010/03/16 19:55:49 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -589,60 +589,6 @@
}
################################################################
-# Icon Subroutines #
-################################################################
-sub iconchanger {
- my $r = shift;
- &Apache::lonhtmlcommon::add_breadcrumb(
- { href => '/adm/preferences?action=changeicons',
- text => 'Change Main Menu'});
- $r->print(Apache::loncommon::start_page('Page Display Settings'));
- $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Main Menu'));
-
- my $user = $env{'user.name'};
- my $domain = $env{'user.domain'};
- my %userenv = &Apache::lonnet::get
- ('environment',['icons']);
- my $iconic='checked="checked"';
- my $classic='';
- my $onlyicon='';
- if ($userenv{'icons'} eq 'classic') {
- $classic='checked="checked"';
- $iconic='';
- }
- if ($userenv{'icons'} eq 'iconsonly') {
- $onlyicon='checked="checked"';
- $iconic='';
- }
- my $useicons=&mt('Use icons and text');
- my $usebuttons=&mt('Use buttons and text');
- my $useicononly=&mt('Use icons only');
- my $change=&mt('Save');
- $r->print(<<ENDSCREEN);
-<form name="prefs" action="/adm/preferences" method="post">
-<input type="hidden" name="action" value="verify_and_change_icons" />
-<label><input type="radio" name="menumode" value="iconic" $iconic /> $useicons</label><br />
-<label><input type="radio" name="menumode" value="classic" $classic /> $usebuttons</label><br />
-<label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $useicononly</label><br />
-<input type="submit" value="$change" />
-</form>
-ENDSCREEN
-}
-
-sub verify_and_change_icons {
- my $r = shift;
- my $user = $env{'user.name'};
- my $domain = $env{'user.domain'};
- my $newicons = $env{'form.menumode'};
-
- &Apache::lonnet::put('environment',{'icons' => $newicons});
- &Apache::lonnet::appenv({'environment.icons' => $newicons});
- my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newicons.'</tt>'));
- $message=&Apache::loncommon::confirmwrapper($message);
- &print_main_menu($r, $message);
-}
-
-################################################################
# Clicker Subroutines #
################################################################
@@ -1996,14 +1942,6 @@
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',
@@ -2164,10 +2102,6 @@
&texenginechanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_texengine'){
&verify_and_change_texengine($r);
- }elsif($env{'form.action'} eq 'changeicons'){
- &iconchanger($r);
- }elsif($env{'form.action'} eq 'verify_and_change_icons'){
- &verify_and_change_icons($r);
}elsif($env{'form.action'} eq 'changeclicker'){
&clickerchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_clicker'){
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.128 loncom/interface/mydesk.tab:1.129
--- loncom/interface/mydesk.tab:1.128 Thu Mar 11 16:35:12 2010
+++ loncom/interface/mydesk.tab Tue Mar 16 19:55:49 2010
@@ -41,19 +41,13 @@
# - mdcCourse: user can modify course contents and course is a regular course
# - showgroups: user is member of a group
# - always: show this link even if user hasn't selected a role
-# - remotenav: remote navmap is activated
-# - noremotenav: remote navmap is _not_ activated
-# - remotenavCommunity: remote navmap is activated
-# and course is of type Community
-# - noremotenavCommunity: remote navmap is _not_ activated
-# and course is of type Community
+# - Community: course is of type Community
+# - Course: course is of type Course
# prim:link:icon:alt:text:condition
scnd:/adm/menu:::Main Menu:always
scnd:/adm/flip?postdata=return%3a:::Return to Last Location:showreturn
-scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Course Contents:noremotenav
-scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Course Contents:remotenav
-scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Community Contents:noremotenavCommunity
-scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Community Contents:remotenavCommunity
+scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Course Contents:Course
+scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Community Contents:Community
scnd:/adm/coursedocs:::Course Editor:mdcCourse
scnd:/adm/coursedocs:::Community Editor:mdcCommunity
scnd:/adm/coursegroups:::Groups:showgroups
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.367 loncom/localize/localize/de.pm:1.368
--- loncom/localize/localize/de.pm:1.367 Tue Mar 16 15:12:42 2010
+++ loncom/localize/localize/de.pm Tue Mar 16 19:55:56 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.367 2010/03/16 15:12:42 wenzelju Exp $
+# $Id: de.pm,v 1.368 2010/03/16 19:55:56 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -7322,21 +7322,9 @@
'Change How Menus are Displayed'
=> 'Darstellung der Menüs',
- 'Use icons and text'
-=> 'Icons mit Text',
-
- 'Use buttons and text'
-=> 'Buttons mit Text',
-
- 'Use icons only'
-=> 'Nur Icons',
-
'Previous Tries'
=> 'Bisherige Antworten',
- 'Change Main Menu'
-=> 'Darstellung der Menüs',
-
'Screenname'
=> 'Anonymer Nickname',
@@ -16904,15 +16892,9 @@
'Discussion Display'
=> 'Darstellung der Diskussionsbeiträge',
- 'Page Display Settings'
-=> 'Erscheinungsbild der Seiten',
-
'Color Scheme'
=> 'Farbschema',
- 'Menu Display'
-=> 'Menüdarstellung',
-
'Content Display Settings'
=> 'Erscheinungsbild des Inhalts',
@@ -16973,8 +16955,6 @@
'Toggle debug messages'
=> 'Umschalten der Debug-Meldungen',
- 'Change whether the menus are displayed with buttons, icons or icons and text.'
-=> 'Festlegen, ob Menüs mit Buttons, Icons oder Icons und Text dargestellt werden sollen.',
'Course Initialization'
=> 'Kursinitialisierung',
#loncreateuser.pm
@@ -19306,6 +19286,9 @@
'RSS Feeds and Blogs'
=> 'RSS-Feeds und Blogs',
+ 'The change will become active on the next page.'
+=> 'Die Änderung wird auf der nächsten Seite wirksam.',
+
''
=> '',
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.92 rat/lonpage.pm:1.93
--- rat/lonpage.pm:1.92 Mon Oct 26 10:17:58 2009
+++ rat/lonpage.pm Tue Mar 16 19:56:02 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.92 2009/10/26 10:17:58 foxr Exp $
+# $Id: lonpage.pm,v 1.93 2010/03/16 19:56:02 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -538,10 +538,6 @@
sub get_buttons {
my ($hash,$rid) = @_;
- # which icons do we use?
- my $extension='png';
- if ($env{'environment.icons'} eq 'classic') { $extension='gif'; }
-
my $metainfo = '';
my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
my ($mapid,$resid)=split(/\./,$rid);
@@ -558,13 +554,13 @@
|| !$hash->{'encrypted_'.$rid})) {
$metainfo .='<a name="'.&escape($symb).'" />'.
'<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'.
- '<img src="/adm/lonMisc/cat_button.'.$extension.'" class="LC_icon" />'.
+ '<img src="/adm/lonMisc/cat_button.png" class="LC_icon" />'.
'</a>';
}
$metainfo .= '<a href="/adm/evaluate?postdata='.
&escape($esrc).
'" target="LONcatInfo">'.
- '<img src="/adm/lonMisc/eval_button.'.$extension.'" class="LC_icon" />'.
+ '<img src="/adm/lonMisc/eval_button.png" class="LC_icon" />'.
'</a>';
if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
@@ -574,12 +570,12 @@
'<a href="/adm/grades?symb='.&escape($symb).
# '&command=submission" target="LONcatInfo">'.
'&command=submission">'.
- '<img src="/adm/lonMisc/subm_button.'.$extension.'" class="LC_icon" />'.
+ '<img src="/adm/lonMisc/subm_button.png" class="LC_icon" />'.
'</a>'.
'<a href="/adm/grades?symb='.&escape($symb).
# '&command=gradingmenu" target="LONcatInfo">'.
'&command=gradingmenu">'.
- '<img src="/adm/lonMisc/pgrd_button.'.$extension.'" class="LC_icon" />'.
+ '<img src="/adm/lonMisc/pgrd_button.png" class="LC_icon" />'.
'</a>';
}
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
@@ -587,7 +583,7 @@
'<a href="/adm/parmset?symb='.&escape($symb).
# '" target="LONcatInfo">'.
'" >'.
- '<img src="/adm/lonMisc/pprm_button.'.$extension.'" class="LC_icon" />'.
+ '<img src="/adm/lonMisc/pprm_button.png" class="LC_icon" />'.
'</a>';
}
}
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.79 rat/lonpageflip.pm:1.80
--- rat/lonpageflip.pm:1.79 Thu Apr 23 17:31:25 2009
+++ rat/lonpageflip.pm Tue Mar 16 19:56:02 2010
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.79 2009/04/23 17:31:25 bisitz Exp $
+# $Id: lonpageflip.pm,v 1.80 2010/03/16 19:56:02 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -217,26 +217,6 @@
return ($next,$mapurl);
}
-sub navlaunch {
- my ($r)=@_;
- &Apache::loncommon::content_type($r,'text/html');
- &Apache::loncommon::no_cache($r);
- $r->send_http_header;
- $r->print(&Apache::loncommon::start_page('Launched'));
- $r->print(<<ENDNAV);
- <p><a href="/adm/flip?postdata=firstres%3a">Goto first resource</a></p>
- <script type="text/javascript">
- function collapse() {
- menu=window.open("/adm/navmaps?collapseExternal","loncapanav",
- "height=600,width=400,scrollbars=1");
- this.document.location='/adm/navmaps?turningOffExternal';
- }
- </script>
- <p><a href="javascript:collapse();">Collapse external navigation window</a></p>
-ENDNAV
- $r->print(&Apache::loncommon::end_page());
-}
-
sub first_accessible_resource {
my $furl;
if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db',
@@ -302,7 +282,7 @@
return REDIRECT;
}
- if ($direction eq 'return' || $direction eq 'navlaunch') {
+ if ($direction eq 'return') {
# -------------------------------------------------------- Return to last known
my $last;
if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
@@ -326,16 +306,11 @@
} else {
$newloc='/adm/navmaps';
}
- if ($newloc eq '/adm/navmaps' && $direction eq 'navlaunch') {
- &navlaunch($r);
- return OK;
- } else {
&Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location =>
&Apache::lonnet::absolute_url().$newloc);
return REDIRECT;
- }
}
$currenturl=~s/^https?\:\/\///;
$currenturl=~s/^[^\/]+//;
@@ -352,16 +327,11 @@
if ($last) {
$currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]);
} else {
- if ($direction eq 'return') {
&Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location =>
&Apache::lonnet::absolute_url().
'/adm/noidea.html');
return REDIRECT;
- } else {
- &navlaunch($r);
- return OK;
- }
}
}
# ------------------------------------------- Do we have any idea where we are?
@@ -561,8 +531,6 @@
=item get_next_possible_move()
-=item navlaunch()
-
=item first_accessible_resource()
=item handler()
--droeschl1268769363--