--- loncom/interface/lonhtmlcommon.pm 2008/12/05 10:23:56 1.192
+++ loncom/interface/lonhtmlcommon.pm 2009/01/22 14:44:40 1.200
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.192 2008/12/05 10:23:56 bisitz Exp $
+# $Id: lonhtmlcommon.pm,v 1.200 2009/01/22 14:44:40 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1278,6 +1278,8 @@ Inputs: $component (the large text on th
$menulink (boolean, controls whether to include a link to /adm/menu)
$helplink (if 'nohelp' don't include the orange help link)
$css_class (optional name for the class to apply to the table for CSS)
+ $no_mt (optional flag, 1 if &mt() is _not_ to be applied to $component
+ when including the text on the right.
Returns a string containing breadcrumbs for the current page.
=item clear_breadcrumbs
@@ -1303,17 +1305,18 @@ returns: nothing
my @Crumbs;
sub breadcrumbs {
- my ($component,$component_help,$menulink,$helplink,$css_class) = @_;
+ my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt) = @_;
#
$css_class ||= 'LC_breadcrumbs';
- my $Str = "\n".'
';
+ my $Str1 = '';
+ my $Str = '';
#
# Make the faq and bug data cascade
my $faq = '';
my $bug = '';
my $help='';
# Crumb Symbol
- my $crumbsymbol = ' ▶ ';
+ my $crumbsymbol = '▶ ';
# The last breadcrumb does not have a link, so handle it separately.
my $last = pop(@Crumbs);
#
@@ -1336,8 +1339,8 @@ returns: nothing
no_mt =>$no_mt_descr,
});
}
- my $links .=
- join($crumbsymbol,
+ my $links .= '
'.
+ join('
'.$crumbsymbol,
map {
$faq = $_->{'faq'} if (exists($_->{'faq'}));
$bug = $_->{'bug'} if (exists($_->{'bug'}));
@@ -1355,12 +1358,12 @@ returns: nothing
}
$result;
} @Crumbs
- );
- $links .= $crumbsymbol if ($links ne '');
+ ).'
';
+ $links .= '
'.$crumbsymbol if ($links ne '');
if ($last->{'no_mt'}) {
- $links .= ''.$last->{'text'}.'';
+ $links .= ''.$last->{'text'}.'
'."\n";
#
# Return the @Crumbs stack to what we started with
push(@Crumbs,$last);
shift(@Crumbs);
#
- return $Str;
+ return "$Str\n$Str1";
}
sub clear_breadcrumbs {
@@ -1465,6 +1472,9 @@ returns: nothing
# routines, but can also be called directly to start and end rows which have
# needs that are not accommodated by the *_select_row() routines.
+{ # Start: row_count block for pick_box
+my @row_count;
+
sub start_pick_box {
my ($css_class) = @_;
if (defined($css_class)) {
@@ -1472,6 +1482,7 @@ sub start_pick_box {
} else {
$css_class= 'class="LC_pick_box"';
}
+ unshift(@row_count,0);
my $output = <<"END";
END
@@ -1479,6 +1490,7 @@ END
}
sub end_pick_box {
+ shift(@row_count);
my $output = <<"END";
END
@@ -1493,12 +1505,13 @@ END
}
sub row_title {
+ $row_count[0]++;
+ my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
my ($title,$css_title_class,$css_value_class) = @_;
$css_title_class ||= 'LC_pick_box_title';
$css_title_class = 'class="'.$css_title_class.'"';
$css_value_class ||= 'LC_pick_box_value';
- $css_value_class = 'class="'.$css_value_class.'"';
if ($title ne '') {
$title .= ':';
@@ -1508,7 +1521,7 @@ sub row_title {
$title
-
+
ENDONE
return $output;
}
@@ -1530,6 +1543,9 @@ ENDTWO
return $output;
}
+} # End: row_count block for pick_box
+
+
sub role_select_row {
my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;
my $output;
@@ -1537,7 +1553,7 @@ sub role_select_row {
$output = &row_title($title,$css_class);
}
$output .= qq|
-