version 1.369.2.35, 2013/01/07 22:37:29
|
version 1.369.2.38, 2013/03/19 23:31:15
|
Line 636 sub innerregister {
|
Line 636 sub innerregister {
|
$forceview,$editbutton); |
$forceview,$editbutton); |
if (($resurl =~ m{^/adm/($match_domain)/($match_username)/aboutme$}) || |
if (($resurl =~ m{^/adm/($match_domain)/($match_username)/aboutme$}) || |
($env{'request.role'} !~/^(aa|ca|au)/)) { |
($env{'request.role'} !~/^(aa|ca|au)/)) { |
|
if (($env{'environment.remote'} eq 'on') && ($env{'request.symb'})) { |
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
|
} |
$editbutton = &prepare_functions($resurl,$forcereg,$group); |
$editbutton = &prepare_functions($resurl,$forcereg,$group); |
} |
} |
if ($editbutton eq '') { |
if ($editbutton eq '') { |
Line 1220 sub get_editbutton {
|
Line 1223 sub get_editbutton {
|
$icon = 'tolastloc.png'; |
$icon = 'tolastloc.png'; |
$label = 'Exit Editing'; |
$label = 'Exit Editing'; |
} |
} |
&switch('','',6,1,$icon,$label,'resource[_2]', |
my $infunc = 1; |
$jscall,"Edit this resource"); |
my $clearbutton; |
return 1; |
if ($env{'environment.remote'} eq 'on') { |
|
if ($cfile =~ m{^/priv/}) { |
|
undef($infunc); |
|
$label = 'edit'; |
|
} else { |
|
$clearbutton = 1; |
|
} |
|
} |
|
my $editor = &switch('','',6,1,$icon,$label,'resource[_2]', |
|
$jscall,"Edit this resource",'','',$infunc); |
|
if ($infunc) { |
|
return 1; |
|
} elsif ($clearbutton) { |
|
return &clear(6,1); |
|
} else { |
|
return $editor; |
|
} |
} |
} |
return; |
return; |
} |
} |
|
|
sub prepare_functions { |
sub prepare_functions { |
my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs) = @_; |
my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs,$forbodytag) = @_; |
unless ($env{'request.registered'}) { |
unless ($env{'request.registered'}) { |
undef(@inlineremote); |
undef(@inlineremote); |
} |
} |
Line 1278 sub prepare_functions {
|
Line 1297 sub prepare_functions {
|
&switch('','',6,1,'pcstr.png','Edit', |
&switch('','',6,1,'pcstr.png','Edit', |
'resource[_2]', |
'resource[_2]', |
"go('/adm/courseprefs?phase=display&actions=courseinfo')", |
"go('/adm/courseprefs?phase=display&actions=courseinfo')", |
'Edit this resource'); |
'Edit this resource','','',1); |
$editbutton = 1; |
$editbutton = 1; |
} else { |
} else { |
$cfile = $resurl; |
$cfile = $resurl; |
Line 1332 sub prepare_functions {
|
Line 1351 sub prepare_functions {
|
&switch('','',6,4,'mail-message-new-22x22.png','Message to user', |
&switch('','',6,4,'mail-message-new-22x22.png','Message to user', |
'', |
'', |
"go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')", |
"go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')", |
'Send message to specific user'); |
'Send message to specific user','','',1); |
} |
} |
my $hideprivileged = 1; |
my $hideprivileged = 1; |
if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef, |
if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef, |
Line 1348 sub prepare_functions {
|
Line 1367 sub prepare_functions {
|
&switch('','',6,5,'trck-22x22.png','Activity', |
&switch('','',6,5,'trck-22x22.png','Activity', |
'', |
'', |
"go('/adm/trackstudent?selected_student=$sname:$sdom')", |
"go('/adm/trackstudent?selected_student=$sname:$sdom')", |
'View recent activity by this person'); |
'View recent activity by this person','','',1); |
} |
} |
if ($perms{'vgr'}) { |
if ($perms{'vgr'}) { |
&switch('','',6,6,'rsrv-22x22.png','Reservations', |
&switch('','',6,6,'rsrv-22x22.png','Reservations', |
'', |
'', |
"go('/adm/slotrequest?command=showresv&origin=aboutme&uname=$sname&udom=$sdom')", |
"go('/adm/slotrequest?command=showresv&origin=aboutme&uname=$sname&udom=$sdom')", |
'Slot reservation history'); |
'Slot reservation history','','',1); |
} |
} |
if ($perms{'srm'}) { |
if ($perms{'srm'}) { |
&switch('','',6,7,'contact-new-22x22.png','Records', |
&switch('','',6,7,'contact-new-22x22.png','Records', |
'', |
'', |
"go('/adm/email?recordftf=retrieve&recname=$sname&recdom=$sdom')", |
"go('/adm/email?recordftf=retrieve&recname=$sname&recdom=$sdom')", |
'Add records'); |
'Add records','','',1); |
} |
} |
} |
} |
} |
} |
Line 1376 sub prepare_functions {
|
Line 1395 sub prepare_functions {
|
my $esc_path=&escape(&HTML::Entities::encode(&escape($env{'form.folderpath'}),'<>&"')); |
my $esc_path=&escape(&HTML::Entities::encode(&escape($env{'form.folderpath'}),'<>&"')); |
&switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]', |
&switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]', |
"location.href='/adm/coursedocs?command=direct&forcesupplement=1&supppath=$esc_path'", |
"location.href='/adm/coursedocs?command=direct&forcesupplement=1&supppath=$esc_path'", |
'Folder/Page Content'); |
'Folder/Page Content','','',1); |
} |
} |
} |
} |
} |
} |
Line 1386 sub prepare_functions {
|
Line 1405 sub prepare_functions {
|
&Apache::lonhtmlcommon::clear_breadcrumb_tools(); |
&Apache::lonhtmlcommon::clear_breadcrumb_tools(); |
&advtools_crumbs(@inlineremote); |
&advtools_crumbs(@inlineremote); |
return $editbutton; |
return $editbutton; |
} elsif ($env{'request.registered'}) { |
} elsif (($env{'request.registered'}) && (!ref($forbodytag))) { |
return $editbutton; |
return $editbutton; |
} else { |
} else { |
if (ref($bread_crumbs) eq 'ARRAY') { |
if (ref($bread_crumbs) eq 'ARRAY') { |
Line 1399 sub prepare_functions {
|
Line 1418 sub prepare_functions {
|
} elsif (@inlineremote > 0) { |
} elsif (@inlineremote > 0) { |
&Apache::lonhtmlcommon::clear_breadcrumb_tools(); |
&Apache::lonhtmlcommon::clear_breadcrumb_tools(); |
&advtools_crumbs(@inlineremote); |
&advtools_crumbs(@inlineremote); |
return &Apache::lonhtmlcommon::scripttag('', 'start') |
if (ref($forbodytag)) { |
. &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) |
$$forbodytag = |
. &Apache::lonhtmlcommon::scripttag('', 'end'); |
&Apache::lonhtmlcommon::scripttag('', 'start') |
|
.&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) |
|
.&Apache::lonhtmlcommon::scripttag('', 'end'); |
|
} |
|
return; |
} |
} |
} |
} |
} |
} |
Line 1438 sub clear {
|
Line 1461 sub clear {
|
# The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)". |
# The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)". |
|
|
sub switch { |
sub switch { |
my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak)=@_; |
my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak,$infunc)=@_; |
$act=~s/\$uname/$uname/g; |
$act=~s/\$uname/$uname/g; |
$act=~s/\$udom/$udom/g; |
$act=~s/\$udom/$udom/g; |
$top=&mt($top); |
$top=&mt($top); |
Line 1447 sub switch {
|
Line 1470 sub switch {
|
my $idx=10*$row+$col; |
my $idx=10*$row+$col; |
$category_members{$cat}.=':'.$idx; |
$category_members{$cat}.=':'.$idx; |
|
|
if ($env{'environment.remote'} eq 'on') { |
if (($env{'environment.remote'} eq 'on') && (!$infunc)) { |
if (($row<1) || ($row>13)) { return ''; } |
if (($row<1) || ($row>13)) { return ''; } |
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
my $text = $top.' '.$bot; |
my $text = $top.' '.$bot; |
Line 2181 sub roles_selector {
|
Line 2204 sub roles_selector {
|
} |
} |
} |
} |
} |
} |
$switchtext = &mt('Switch role') |
$switchtext = &mt('Switch role'); |
my @roles_order = ($ccrole,'in','ta','ep','ad','st'); |
my @roles_order = ($ccrole,'in','ta','ep','ad','st'); |
my $numdiffsec; |
my $numdiffsec; |
if (keys(%seccount) == 1) { |
if (keys(%seccount) == 1) { |
Line 2303 sub get_all_courseroles {
|
Line 2326 sub get_all_courseroles {
|
push(@{$courseroles->{'st'}},keys(%sections_count)); |
push(@{$courseroles->{'st'}},keys(%sections_count)); |
$seccount->{'st'} = scalar(keys(%sections_count)); |
$seccount->{'st'} = scalar(keys(%sections_count)); |
} |
} |
|
$seccount->{'st'} ++; # Increment for a section-less student role. |
my $rolehash = { |
my $rolehash = { |
'roles' => $courseroles, |
'roles' => $courseroles, |
'seccount' => $seccount, |
'seccount' => $seccount, |