version 1.369.2.46, 2013/08/13 14:17:37
|
version 1.369.2.52, 2014/06/22 19:48:05
|
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 333 sub getauthor{
|
Line 339 sub getauthor{
|
} |
} |
|
|
sub secondary_menu { |
sub secondary_menu { |
|
my ($httphost) = @_; |
my $menu; |
my $menu; |
|
|
my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
Line 465 sub secondary_menu {
|
Line 472 sub secondary_menu {
|
($roleswitcher_js,$roleswitcher_form,my $switcher) = |
($roleswitcher_js,$roleswitcher_form,my $switcher) = |
&roles_selector( |
&roles_selector( |
$env{'course.' . $env{'request.course.id'} . '.domain'}, |
$env{'course.' . $env{'request.course.id'} . '.domain'}, |
$env{'course.' . $env{'request.course.id'} . '.num'} |
$env{'course.' . $env{'request.course.id'} . '.num'}, |
|
$httphost |
); |
); |
$menu .= $switcher; |
$menu .= $switcher; |
} else { |
} else { |
Line 554 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 849 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 865 if(length($annotation) > 0){
|
Line 876 if(length($annotation) > 0){
|
} |
} |
$menuitems.="&$swtext{'anot'}&tations[_1]&annotate()&"; |
$menuitems.="&$swtext{'anot'}&tations[_1]&annotate()&"; |
$menuitems.="Make notes and annotations about this resource&&1\n"; |
$menuitems.="Make notes and annotations about this resource&&1\n"; |
|
my $is_mobile; |
|
if ($env{'browser.mobile'}) { |
|
$is_mobile = 1; |
|
} |
|
|
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) { |
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/})) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) { |
$menuitems.=(<<ENDREALRES); |
$menuitems.=(<<ENDREALRES); |
s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info()&Show Metadata |
s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info('$is_mobile')&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 1698 sub rawconfig {
|
Line 1716 sub rawconfig {
|
my $pub=($env{'request.state'} eq 'published'); |
my $pub=($env{'request.state'} eq 'published'); |
my $con=($env{'request.state'} eq 'construct'); |
my $con=($env{'request.state'} eq 'construct'); |
my $rol=$env{'request.role'}; |
my $rol=$env{'request.role'}; |
my $requested_domain = $env{'request.role.domain'}; |
my $requested_domain; |
|
if ($rol) { |
|
$requested_domain = $env{'request.role.domain'}; |
|
} |
foreach my $line (@desklines) { |
foreach my $line (@desklines) { |
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); |
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); |
$prt=~s/\$uname/$uname/g; |
$prt=~s/\$uname/$uname/g; |
Line 1712 sub rawconfig {
|
Line 1733 sub rawconfig {
|
next if ($crstype ne 'Community'); |
next if ($crstype ne 'Community'); |
$prt=~s/\$cmty/$crs/g; |
$prt=~s/\$cmty/$crs/g; |
} |
} |
$prt=~s/\$requested_domain/$requested_domain/g; |
if ($prt =~ m/\$requested_domain/) { |
|
if ((!$requested_domain) && ($pro eq 'pbre') && ($env{'user.adv'})) { |
|
$prt=~s/\$requested_domain/$env{'user.domain'}/g; |
|
} else { |
|
$prt=~s/\$requested_domain/$requested_domain/g; |
|
} |
|
} |
if ($category_names{$cat}!~/\w/) { $cat='oth'; } |
if ($category_names{$cat}!~/\w/) { $cat='oth'; } |
if ($pro eq 'clear') { |
if ($pro eq 'clear') { |
$output.=&clear($row,$col); |
$output.=&clear($row,$col); |
Line 1748 sub rawconfig {
|
Line 1775 sub rawconfig {
|
next; |
next; |
} |
} |
} |
} |
if (&Apache::lonnet::allowed($priv,$prt)) { |
if ((($priv eq 'bre') && (&Apache::lonnet::allowed($priv,$prt) eq 'F')) || |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
(($priv ne 'bre') && (&Apache::lonnet::allowed($priv,$prt)))) { |
|
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
} |
} |
} elsif ($pro eq 'course') { |
} elsif ($pro eq 'course') { |
if (($env{'request.course.fn'}) && ($crstype ne 'Community')) { |
if (($env{'request.course.fn'}) && ($crstype ne 'Community')) { |
Line 1865 sub rawconfig {
|
Line 1893 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'}, |
Line 1954 END
|
Line 1982 END
|
} |
} |
|
|
sub utilityfunctions { |
sub utilityfunctions { |
|
my ($httphost) = @_; |
my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); |
my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); |
if ($currenturl =~ m{^/adm/wrapper/ext/} |
if ($currenturl =~ m{^/adm/wrapper/ext/} |
&& $env{'request.external.querystring'} ) { |
&& $env{'request.external.querystring'} ) { |
Line 1989 sub utilityfunctions {
|
Line 2018 sub utilityfunctions {
|
my $countdown = &countdown_toggle_js(); |
my $countdown = &countdown_toggle_js(); |
|
|
return (<<ENDUTILITY) |
return (<<ENDUTILITY) |
|
var host="$httphost"; |
var currentURL=unescape("$esc_url"); |
var currentURL=unescape("$esc_url"); |
var reloadURL=unescape("$esc_url"); |
var reloadURL=unescape("$esc_url"); |
var currentSymb=unescape("$esc_symb"); |
var currentSymb=unescape("$esc_symb"); |
Line 2000 function go(url) {
|
Line 2029 function go(url) {
|
if (url!='' && url!= null) { |
if (url!='' && url!= null) { |
currentURL = null; |
currentURL = null; |
currentSymb= null; |
currentSymb= null; |
window.location.href=url; |
window.location.href=host+url; |
} |
} |
} |
} |
|
|
Line 2008 $jumptores
|
Line 2037 $jumptores
|
|
|
function gopost(url,postdata) { |
function gopost(url,postdata) { |
if (url!='') { |
if (url!='') { |
this.document.server.action=url; |
this.document.server.action=host+url; |
this.document.server.postdata.value=postdata; |
this.document.server.postdata.value=postdata; |
this.document.server.command.value=''; |
this.document.server.command.value=''; |
this.document.server.url.value=''; |
this.document.server.url.value=''; |
Line 2019 function gopost(url,postdata) {
|
Line 2048 function gopost(url,postdata) {
|
|
|
function gocmd(url,cmd) { |
function gocmd(url,cmd) { |
if (url!='') { |
if (url!='') { |
this.document.server.action=url; |
this.document.server.action=host+url; |
this.document.server.postdata.value=''; |
this.document.server.postdata.value=''; |
this.document.server.command.value=cmd; |
this.document.server.command.value=cmd; |
this.document.server.url.value=currentURL; |
this.document.server.url.value=currentURL; |
Line 2071 function golist(url) {
|
Line 2100 function golist(url) {
|
if (url!='' && url!= null) { |
if (url!='' && url!= null) { |
currentURL = null; |
currentURL = null; |
currentSymb= null; |
currentSymb= null; |
top.location.href=url; |
top.location.href=host+url; |
} |
} |
} |
} |
|
|
|
|
|
|
function catalog_info() { |
function catalog_info(isMobile) { |
openMyModal(window.location.pathname+'.meta',500,400,'yes'); |
if (isMobile == 1) { |
|
openMyModal(window.location.pathname+'.meta?modal=1',500,400,'yes'); |
|
} else { |
|
loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=500,width=400,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'); |
|
} |
} |
} |
|
|
function chat_win() { |
function chat_win() { |
lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no'); |
lonchat=window.open(host+'/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no'); |
} |
} |
|
|
function group_chat(group) { |
function group_chat(group) { |
var url = '/adm/groupchat?group='+group; |
var url = host+'/adm/groupchat?group='+group; |
var winName = 'LONchat_'+group; |
var winName = 'LONchat_'+group; |
grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no'); |
grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no'); |
} |
} |
Line 2107 function annotate() {
|
Line 2140 function annotate() {
|
function open_StoredLinks_Import(rat) { |
function open_StoredLinks_Import(rat) { |
var newWin; |
var newWin; |
if (rat) { |
if (rat) { |
newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat, |
newWin = window.open(host+'/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat, |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
} |
} |
else { |
else { |
newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import', |
newWin = window.open(host+'/adm/wishlist?inhibitmenu=yes&mode=import', |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
'wishlistImport','scrollbars=1,resizable=1,menubar=0'); |
} |
} |
newWin.focus(); |
newWin.focus(); |
Line 2186 sub hidden_button_check {
|
Line 2219 sub hidden_button_check {
|
} |
} |
|
|
sub roles_selector { |
sub roles_selector { |
my ($cdom,$cnum) = @_; |
my ($cdom,$cnum,$httphost) = @_; |
my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
my $now = time; |
my $now = time; |
my (%courseroles,%seccount,%courseprivs); |
my (%courseroles,%seccount,%courseprivs); |
Line 2291 sub roles_selector {
|
Line 2324 sub roles_selector {
|
my @submenu; |
my @submenu; |
$js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv); |
$js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv); |
$form = |
$form = |
'<form name="rolechooser" method="post" action="/adm/roles">'."\n". |
'<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles">'."\n". |
' <input type="hidden" name="destinationurl" value="'. |
' <input type="hidden" name="destinationurl" value="'. |
&HTML::Entities::encode($destinationurl).'" />'."\n". |
&HTML::Entities::encode($destinationurl).'" />'."\n". |
' <input type="hidden" name="gotorole" value="1" />'."\n". |
' <input type="hidden" name="gotorole" value="1" />'."\n". |