-
+ |
$title
-
+ |
ENDONE
return $output;
@@ -3529,7 +3613,10 @@ THIRD
sub javascript_jumpto_resource {
my $confirm_switch = &mt("Editing requires switching to the resource's home server.")."\n".
&mt('Switch server?');
+ my $confirm_new_tab = &mt("Editing requires using the resource's home server.")."\n".
+ &mt('Open a new browser tab?');
&js_escape(\$confirm_switch);
+ &js_escape(\$confirm_new_tab);
return (<&');
- if ($symb) {
- $cfile .= '&symb='.&HTML::Entities::encode($symb,'"<>&');
+ if ($shownsymb) {
+ $cfile .= '&symb='.&HTML::Entities::encode($shownsymb,'"<>&');
+ if ($resedit) {
+ $cfile .= '&edit=1';
+ }
} elsif ($folderpath) {
$cfile .= '&folderpath='.&HTML::Entities::encode($folderpath,'"<>&');
}
@@ -3582,7 +3693,7 @@ sub jump_to_editres {
if ($forcereg) {
$cfile .= '®ister=1';
}
- $jscall = "need_switchserver('".&Apache::loncommon::escape_single($cfile)."');";
+ $jscall = "need_switchserver('".&Apache::loncommon::escape_single($cfile)."','$target')";
}
} else {
unless ($cfile =~ m{^/priv/}) {
@@ -3865,7 +3976,7 @@ sub list_from_array {
sub generate_menu {
my @menu = @_;
# subs for specific html elements
- my ($h3, $div, $ul, $li, $a, $img) = inittags( qw(h3 div ul li a img) );
+ my ($h2, $div, $ul, $li, $a, $img) = inittags( qw(h2 div ul li a img) );
my @categories; # each element represents the entire markup for a category
@@ -3888,30 +3999,25 @@ sub generate_menu {
src => $src,
alt => mt(defined($$link{alttext}) ?
$$link{alttext} : $$link{linktext})
- }), {
- href => $$link{url},
- title => mt($$link{linktitle}),
- class => 'LC_menubuttons_link'
- }).
- $a->(mt($$link{linktext}), {
+ }).mt($$link{linktext}), {
href => $$link{url},
title => mt($$link{linktitle}),
class => "LC_menubuttons_link"
}).
- (defined($$link{help}) ?
+ (defined($$link{help}) ?
Apache::loncommon::help_open_topic($$link{help}) : ''),
{class => "LC_menubuttons_inline_text"}));
}
- # wrap categorytitle in , concatenate with
+ # wrap categorytitle in , concatenate with
# joined and in tags wrapped @links
# and wrap everything in an enclosing and push it into
# @categories
# such that each element looks like:
- #
+ #
# the category won't be added if there aren't any links
push(@categories,
- $div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).
+ $div->($h2->(mt($$category{categorytitle}), {class=>'LC_hcell LC_heading_2'}).
$ul->(join('' ,@links), {class =>"LC_ListStyleNormal" }),
{class=>"LC_Box LC_400Box"})) if scalar(@links);
}
|