[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm mydesk.tab
raeburn
raeburn at source.lon-capa.org
Sun Aug 5 23:38:08 EDT 2012
raeburn Mon Aug 6 03:38:08 2012 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface lonmenu.pm mydesk.tab
Log:
- For 2.11.
- Remote Control retained.
- Text used in $menuitems string for each button/icon determined based on
context -- use &get_inline_text() for inline menu; &get_rc_text() for
Remote Control so LCD display in Remote functions correctly.
-------------- next part --------------
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.18 loncom/interface/lonmenu.pm:1.369.2.19
--- loncom/interface/lonmenu.pm:1.369.2.18 Fri Aug 3 22:38:35 2012
+++ loncom/interface/lonmenu.pm Mon Aug 6 03:38:08 2012
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.369.2.18 2012/08/03 22:38:35 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.19 2012/08/06 03:38:08 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -578,29 +578,35 @@
}
$crs=~s/\_/\//g;
+ my %swtext;
+ if ($noremote) {
+ %swtext = &get_inline_text();
+ } else {
+ %swtext = &get_rc_text();
+ }
my $hwkadd='';
if ($env{'request.symb'} ne '' &&
$env{'request.filename'}=~/$LONCAPA::assess_re/) {
if (&Apache::lonnet::allowed('mgr',$crs)) {
- $hwkadd.=&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',
+ $hwkadd.=&switch('','',7,2,'pgrd.png',$swtext{'pgrd'},'grades[_4]',
"gocmd('/adm/grades','gradingmenu')",
'Content Grades');
} elsif (&Apache::lonnet::allowed('vgr',$crs)) {
- $hwkadd.=&switch('','',7,2,'subm.png','Content Submissions','missions[_1]',
+ $hwkadd.=&switch('','',7,2,'subm.png',$swtext{'subm'},'missions[_1]',
"gocmd('/adm/grades','submission')",
'Content Submissions');
}
}
if ($env{'request.symb'} ne '' &&
&Apache::lonnet::allowed('opa',$crs)) {
- $hwkadd.=&switch('','',7,3,'pparm.png','Content Settings','parms[_2]',
+ $hwkadd.=&switch('','',7,3,'pparm.png',$swtext{'pparm'},'parms[_2]',
"gocmd('/adm/parmset','set')",
'Content Settings');
}
if ($noremote) {
if ($env{'request.symb'}=~/^uploaded/ &&
&Apache::lonnet::allowed('mdc',$crs)) {
- $hwkadd.=&switch('','',7,4,'docs.png','Folder/Page Content','parms[_2]',
+ $hwkadd.=&switch('','',7,4,'docs.png',$swtext{'docs'},'parms[_2]',
"gocmd('/adm/coursedocs','direct')",
'Folder/Page Content');
}
@@ -646,7 +652,7 @@
my @ids=&Apache::lonnet::current_machine_ids();
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
if (!$allowed) {
- $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
+ $editbutton=&switch('','',6,1,,$top,$bottom,$action,$desc);
$noeditbutton = 0;
}
}
@@ -713,7 +719,7 @@
}
}
$editbutton=&switch
- ('','',6,1,'pcstr.png','Edit','resource[_2]',
+ ('','',6,1,'pcstr.png',$swtext{'pcstr'},'resource[_2]',
$bot,"Edit this resource");
$noeditbutton = 0;
}
@@ -729,7 +735,7 @@
my $cfile = &edit_course_upload($file,$cnum,$cdom);
if ($cfile) {
$editbutton=&switch
- ('','',6,1,'pcstr.png','Edit',
+ ('','',6,1,'pcstr.png',$swtext{'pcstr'},
'resource[_2]',"go('".$cfile."');",
'Edit this resource');
}
@@ -741,7 +747,7 @@
if ($resurl eq "public/$cdom/$cnum/syllabus") {
if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) {
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
- $editbutton=&switch('','',6,1,'pcstr.png','Edit',
+ $editbutton=&switch('','',6,1,'pcstr.png',$swtext{'pcstr'},
'resource[_2]',
"go('/adm/courseprefs?phase=display&actions=courseinfo')",
'Edit this resource');
@@ -772,11 +778,11 @@
# Probably should be in mydesk.tab
#
$menuitems=(<<ENDMENUITEMS);
-s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory
-s&6&2&rtrv.png&Retrieve&version[_1]&gocstr('/adm/retrieve','/priv/$udom/$uname/$cleandisfn')&Retrieve old version
-s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource
-s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource
-s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document
+s&6&1&list.png&$swtext{'list'}&dir[_1]&golist('$esc_currdir')&List current directory
+s&6&2&rtrv.png&$swtext{'rtrv'}&version[_1]&gocstr('/adm/retrieve','/priv/$udom/$uname/$cleandisfn')&Retrieve old version
+s&6&3&pub.png&$swtext{'pub'}&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource
+s&7&1&del.png&$swtext{'del'}&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource
+s&7&2&prt.png&$swtext{'prt'}&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document
ENDMENUITEMS
}
if (ref($bread_crumbs) eq 'ARRAY') {
@@ -791,14 +797,15 @@
# We are in a course and looking at a registered URL
# Should probably be in mydesk.tab
#
+
$menuitems=(<<ENDMENUITEMS);
c&3&1
-s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
-s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3
+s&2&1&back.png&$swtext{'back'}&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
+s&2&3&forw.png&$swtext{'forw'}&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3
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&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
ENDMENUITEMS
$got_prt = 1;
if (($env{'user.adv'}) && ($env{'request.uri'} =~ /^\/res/)
@@ -806,7 +813,7 @@
# wishlist is only available for users with access to resource-pool
# and links can only be set for resources within the resource-pool
$menuitems .= (<<ENDMENUITEMS);
-s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
+s&9&1&alnk.png&$swtext{'alnk'}&linkstor[_1]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
ENDMENUITEMS
$got_wishlist = 1;
}
@@ -820,29 +827,29 @@
}else{
$menuitems.="anot.png";
}
-$menuitems.="&Notes&&annotate()&";
+$menuitems.="&$swtext{'anot'}&tations[_1]&annotate()&";
$menuitems.="Make notes and annotations about this resource&&1\n";
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {
$menuitems.=(<<ENDREALRES);
-s&6&3&catalog.png&Info&info[_1]&catalog_info()&Show Metadata
+s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info()&Show Metadata
ENDREALRES
}
unless ($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) {
$menuitems.=(<<ENDREALRES);
-s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
ENDREALRES
}
$menuitems.=(<<ENDREALRES);
-s&8&2&fdbk.png&Communicate&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
+s&8&2&fdbk.png&$swtext{'fdbk'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
ENDREALRES
}
}
if ($env{'request.uri'} =~ /^\/res/) {
unless ($got_prt) {
$menuitems .= (<<ENDMENUITEMS);
-s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
ENDMENUITEMS
$got_prt = 1;
}
@@ -850,7 +857,7 @@
if (($env{'user.adv'}) && (!$env{'request.enc'})) {
# wishlist is only available for users with access to resource-pool
$menuitems .= (<<ENDMENUITEMS);
-s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
+s&9&1&alnk.png&$swtext{'alnk'}&linkstor[_1]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
ENDMENUITEMS
$got_wishlist = 1;
}
@@ -1006,6 +1013,49 @@
}
}
+sub get_inline_text {
+ my %text = (
+ pgrd => 'Content Grades',
+ subm => 'Content Submissions',
+ pparm => 'Content Settings',
+ docs => 'Folder/Page Content',
+ pcstr => 'Edit',
+ list => 'Directory',
+ rtrv => 'Retrieve',
+ pub => 'Publish',
+ del => 'Delete',
+ prt => 'Print',
+ alnk => 'Stored Links',
+ anot => 'Notes',
+ catalog => 'Info',
+ eval => 'Evaluate',
+ fdbk => 'Feedback',
+ );
+ return %text;
+}
+
+sub get_rc_text {
+ my %text = (
+ pgrd => 'problem[_1]',
+ subm => 'view sub-[_1]',
+ pparm => 'problem[_2]',
+ pcstr => 'edit[_1]',
+ list => 'list[_1]',
+ rtrv => 'retrieve[_1]',
+ pub => 'publish[_1]',
+ del => 'delete[_1]',
+ prt => 'prepare[_1]',
+ back => 'backward[_1]',
+ forw => 'forward[_1]',
+ alnk => 'add to[_1]',
+ anot => 'anno-[_1]',
+ catalog => 'catalog[_2]',
+ eval => 'evaluate[_1]',
+ fdbk => 'feedback[_1]',
+ );
+ return %text;
+}
+
sub is_course_upload {
my ($file,$cnum,$cdom) = @_;
my $uploadpath = &LONCAPA::propath($cdom,$cnum);
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.149.2.8 loncom/interface/mydesk.tab:1.149.2.9
--- loncom/interface/mydesk.tab:1.149.2.8 Fri Aug 3 01:42:11 2012
+++ loncom/interface/mydesk.tab Mon Aug 6 03:38:08 2012
@@ -242,7 +242,7 @@
8:1:clear
8:1:tools:reqcrsshc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rcr
8:1:tools:reqcrsnsc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rol
-9:3:adv:any:wishlist.png:view[_1]:linkstor[_1]:go('/adm/wishlist'):Stored Links:set
+9:2:adv:any:slnk.png:view[_1]:linkstor[_1]:go('/adm/wishlist'):Stored Links:set
10:1:clear
10:1:any:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Announcements and my calendar:com
10:1:course:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Course anouncements and my calendar:com
More information about the LON-CAPA-cvs
mailing list