';
@@ -1227,6 +1361,8 @@ returns: nothing
my $faq = '';
my $bug = '';
my $help='';
+ # Crumb Symbol
+ my $crumbsymbol = '» ';
# The last breadcrumb does not have a link, so handle it separately.
my $last = pop(@Crumbs);
#
@@ -1234,20 +1370,23 @@ returns: nothing
if (!defined($menulink)) { $menulink=1; }
if ($menulink) {
my $description = 'Menu';
+ my $no_mt_descr = 0;
if (exists($env{'request.course.id'}) &&
$env{'request.course.id'} ne '') {
$description =
$env{'course.'.$env{'request.course.id'}.'.description'};
+ $no_mt_descr = 1;
}
unshift(@Crumbs,{
href =>'/adm/menu',
title =>'Go to main menu',
target =>'_top',
text =>$description,
+ no_mt =>$no_mt_descr,
});
}
my $links .=
- join('->',
+ join($crumbsymbol,
map {
$faq = $_->{'faq'} if (exists($_->{'faq'}));
$bug = $_->{'bug'} if (exists($_->{'bug'}));
@@ -1266,7 +1405,7 @@ returns: nothing
$result;
} @Crumbs
);
- $links .= '->' if ($links ne '');
+ $links .= $crumbsymbol if ($links ne '');
if ($last->{'no_mt'}) {
$links .= ''.$last->{'text'}.'';
} else {
@@ -1293,8 +1432,12 @@ returns: nothing
$Str .= $links.' | ';
#
if (defined($component)) {
- $Str .= ''.
- &mt($component);
+ $Str .= ' | ';
+ if ($no_mt) {
+ $Str .= $component;
+ } else {
+ $Str .= &mt($component);
+ }
if ($icons ne '') {
$Str .= ' '.$icons;
}
@@ -1333,7 +1476,7 @@ returns: nothing
# row1
# row2
# row3 ... etc.
-# &submit_row(0
+# &submit_row()
# &end_pick_box()
#
# where row1, row 2 etc. are chosen from &role_select_row,&course_select_row,
@@ -1375,6 +1518,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)) {
@@ -1382,6 +1528,7 @@ sub start_pick_box {
} else {
$css_class= 'class="LC_pick_box"';
}
+ unshift(@row_count,0);
my $output = <<"END";
END
@@ -1389,26 +1536,38 @@ END
}
sub end_pick_box {
+ shift(@row_count);
my $output = <<"END";
END
return $output;
}
+sub row_headline {
+ my $output = <<"END";
+ |
+END
+ return $output;
+}
+
sub row_title {
my ($title,$css_title_class,$css_value_class) = @_;
+ $row_count[0]++;
+ my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
$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 .= ':';
+ }
my $output = <<"ENDONE";
|
- $title:
+ $title
|
-
+ |
ENDONE
return $output;
}
@@ -1430,6 +1589,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;
@@ -1437,7 +1599,7 @@ sub role_select_row {
$output = &row_title($title,$css_class);
}
$output .= qq|
- |