--- loncom/interface/lonmenu.pm 2012/05/13 23:45:07 1.369.2.1
+++ loncom/interface/lonmenu.pm 2012/05/21 16:25:37 1.369.2.4
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.369.2.1 2012/05/13 23:45:07 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.4 2012/05/21 16:25:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,8 +26,6 @@
# http://www.lon-capa.org/
#
#
-# There is one parameter controlling the action of this module:
-#
=head1 NAME
@@ -35,7 +33,8 @@ Apache::lonmenu
=head1 SYNOPSIS
-Coordinates the response to clicking an image.
+Loads contents of /home/httpd/lonTabs/mydesk.tab,
+used to generate inline menu, and Main Menu page.
This is part of the LearningOnline Network with CAPA project
described at http://www.lon-capa.org.
@@ -74,10 +73,19 @@ It is set to 'done' in the BEGIN block o
=item @primary_menu
The elements of this array reference arrays that are made up of the components
-of those lines of mydesk.tab that start with prim.
+of those lines of mydesk.tab that start with prim:.
It is used by primary_menu() to generate the corresponding menu.
It gets filled in the BEGIN block of this module.
+=item %primary_sub_menu
+
+The keys of this hash reference are the names of items in the primary_menu array
+which have sub-menus. For each key, the corresponding value is a reference to
+an array containing components extracted from lines in mydesk.tab which begin
+with primsub:.
+This hash, which is used by primary_menu to generate sub-menus, is populated in
+the BEGIN block.
+
=item @secondary_menu
The elements of this array reference arrays that are made up of the components
@@ -156,10 +164,9 @@ use Apache::lonlocal;
use Apache::lonmsg();
use LONCAPA qw(:DEFAULT :match);
use HTML::Entities();
-use Apache::lonwishlist();
use vars qw(@desklines %category_names %category_members %category_positions
- $readdesk @primary_menu @secondary_menu);
+ $readdesk @primary_menu %primary_submenu @secondary_menu);
my @inlineremote;
@@ -182,7 +189,7 @@ sub prep_menuitem {
# primary_menu() evaluates @primary_menu and returns XHTML for the menu
# that contains following links:
-# About, Message, Roles, Help, Logout
+# About, Message, Personal, Roles, Help, Logout
# @primary_menu is filled within the BEGIN block of this module with
# entries from mydesk.tab
sub primary_menu {
@@ -212,8 +219,54 @@ sub primary_menu {
next if $$menuitem[4] eq 'courses' ##'Roles' wanted
&& !&Apache::loncommon::show_course(); ##
-
- if ($$menuitem[3] eq 'Help') { # special treatment for helplink
+ my $title = $menuitem->[3];
+ if (defined($primary_submenu{$title})) {
+ my ($link,$target,$numsub);
+ if ($menuitem->[0] ne '') {
+ $link = $menuitem->[0];
+ $target = '_top';
+ } else {
+ $link = '#';
+ }
+ if (ref($primary_submenu{$title}) eq 'ARRAY') {
+ $numsub = @{$primary_submenu{$title}};
+ if ($numsub) {
+ $title =
+ ''.$title.
+ ''.
+ '▼';
+ }
+ }
+ $menu .= '
'.
+ ''.$title.'';
+ if ($numsub) {
+ $menu .= '';
+ foreach my $item (@{$primary_submenu{$menuitem->[3]}}) {
+ if (ref($item) eq 'ARRAY') {
+ if ($item->[2] eq 'wishlist') {
+ next unless ((&Apache::lonnet::allowed('bre',"/res/$env{'user.domain'}/")) ||
+ (&Apache::lonnet::allowed('bro',"/res/$env{'user.domain'}/")));
+ } elsif ($item->[2] eq 'reqcrs') {
+ next unless(&check_for_rcrs());
+ } elsif (($item->[2] eq 'portfolio') ||
+ ($item->[2] eq 'blog')) {
+ if (!&Apache::lonnet::usertools_access(
+ $env{'user.name'},
+ $env{'user.domain'},
+ $item->[2],undef,'tools')) {
+ next;
+ }
+ }
+ $menu .= '- '.
+ ''.
+ $item->[1].'
';
+ }
+ }
+ $menu .= '
';
+ }
+ $menu .= '';
+ } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink
if ($public) {
my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
my $defdom = &Apache::lonnet::default_login_domain();
@@ -628,14 +681,9 @@ c&6&3
c&8&1
c&8&2
s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&9&1&sbkm.png&Bookmark&set[_1]bookmark[_2]&set_bookmark()&Set a bookmark for this resource&&1
+
ENDMENUITEMS
- if (&Apache::lonnet::allowed('bre', $env{'request.course.id'}) eq 'F' && $env{'request.uri'} =~ /^\/res/) {
- # wishlist is only available for users with access to resource-pool
- # and links can only be set for resources within the resource-pool
- $menuitems .= (< 1});
+ my $start_page_bookmark =
+ &Apache::loncommon::start_page('Bookmarks',undef,
+ {'only_body' => 1,
+ 'js_ready' => 1,
+ 'bgcolor' => '#BBBBBB',});
+
+ my $end_page_bookmark =
+ &Apache::loncommon::end_page({'js_ready' => 1});
+
my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
&mt('Switch server?');
@@ -1425,6 +1476,13 @@ function group_chat(group) {
grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
}
+function edit_bookmarks() {
+ go('');
+ w_BookmarkPal_flag=1;
+ bookmarkpal=window.open("/adm/bookmarks",
+ "BookmarkPal", "width=500,height=505,scrollbars=0");
+}
+
function annotate() {
w_Annotator_flag=1;
annotator=window.open('','Annotator','width=365,height=265,scrollbars=0');
@@ -1438,17 +1496,40 @@ function annotate() {
annotator.document.close();
}
-function open_Wishlist_Import(rat) {
- var newWin;
- if (rat) {
- newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat,
- 'wishlistImport','scrollbars=1,resizable=1,menubar=0');
- }
- else {
- newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import',
- 'wishlistImport','scrollbars=1,resizable=1,menubar=0');
- }
- newWin.focus();
+(function (\$) {
+ \$(document).ready(function () {
+ \$.single=function(a){return function(b){a[0]=b;return a}}(\$([1]));
+ /*\@cc_on
+ if (!window.XMLHttpRequest) {
+ \$('.LC_hoverable').each(function () {
+ this.attachEvent('onmouseenter', function (evt) { \$.single(evt.srcElement).addClass('hover'); });
+ this.attachEvent('onmouseleave', function (evt) { \$.single(evt.srcElement).removeClass('hover'); });
+ });
+ }
+ \@*/
+ });
+}(jQuery));
+
+function set_bookmark() {
+ go('');
+ clienttitle=document.title;
+ clienthref=location.pathname;
+ w_bmquery_flag=1;
+ bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0');
+ bmquery.document.write(
+ '$start_page_bookmark'
+ +''
+ +'$end_page_bookmark' );
+ bmquery.document.close();
}
ENDUTILITY
@@ -1867,6 +1948,9 @@ BEGIN {
} elsif ($configline=~/^prim\:/) {
my @entries = (split(/\:/, $configline))[1..5];
push @primary_menu, \@entries;
+ } elsif ($configline=~/^primsub\:/) {
+ my ($parent,@entries) = (split(/\:/, $configline))[1..4];
+ push (@{$primary_submenu{$parent}},\@entries);
} elsif ($configline=~/^scnd\:/) {
my @entries = (split(/\:/, $configline))[1..5];
push @secondary_menu, \@entries;