version 1.369.2.47, 2013/09/07 21:08:58
|
version 1.369.2.50, 2014/01/06 17:32:58
|
Line 303 sub primary_menu {
|
Line 303 sub primary_menu {
|
$menu{$position} .= prep_menuitem($menuitem); |
$menu{$position} .= prep_menuitem($menuitem); |
} |
} |
} |
} |
return ("<ol class=\"LC_primary_menu LC_floatleft\">$menu{'left'}</ol>", |
my @output = ('',''); |
"<ol class=\"LC_primary_menu LC_floatright LC_right\">$menu{'right'}</ol>"); |
if ($menu{'left'} ne '') { |
|
$output[0] = "<ol class=\"LC_primary_menu LC_floatleft\">$menu{'left'}</ol>"; |
|
} |
|
if ($menu{'right'} ne '') { |
|
$output[1] = "<ol class=\"LC_primary_menu LC_floatright LC_right\">$menu{'right'}</ol>"; |
|
} |
|
return @output; |
} |
} |
|
|
#returns hashref {user=>'',dom=>''} containing: |
#returns hashref {user=>'',dom=>''} containing: |
Line 556 sub create_submenu {
|
Line 562 sub create_submenu {
|
if ($count == $numsub) { |
if ($count == $numsub) { |
$borderbot = 'border-bottom:1px solid black;'; |
$borderbot = 'border-bottom:1px solid black;'; |
} |
} |
|
unless (($href eq '') || ($href =~ /^\#/)) { |
|
$target = ' target="_top"'; |
|
} |
$menu .= '<li style="margin:0;padding:0;'. |
$menu .= '<li style="margin:0;padding:0;'. |
$borderbot.'"><a href="'.$href.'">'; |
$borderbot.'"><a href="'.$href.'"'.$target.'>'; |
if ($translate) { |
if ($translate) { |
$menu .= &mt($item->[1]); |
$menu .= &mt($item->[1]); |
} else { |
} else { |
Line 851 ENDMENUITEMS
|
Line 860 ENDMENUITEMS
|
# wishlist is only available for users with access to resource-pool |
# wishlist is only available for users with access to resource-pool |
# and links can only be set for resources within the resource-pool |
# and links can only be set for resources within the resource-pool |
$menuitems .= (<<ENDMENUITEMS); |
$menuitems .= (<<ENDMENUITEMS); |
s&9&1&alnk.png&$swtext{'alnk'}&linkstor[_1]&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 my personal Stored Links repository&&1 |
ENDMENUITEMS |
ENDMENUITEMS |
$got_wishlist = 1; |
$got_wishlist = 1; |
} |
} |
Line 874 $menuitems.="Make notes and annotations
|
Line 883 $menuitems.="Make notes and annotations
|
s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info()&Show Metadata |
s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info()&Show Metadata |
ENDREALRES |
ENDREALRES |
} |
} |
unless ($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) { |
unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) || |
|
($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/})) { |
$menuitems.=(<<ENDREALRES); |
$menuitems.=(<<ENDREALRES); |
s&8&1&eval.png&$swtext{'eval'}&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 |
ENDREALRES |
} |
} |
$menuitems.=(<<ENDREALRES); |
unless ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/}) { |
|
$menuitems.=(<<ENDREALRES); |
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 |
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 |
ENDREALRES |
|
} |
} |
} |
} |
} |
if ($env{'request.uri'} =~ /^\/res/) { |
if ($env{'request.uri'} =~ /^\/res/) { |
Line 1867 sub rawconfig {
|
Line 1879 sub rawconfig {
|
|
|
sub check_for_rcrs { |
sub check_for_rcrs { |
my $showreqcrs = 0; |
my $showreqcrs = 0; |
my @reqtypes = ('official','unofficial','community'); |
my @reqtypes = ('official','unofficial','community','textbook'); |
foreach my $type (@reqtypes) { |
foreach my $type (@reqtypes) { |
if (&Apache::lonnet::usertools_access($env{'user.name'}, |
if (&Apache::lonnet::usertools_access($env{'user.name'}, |
$env{'user.domain'}, |
$env{'user.domain'}, |