version 1.369.2.20, 2012/08/07 01:35:47
|
version 1.369.2.24, 2012/09/26 00:39:32
|
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 758 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 sub innerregister {
|
Line 780 sub innerregister {
|
# Probably should be in mydesk.tab |
# Probably should be in mydesk.tab |
# |
# |
$menuitems=(<<ENDMENUITEMS); |
$menuitems=(<<ENDMENUITEMS); |
s&6&1&list.png&$swtext{'list'}&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&$swtext{'rtrv'}&version[_1]&gocstr('/adm/retrieve','/priv/$udom/$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&$swtext{'pub'}&resource[_3]&gocstr('/adm/publish','/priv/$udom/$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&$swtext{'del'}&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&$swtext{'prt'}&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 933 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 981 var swmenu=null;
|
Line 1001 var swmenu=null;
|
// END LON-CAPA Internal |
// END LON-CAPA Internal |
// ]]> |
// ]]> |
</script> |
</script> |
|
|
|
$cstrcrumbs |
ENDREGTHIS |
ENDREGTHIS |
} |
} |
} else { |
} else { |
Line 1031 sub get_inline_text {
|
Line 1053 sub get_inline_text {
|
pparm => 'Content Settings', |
pparm => 'Content Settings', |
docs => 'Folder/Page Content', |
docs => 'Folder/Page Content', |
pcstr => 'Edit', |
pcstr => 'Edit', |
list => 'Directory', |
|
rtrv => 'Retrieve', |
|
pub => 'Publish', |
|
del => 'Delete', |
|
prt => 'Print', |
prt => 'Print', |
alnk => 'Stored Links', |
alnk => 'Stored Links', |
anot => 'Notes', |
anot => 'Notes', |
Line 1051 sub get_rc_text {
|
Line 1069 sub get_rc_text {
|
subm => 'view sub-[_1]', |
subm => 'view sub-[_1]', |
pparm => 'problem[_2]', |
pparm => 'problem[_2]', |
pcstr => 'edit[_1]', |
pcstr => 'edit[_1]', |
list => 'list[_1]', |
|
rtrv => 'retrieve[_1]', |
|
pub => 'publish[_1]', |
|
del => 'delete[_1]', |
|
prt => 'prepare[_1]', |
prt => 'prepare[_1]', |
back => 'backward[_1]', |
back => 'backward[_1]', |
forw => 'forward[_1]', |
forw => 'forward[_1]', |
Line 1302 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 1951 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 2040 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". |
Line 2296 sub required_privs {
|
Line 2339 sub required_privs {
|
|
|
sub countdown_timer { |
sub countdown_timer { |
if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') && |
if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') && |
($env{'request.filename'}=~/$LONCAPA::assess_re/) && |
($env{'request.filename'}=~/$LONCAPA::assess_re/)) { |
($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { |
my ($type,$hastimeleft,$slothastime); |
|
my $now = time; |
|
if ($env{'request.filename'} =~ /\.task$/) { |
|
$type = 'Task'; |
|
} else { |
|
$type = 'problem'; |
|
} |
|
my ($status,$accessmsg,$slot_name,$slot) = |
|
&Apache::lonhomework::check_slot_access('0',$type); |
|
if ($slot_name ne '') { |
|
if (ref($slot) eq 'HASH') { |
|
if (($slot->{'starttime'} < $now) && |
|
($slot->{'endtime'} > $now)) { |
|
$slothastime = 1; |
|
} |
|
} |
|
} |
|
if ($status ne 'CAN_ANSWER') { |
|
return; |
|
} |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
my $hastimeleft; |
my $hastimeleft; |
Line 2310 sub countdown_timer {
|
Line 2372 sub countdown_timer {
|
} |
} |
} |
} |
if (($duedate && $duedate > time) || |
if (($duedate && $duedate > time) || |
(!$duedate && $hastimeleft)) { |
(!$duedate && $hastimeleft) || |
|
($slot_name ne '' && $slothastime)) { |
my ($collapse,$expand,$alttxt,$title,$currdisp); |
my ($collapse,$expand,$alttxt,$title,$currdisp); |
if (@interval > 1 && $hastimeleft) { |
if ((@interval > 1 && $hastimeleft) || |
|
($type eq 'Task' && $slothastime)) { |
$currdisp = 'inline'; |
$currdisp = 'inline'; |
$collapse = '► '; |
$collapse = '► '; |
} else { |
} else { |