version 1.369.2.18, 2012/08/03 22:38:35
|
version 1.369.2.23, 2012/09/25 23:01:00
|
Line 443 sub secondary_menu {
|
Line 443 sub secondary_menu {
|
} |
} |
$menu =~ s/\[uname\]/$$author{user}/g; |
$menu =~ s/\[uname\]/$$author{user}/g; |
$menu =~ s/\[udom\]/$$author{dom}/g; |
$menu =~ s/\[udom\]/$$author{dom}/g; |
|
if ($menu) { |
return "<ul id=\"LC_secondary_menu\">$menu</ul>"; |
$menu = "<ul id=\"LC_secondary_menu\">$menu</ul>"; |
|
} |
|
return $menu; |
} |
} |
|
|
sub create_submenu { |
sub create_submenu { |
Line 578 sub innerregister {
|
Line 580 sub innerregister {
|
} |
} |
$crs=~s/\_/\//g; |
$crs=~s/\_/\//g; |
|
|
|
my %swtext; |
|
if ($noremote) { |
|
%swtext = &get_inline_text(); |
|
} else { |
|
%swtext = &get_rc_text(); |
|
} |
my $hwkadd=''; |
my $hwkadd=''; |
if ($env{'request.symb'} ne '' && |
if ($env{'request.symb'} ne '' && |
$env{'request.filename'}=~/$LONCAPA::assess_re/) { |
$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',$swtext{'pgrd'},'grades[_4]', |
"gocmd('/adm/grades','gradingmenu')", |
"gocmd('/adm/grades','gradingmenu')", |
'Content Grades'); |
'Content Grades'); |
} elsif (&Apache::lonnet::allowed('vgr',$crs)) { |
} elsif (&Apache::lonnet::allowed('vgr',$crs)) { |
$hwkadd.=&switch('','',7,2,'subm.png','Content Submissions','missions[_1]', |
$hwkadd.=&switch('','',7,2,'subm.png',$swtext{'subm'},'missions[_1]', |
"gocmd('/adm/grades','submission')", |
"gocmd('/adm/grades','submission')", |
'Content Submissions'); |
'Content Submissions'); |
} |
} |
} |
} |
if ($env{'request.symb'} ne '' && |
if ($env{'request.symb'} ne '' && |
&Apache::lonnet::allowed('opa',$crs)) { |
&Apache::lonnet::allowed('opa',$crs)) { |
$hwkadd.=&switch('','',7,3,'pparm.png','Content Settings','parms[_2]', |
$hwkadd.=&switch('','',7,3,'pparm.png',$swtext{'pparm'},'parms[_2]', |
"gocmd('/adm/parmset','set')", |
"gocmd('/adm/parmset','set')", |
'Content Settings'); |
'Content Settings'); |
} |
} |
if ($noremote) { |
if ($noremote) { |
if ($env{'request.symb'}=~/^uploaded/ && |
if ($env{'request.symb'}=~/^uploaded/ && |
&Apache::lonnet::allowed('mdc',$crs)) { |
&Apache::lonnet::allowed('mdc',$crs)) { |
$hwkadd.=&switch('','',7,4,'docs.png','Folder/Page Content','parms[_2]', |
$hwkadd.=&switch('','',7,4,'docs.png',$swtext{'docs'},'parms[_2]', |
"gocmd('/adm/coursedocs','direct')", |
"gocmd('/adm/coursedocs','direct')", |
'Folder/Page Content'); |
'Folder/Page Content'); |
} |
} |
Line 646 sub innerregister {
|
Line 654 sub innerregister {
|
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (!$allowed) { |
if (!$allowed) { |
$editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc); |
$editbutton=&switch('','',6,1,,$top,$bottom,$action,$desc); |
$noeditbutton = 0; |
$noeditbutton = 0; |
} |
} |
} |
} |
Line 713 sub innerregister {
|
Line 721 sub innerregister {
|
} |
} |
} |
} |
$editbutton=&switch |
$editbutton=&switch |
('','',6,1,'pcstr.png','Edit','resource[_2]', |
('','',6,1,'pcstr.png',$swtext{'pcstr'},'resource[_2]', |
$bot,"Edit this resource"); |
$bot,"Edit this resource"); |
$noeditbutton = 0; |
$noeditbutton = 0; |
} |
} |
Line 729 sub innerregister {
|
Line 737 sub innerregister {
|
my $cfile = &edit_course_upload($file,$cnum,$cdom); |
my $cfile = &edit_course_upload($file,$cnum,$cdom); |
if ($cfile) { |
if ($cfile) { |
$editbutton=&switch |
$editbutton=&switch |
('','',6,1,'pcstr.png','Edit', |
('','',6,1,'pcstr.png',$swtext{'pcstr'}, |
'resource[_2]',"go('".$cfile."');", |
'resource[_2]',"go('".$cfile."');", |
'Edit this resource'); |
'Edit this resource'); |
} |
} |
Line 741 sub innerregister {
|
Line 749 sub innerregister {
|
if ($resurl eq "public/$cdom/$cnum/syllabus") { |
if ($resurl eq "public/$cdom/$cnum/syllabus") { |
if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) { |
if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) { |
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
$editbutton=&switch('','',6,1,'pcstr.png','Edit', |
$editbutton=&switch('','',6,1,'pcstr.png',$swtext{'pcstr'}, |
'resource[_2]', |
'resource[_2]', |
"go('/adm/courseprefs?phase=display&actions=courseinfo')", |
"go('/adm/courseprefs?phase=display&actions=courseinfo')", |
'Edit this resource'); |
'Edit this resource'); |
Line 752 sub innerregister {
|
Line 760 sub innerregister {
|
### |
### |
### |
### |
# Prepare the rest of the buttons |
# Prepare the rest of the buttons |
my ($menuitems,$got_prt,$got_wishlist); |
my ($menuitems,$got_prt,$got_wishlist,$cstritems); |
if ($const_space) { |
if ($const_space) { |
# |
# |
# We are in construction space |
# We are in construction space |
Line 778 s&6&3&pub.png&Publish&resource[_3]&gocst
|
Line 786 s&6&3&pub.png&Publish&resource[_3]&gocst
|
s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$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','/priv/$udom/$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 |
|
unless ($noremote) { |
|
$cstritems = $menuitems; |
|
undef($menuitems); |
|
} |
} |
} |
if (ref($bread_crumbs) eq 'ARRAY') { |
if (ref($bread_crumbs) eq 'ARRAY') { |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
Line 791 ENDMENUITEMS
|
Line 803 ENDMENUITEMS
|
# We are in a course and looking at a registered URL |
# We are in a course and looking at a registered URL |
# Should probably be in mydesk.tab |
# Should probably be in mydesk.tab |
# |
# |
|
|
$menuitems=(<<ENDMENUITEMS); |
$menuitems=(<<ENDMENUITEMS); |
c&3&1 |
c&3&1 |
s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1 |
s&2&1&back.png&$swtext{'back'}&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1 |
s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3 |
s&2&3&forw.png&$swtext{'forw'}&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3 |
c&6&3 |
c&6&3 |
c&8&1 |
c&8&1 |
c&8&2 |
c&8&2 |
s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document |
s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document |
ENDMENUITEMS |
ENDMENUITEMS |
$got_prt = 1; |
$got_prt = 1; |
if (($env{'user.adv'}) && ($env{'request.uri'} =~ /^\/res/) |
if (($env{'user.adv'}) && ($env{'request.uri'} =~ /^\/res/) |
Line 806 ENDMENUITEMS
|
Line 819 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&wishlist-link.png&Stored Links&wishlistlink[_2]&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 your personal Stored Links repository&&1 |
ENDMENUITEMS |
ENDMENUITEMS |
$got_wishlist = 1; |
$got_wishlist = 1; |
} |
} |
Line 820 if(length($annotation) > 0){
|
Line 833 if(length($annotation) > 0){
|
}else{ |
}else{ |
$menuitems.="anot.png"; |
$menuitems.="anot.png"; |
} |
} |
$menuitems.="&Notes&&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"; |
|
|
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&Info&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/}) { |
$menuitems.=(<<ENDREALRES); |
$menuitems.=(<<ENDREALRES); |
s&8&1&eval.png&Evaluate&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); |
$menuitems.=(<<ENDREALRES); |
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 |
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/) { |
unless ($got_prt) { |
unless ($got_prt) { |
$menuitems .= (<<ENDMENUITEMS); |
$menuitems .= (<<ENDMENUITEMS); |
s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document |
s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document |
ENDMENUITEMS |
ENDMENUITEMS |
$got_prt = 1; |
$got_prt = 1; |
} |
} |
Line 850 ENDMENUITEMS
|
Line 863 ENDMENUITEMS
|
if (($env{'user.adv'}) && (!$env{'request.enc'})) { |
if (($env{'user.adv'}) && (!$env{'request.enc'})) { |
# wishlist is only available for users with access to resource-pool |
# wishlist is only available for users with access to resource-pool |
$menuitems .= (<<ENDMENUITEMS); |
$menuitems .= (<<ENDMENUITEMS); |
s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&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 your personal Stored Links repository&&1 |
ENDMENUITEMS |
ENDMENUITEMS |
$got_wishlist = 1; |
$got_wishlist = 1; |
} |
} |
} |
} |
} |
} |
|
unless ($got_prt) { |
|
$menuitems .= (<<ENDMENUITEMS); |
|
c&8&3 |
|
ENDMENUITEMS |
|
} |
|
unless ($got_wishlist) { |
|
$menuitems .= (<<ENDMENUITEMS); |
|
c&9&1 |
|
ENDMENUITEMS |
|
} |
my $buttons=''; |
my $buttons=''; |
foreach (split(/\n/,$menuitems)) { |
foreach (split(/\n/,$menuitems)) { |
my ($command,@rest)=split(/\&/,$_); |
my ($command,@rest)=split(/\&/,$_); |
Line 916 ENDMENUITEMS
|
Line 939 ENDMENUITEMS
|
. &Apache::lonhtmlcommon::scripttag('', 'end'); |
. &Apache::lonhtmlcommon::scripttag('', 'end'); |
|
|
} else { |
} else { |
|
my $cstrcrumbs; |
|
if ($const_space) { |
|
foreach (split(/\n/,$cstritems)) { |
|
my ($command,@rest)=split(/\&/,$_); |
|
my $idx=10*$rest[0]+$rest[1]; |
|
&switch('','',@rest); |
|
} |
|
&Apache::lonhtmlcommon::add_breadcrumb_tool('advtools', |
|
@inlineremote[63,61,71,72]); |
|
|
|
$cstrcrumbs = &Apache::lonhtmlcommon::scripttag('', 'start') |
|
.&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) |
|
.&Apache::lonhtmlcommon::scripttag('', 'end'); |
|
} |
my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); |
my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); |
$requri=&Apache::lonenc::check_encrypt(&unescape($requri)); |
$requri=&Apache::lonenc::check_encrypt(&unescape($requri)); |
my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); |
my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); |
Line 964 var swmenu=null;
|
Line 1001 var swmenu=null;
|
// END LON-CAPA Internal |
// END LON-CAPA Internal |
// ]]> |
// ]]> |
</script> |
</script> |
|
|
|
$cstrcrumbs |
ENDREGTHIS |
ENDREGTHIS |
} |
} |
} else { |
} else { |
Line 985 var swmenu=null;
|
Line 1024 var swmenu=null;
|
swmenu.clearbut(8,1); |
swmenu.clearbut(8,1); |
swmenu.clearbut(8,2); |
swmenu.clearbut(8,2); |
swmenu.clearbut(8,3); |
swmenu.clearbut(8,3); |
|
swmenu.clearbut(9,1); |
if (swmenu.currentURL) { |
if (swmenu.currentURL) { |
swmenu.switchbutton |
swmenu.switchbutton |
(3,1,'reload.gif','return','location','go(currentURL)'); |
(3,1,'reload.gif','return','location','go(currentURL)'); |
Line 1006 ENDDONOTREGTHIS
|
Line 1046 ENDDONOTREGTHIS
|
} |
} |
} |
} |
|
|
|
sub get_inline_text { |
|
my %text = ( |
|
pgrd => 'Content Grades', |
|
subm => 'Content Submissions', |
|
pparm => 'Content Settings', |
|
docs => 'Folder/Page Content', |
|
pcstr => 'Edit', |
|
prt => 'Print', |
|
alnk => 'Stored Links', |
|
anot => 'Notes', |
|
catalog => 'Info', |
|
eval => 'Evaluate', |
|
fdbk => 'Feedback', |
|
); |
|
return %text; |
|
} |
|
|
|
sub get_rc_text { |
|
my %text = ( |
|
pgrd => 'problem[_1]', |
|
subm => 'view sub-[_1]', |
|
pparm => 'problem[_2]', |
|
pcstr => 'edit[_1]', |
|
prt => 'prepare[_1]', |
|
back => 'backward[_1]', |
|
forw => 'forward[_1]', |
|
alnk => 'add to[_1]', |
|
anot => 'anno-[_1]', |
|
catalog => 'catalog[_2]', |
|
eval => 'evaluate[_1]', |
|
fdbk => 'feedback[_1]', |
|
); |
|
return %text; |
|
} |
|
|
sub is_course_upload { |
sub is_course_upload { |
my ($file,$cnum,$cdom) = @_; |
my ($file,$cnum,$cdom) = @_; |
my $uploadpath = &LONCAPA::propath($cdom,$cnum); |
my $uploadpath = &LONCAPA::propath($cdom,$cnum); |
Line 1241 sub switch {
|
Line 1316 sub switch {
|
|
|
if ($env{'environment.remote'} eq 'on') { |
if ($env{'environment.remote'} eq 'on') { |
if (($row<1) || ($row>13)) { return ''; } |
if (($row<1) || ($row>13)) { return ''; } |
|
if ($env{'request.state'} eq 'construct') { |
|
my $text = $top.' '.$bot; |
|
$text=~s/\s*\-\s*//gs; |
|
my $pic = '<img alt="'.$text.'" src="'. |
|
&Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img). |
|
'" align="'.($nobreak==3?'right':'left').'" class="LC_icon" />'; |
|
$inlineremote[$idx] = |
|
'<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'. |
|
$pic.'<span class="LC_menubuttons_inline_text">'.$top.' </span></a>'; |
|
} |
# Remote |
# Remote |
$img=~s/\.png$/\.gif/; |
$img=~s/\.png$/\.gif/; |
return "\n". |
return "\n". |
Line 1890 sub roles_selector {
|
Line 1975 sub roles_selector {
|
} else { |
} else { |
$ccrole = 'cc'; |
$ccrole = 'cc'; |
} |
} |
my $priv; |
my ($priv,$gotsymb,$destsymb); |
my $destinationurl = $ENV{'REQUEST_URI'}; |
my $destinationurl = $ENV{'REQUEST_URI'}; |
|
if ($destinationurl =~ /\?symb=/) { |
|
$gotsymb = 1; |
|
} elsif ($destinationurl =~ m{^/enc/}) { |
|
my $plainurl = &Apache::lonenc::unencrypted($destinationurl); |
|
if ($plainurl =~ /\?symb=/) { |
|
$gotsymb = 1; |
|
} |
|
} |
|
unless ($gotsymb) { |
|
$destsymb = &Apache::lonnet::symbread(); |
|
if ($destsymb ne '') { |
|
$destsymb = &Apache::lonenc::check_encrypt($destsymb); |
|
} |
|
} |
my $reqprivs = &required_privs(); |
my $reqprivs = &required_privs(); |
if (ref($reqprivs) eq 'HASH') { |
if (ref($reqprivs) eq 'HASH') { |
my $destination = $destinationurl; |
my $destination = $destinationurl; |
Line 1979 sub roles_selector {
|
Line 2078 sub roles_selector {
|
$role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>'; |
$role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>'; |
} |
} |
} |
} |
$role_selector .= '</select>'."\n". |
$role_selector .= '</select>'."\n"; |
|
if ($destsymb ne '') { |
|
$role_selector .= '<input type="hidden" name="destsymb" value="'. |
|
&HTML::Entities::encode($destsymb).'" />'."\n"; |
|
} |
|
$role_selector .= |
'<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". |