-
+ |
$title
-
+ |
ENDONE
return $output;
@@ -3350,7 +3540,7 @@ PARAMSONE
itemh = itemid.offsetHeight;
}
var primaryheight = 0;
- if (document.getElementById('LC_nav_bar') != null) {
+ if (document.getElementById('LC_nav_bar') != null) {
primaryheight = document.getElementById('LC_nav_bar').offsetHeight;
}
var secondaryheight = 0;
@@ -3484,6 +3674,10 @@ sub jump_to_editres {
if ($cfile =~ m{^/priv/($match_domain)/($match_username)/}) {
my ($audom,$auname) = ($1,$2);
unless (&Apache::lonnet::is_course($audom,$auname)) {
+ unless ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$audom)) &&
+ (&Apache::lonnet::will_trust('coaurem',$audom,$env{'user.domain'}))) {
+ return;
+ }
if (($symb ne '') && ($env{'request.course.id'}) &&
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
unless (&Apache::lonnet::can_switchserver($env{'user.domain'},$home)) {
@@ -3509,7 +3703,7 @@ sub jump_to_editres {
if ($forcereg) {
$cfile .= '®ister=1';
}
- $jscall = "need_switchserver('".&Apache::loncommon::escape_single($cfile)."','$target');";
+ $jscall = "need_switchserver('".&Apache::loncommon::escape_single($cfile)."','$target')";
}
} else {
unless ($cfile =~ m{^/priv/}) {
@@ -3526,7 +3720,7 @@ sub jump_to_editres {
if ($env{'request.use_absolute'} =~ m{^https://}) {
$usehttps = 1;
}
- }
+ }
} elsif ($cfile =~ m{^/?public/($match_domain)/($match_courseid)/syllabus}) {
if ($ENV{'SERVER_PORT'} == 443) {
my ($cdom,$cnum) = ($1,$2);
@@ -3726,7 +3920,9 @@ sub scripttag {
Constructs a XHTML list from \@array.
-input:
+=over
+
+=item input:
=over
@@ -3740,7 +3936,9 @@ Attributes for and - passed in a
See htmltag() for more details.
=back
-
+
+=back
+
returns: XHTML list as String.
=cut
@@ -3788,7 +3986,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
@@ -3811,30 +4009,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);
}
@@ -3859,13 +4052,19 @@ should be included in this list.
If the optional headline text is not provided, a default text will be used.
+=over
+
+=item Related routines:
-Related routines:
=over 4
-add_item_funclist
-end_funclist
+
+=item add_item_funclist
+
+=item end_funclist
+
=back
+=back
Inputs: (optional) headline text
@@ -3892,10 +4091,18 @@ sub start_funclist {
Adds an item to the list of available functions
-Related routines:
+=over
+
+=item Related routines:
+
=over 4
-start_funclist
-end_funclist
+
+=item start_funclist
+
+=item end_funclist
+
+=back
+
=back
Inputs: content item with text and link to function
@@ -3918,10 +4125,13 @@ sub add_item_funclist {
End list of available functions
-Related routines:
-=over 4
-start_funclist
-add_item_funclist
+=over
+
+=item Related routines:
+
+ start_funclist
+ add_item_funclist
+
=back
Inputs: ./.
@@ -3954,7 +4164,7 @@ A string that's used as visually highlig
it's value evaluates to false.
=back
-
+
returns: XHTML list as string.
=back
@@ -3967,7 +4177,7 @@ sub funclist_from_array {
$args->{legend} ||= mt('Functions');
return list_from_array( [$args->{legend}, @$items],
{ listattr => {class => 'LC_funclist'} });
-}
+}
=pod
@@ -3989,8 +4199,8 @@ e.g. a file operation in Authoring Space
A reference to the array containing text. Details: sub funclist_from_array
=back
-
-Returns: XHTML div as string.
+
+Returns: XHTML div as string.
=back
|