version 1.352, 2011/10/21 15:26:27
|
version 1.366, 2011/12/28 22:41:02
|
Line 153 use Apache::lonhtmlcommon();
|
Line 153 use Apache::lonhtmlcommon();
|
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonenc(); |
use Apache::lonenc(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
use Apache::lonmsg(); |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
use HTML::Entities(); |
use HTML::Entities(); |
use Apache::lonwishlist(); |
use Apache::lonwishlist(); |
Line 334 sub secondary_menu {
|
Line 335 sub secondary_menu {
|
and ( $env{'request.noversionuri'} eq '' |
and ( $env{'request.noversionuri'} eq '' |
|| !defined($env{'request.noversionuri'}))) |
|| !defined($env{'request.noversionuri'}))) |
{ |
{ |
($escurl = $env{'request.filename'}) =~ |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
s{^/home/([^/]+)/public_html/(.*)$}{/priv/$1/$2}; |
($escurl = $env{'request.filename'}) =~ s{^\Q$londocroot\E}{}; |
|
|
$escurl = &escape($escurl); |
$escurl = &escape($escurl); |
} |
} |
$menu =~ s/\[url\]/$escurl/g; |
$menu =~ s/\[url\]/$escurl/g; |
Line 411 sub innerregister {
|
Line 411 sub innerregister {
|
|
|
my $hwkadd=''; |
my $hwkadd=''; |
if ($env{'request.symb'} ne '' && |
if ($env{'request.symb'} ne '' && |
$env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) { |
$env{'request.filename'}=~/$LONCAPA::assess_re/) { |
if (&Apache::lonnet::allowed('mgr',$crs)) { |
if (&Apache::lonnet::allowed('mgr',$crs)) { |
$hwkadd.=&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]', |
$hwkadd.=&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]', |
"gocmd('/adm/grades','gradingmenu')", |
"gocmd('/adm/grades','gradingmenu')", |
Line 428 sub innerregister {
|
Line 428 sub innerregister {
|
"gocmd('/adm/parmset','set')", |
"gocmd('/adm/parmset','set')", |
'Content Settings'); |
'Content Settings'); |
} |
} |
|
if ($env{'request.symb'}=~/^uploaded/ && |
|
&Apache::lonnet::allowed('mdc',$crs)) { |
|
$hwkadd.=&switch('','',7,4,'docs.png','Folder/Page Content','parms[_2]', |
|
"gocmd('/adm/coursedocs','direct')", |
|
'Folder/Page Content'); |
|
} |
# -- End Homework |
# -- End Homework |
### |
### |
### Determine whether or not to display the 'cstr' button for this |
### Determine whether or not to display the 'cstr' button for this |
Line 447 sub innerregister {
|
Line 453 sub innerregister {
|
# |
# |
# Set defaults for authors |
# Set defaults for authors |
my ($top,$bottom) = ('con-','struct'); |
my ($top,$bottom) = ('con-','struct'); |
my $action = "go('/priv/".$env{'user.name'}."');"; |
my $action = "go('/priv/".$env{'user.domain'}.'/'.$env{'user.name'}."');"; |
my $cadom = $env{'request.role.domain'}; |
my $cadom = $env{'request.role.domain'}; |
my $caname = $env{'user.name'}; |
my $caname = $env{'user.name'}; |
my $desc = "Enter my construction space"; |
my $desc = "Enter my construction space"; |
Line 455 sub innerregister {
|
Line 461 sub innerregister {
|
if ($env{'request.role'} =~ /^ca/) { |
if ($env{'request.role'} =~ /^ca/) { |
($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
($top,$bottom) = ('co con-','struct'); |
($top,$bottom) = ('co con-','struct'); |
$action = "go('/priv/".$caname."');"; |
$action = "go('/priv/".$cadom.'/'.$caname."');"; |
$desc = "Enter construction space as co-author"; |
$desc = "Enter construction space as co-author"; |
} elsif ($env{'request.role'} =~ /^aa/) { |
} elsif ($env{'request.role'} =~ /^aa/) { |
($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
($top,$bottom) = ('co con-','struct'); |
($top,$bottom) = ('co con-','struct'); |
$action = "go('/priv/".$caname."');"; |
$action = "go('/priv/".$cadom.'/'.$caname."');"; |
$desc = "Enter construction space as assistant co-author"; |
$desc = "Enter construction space as assistant co-author"; |
} |
} |
# Check that we are on the correct machine |
# Check that we are on the correct machine |
Line 493 sub innerregister {
|
Line 499 sub innerregister {
|
$uploaded = &is_course_upload($file,$cnum,$cdom); |
$uploaded = &is_course_upload($file,$cnum,$cdom); |
} |
} |
if (!$uploaded) { |
if (!$uploaded) { |
$file=~s/^($match_domain)\/($match_username)/\/priv\/$2/; |
|
|
$file=~s{^(priv/$match_domain/$match_username)}{/$1}; |
|
$file=~s{^($match_domain/$match_username)}{/priv/$1}; |
|
|
# Check that the user has permission to edit this resource |
# Check that the user has permission to edit this resource |
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); |
my $setpriv = 1; |
|
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$setpriv); |
if (defined($cfudom)) { |
if (defined($cfudom)) { |
$home=&Apache::lonnet::homeserver($cfuname,$cfudom); |
$home=&Apache::lonnet::homeserver($cfuname,$cfudom); |
my $allowed=0; |
my $allowed=0; |
Line 576 sub innerregister {
|
Line 586 sub innerregister {
|
# |
# |
# We are in construction space |
# We are in construction space |
# |
# |
my ($uname,$thisdisfn) = |
|
($env{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $currdir = '/priv/'.$uname.'/'.$thisdisfn; |
my ($udom,$uname,$thisdisfn) = |
|
($env{'request.filename'}=~m{^\Q$londocroot/priv/\E([^/]+)/([^/]+)/(.*)$}); |
|
my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; |
if ($currdir =~ m-/$-) { |
if ($currdir =~ m-/$-) { |
$is_const_dir = 1; |
$is_const_dir = 1; |
} else { |
} else { |
Line 590 sub innerregister {
|
Line 602 sub innerregister {
|
# |
# |
$menuitems=(<<ENDMENUITEMS); |
$menuitems=(<<ENDMENUITEMS); |
s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory |
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&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','/~$uname/$cleandisfn')&Publish this resource |
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','/~$uname/$cleandisfn')&Delete 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','/~$uname/$cleandisfn')&Prepare a printable document |
s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document |
ENDMENUITEMS |
ENDMENUITEMS |
} |
} |
if (ref($bread_crumbs) eq 'ARRAY') { |
if (ref($bread_crumbs) eq 'ARRAY') { |
Line 703 ENDMENUITEMS
|
Line 715 ENDMENUITEMS
|
|
|
unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) { |
unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) { |
&Apache::lonhtmlcommon::add_breadcrumb_tool( |
&Apache::lonhtmlcommon::add_breadcrumb_tool( |
'advtools', @inlineremote[61,71,72,73,92]); |
'advtools', @inlineremote[61,71,72,73,74,92]); |
} |
} |
} |
} |
} |
} |
Line 1001 sub rawconfig {
|
Line 1013 sub rawconfig {
|
($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
} |
} |
$act =~ s/\$caname/$caname/g; |
$act =~ s/\$caname/$caname/g; |
|
$act =~ s/\$cadom/$cadom/g; |
my $home = &Apache::lonnet::homeserver($caname,$cadom); |
my $home = &Apache::lonnet::homeserver($caname,$cadom); |
my $allowed=0; |
my $allowed=0; |
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
Line 1217 function golist(url) {
|
Line 1230 function golist(url) {
|
|
|
|
|
function catalog_info() { |
function catalog_info() { |
loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'); |
openMyModal(window.location.pathname+'.meta',500,400,'yes'); |
} |
} |
|
|
function chat_win() { |
function chat_win() { |
Line 1243 function annotate() {
|
Line 1256 function annotate() {
|
annotator.document.close(); |
annotator.document.close(); |
} |
} |
|
|
function set_wishlistlink(title, path) { |
|
if (!title) { |
|
title = document.title; |
|
title = title.replace(/^LON-CAPA /,''); |
|
} |
|
if (!path) { |
|
path = location.pathname; |
|
} |
|
Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path, |
|
'wishlistNewLink','width=560,height=350,scrollbars=0'); |
|
} |
|
|
|
function open_Wishlist_Import(rat) { |
function open_Wishlist_Import(rat) { |
var newWin; |
var newWin; |
if (rat) { |
if (rat) { |
Line 1655 sub required_privs {
|
Line 1656 sub required_privs {
|
'/adm/populate' => 'cst', |
'/adm/populate' => 'cst', |
'/adm/trackstudent' => 'vsa', |
'/adm/trackstudent' => 'vsa', |
'/adm/statistics' => 'vgr', |
'/adm/statistics' => 'vgr', |
|
'/adm/setblock' => 'dcm', |
}; |
}; |
unless ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet') { |
unless ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet') { |
$privs->{'/adm/classcalc'} => 'vgr', |
$privs->{'/adm/classcalc'} = 'vgr', |
$privs->{'/adm/assesscalc'} => 'vgr', |
$privs->{'/adm/assesscalc'} = 'vgr', |
$privs->{'/adm/studentcalc'} => 'vgr'; |
$privs->{'/adm/studentcalc'} = 'vgr'; |
} |
} |
return $privs; |
return $privs; |
} |
} |