[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm lonmenu.pm
www
www@source.lon-capa.org
Tue, 18 Jan 2011 19:52:46 -0000
www Tue Jan 18 19:52:46 2011 EDT
Modified files:
/loncom/interface lonhtmlcommon.pm lonmenu.pm
Log:
Faculty training: somehow people did not find the beautiful icons
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.287 loncom/interface/lonhtmlcommon.pm:1.288
--- loncom/interface/lonhtmlcommon.pm:1.287 Sun Jan 16 22:45:05 2011
+++ loncom/interface/lonhtmlcommon.pm Tue Jan 18 19:52:46 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.287 2011/01/16 22:45:05 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.288 2011/01/18 19:52:46 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1657,7 +1657,7 @@
@html = grep {defined $_ && $_ ne ''} @html;
for (@html) {
s/align="(right|left)"//;
- s/<span.*?\/span>// if $category ne 'advtools';
+# s/<span.*?\/span>// if $category ne 'advtools';
}
push @{$tools{$category}}, @html;
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.343 loncom/interface/lonmenu.pm:1.344
--- loncom/interface/lonmenu.pm:1.343 Mon Jan 17 01:35:32 2011
+++ loncom/interface/lonmenu.pm Tue Jan 18 19:52:46 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.343 2011/01/17 01:35:32 www Exp $
+# $Id: lonmenu.pm,v 1.344 2011/01/18 19:52:46 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -411,20 +411,20 @@
if ($env{'request.symb'} ne '' &&
$env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
if (&Apache::lonnet::allowed('mgr',$crs)) {
- $hwkadd.=&switch('','',7,2,'pgrd.png','problem[_1]','grades[_4]',
+ $hwkadd.=&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',
"gocmd('/adm/grades','gradingmenu')",
- 'Modify user grades for this assessment resource');
+ 'Content Grades');
} elsif (&Apache::lonnet::allowed('vgr',$crs)) {
- $hwkadd.=&switch('','',7,2,'subm.png','view sub-[_1]','missions[_1]',
+ $hwkadd.=&switch('','',7,2,'subm.png','Content Submissions','missions[_1]',
"gocmd('/adm/grades','submission')",
- 'View user submissions for this assessment resource');
+ 'Content Submissions');
}
}
if ($env{'request.symb'} ne '' &&
&Apache::lonnet::allowed('opa',$crs)) {
- $hwkadd.=&switch('','',7,3,'pparm.png','problem[_2]','parms[_2]',
+ $hwkadd.=&switch('','',7,3,'pparm.png','Content Settings','parms[_2]',
"gocmd('/adm/parmset','set')",
- 'Modify parameter settings for this resource');
+ 'Content Settings');
}
# -- End Homework
###
@@ -575,11 +575,11 @@
# Probably should be in mydesk.tab
#
$menuitems=(<<ENDMENUITEMS);
-s&6&1&list.png&list[_1]&dir[_1]&golist('$esc_currdir')&List current directory
-s&6&2&rtrv.png&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$cleandisfn')&Retrieve old version
-s&6&3&pub.png&publish[_1]&resource[_3]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
-s&7&1&del.png&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$cleandisfn')&Delete this resource
-s&7&2&prt.png&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document
+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','/~$uname/$cleandisfn')&Retrieve old version
+s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
+s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$cleandisfn')&Delete this resource
+s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document
ENDMENUITEMS
}
if (ref($bread_crumbs) eq 'ARRAY') {
@@ -596,18 +596,18 @@
#
$menuitems=(<<ENDMENUITEMS);
c&3&1
-s&2&1&back.png&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
-s&2&3&forw.png&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3
+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
c&6&3
c&8&1
c&8&2
-s&8&3&prt.png&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
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 .= (<<ENDMENUITEMS);
-s&9&1&wishlist-link.png&set[_1]&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource to wishlist&&1
+s&9&1&wishlist-link.png&Wishlist&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource to wishlist&&1
ENDMENUITEMS
}
@@ -620,29 +620,29 @@
}else{
$menuitems.="anot.png";
}
-$menuitems.="&anno-[_1]&tations[_1]&annotate()&";
+$menuitems.="&Notes&&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/})) {
$menuitems.=(<<ENDREALRES);
-s&6&3&catalog.png&catalog[_2]&info[_1]&catalog_info()&Show Metadata
+s&6&3&catalog.png&Info&info[_1]&catalog_info()&Show Metadata
ENDREALRES
}
$menuitems.=(<<ENDREALRES);
-s&8&1&eval.png&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
-s&8&2&fdbk.png&feedback[_1]&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
+s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+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
ENDREALRES
}
}
if ($env{'request.uri'} =~ /^\/res/) {
$menuitems .= (<<ENDMENUITEMS);
-s&8&3&prt.png&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
ENDMENUITEMS
if (&Apache::lonnet::allowed('bre', $env{'request.course.id'}) eq 'F') {
# wishlist is only available for users with access to resource-pool
$menuitems .= (<<ENDMENUITEMS);
-s&9&1&wishlist-link.png&set[_1]&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource to wishlist&&1
+s&9&1&wishlist-link.png&Wishlist&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource to wishlist&&1
ENDMENUITEMS
}
}
@@ -789,7 +789,7 @@
# Inline Menu
$inlineremote[$idx]=
'<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.
- '<span class="LC_menubuttons_inline_text">'.$desc.'</span></a>';
+ '<span class="LC_menubuttons_inline_text">'.$top.' </span></a>';
}
return '';
}