[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonhtmlcommon.pm
raeburn
raeburn@source.lon-capa.org
Wed, 20 May 2009 21:32:53 -0000
raeburn Wed May 20 21:32:53 2009 EDT
Modified files: (Branch: version_2_9_X)
/loncom/interface lonhtmlcommon.pm
Log:
- Backport 1.193, 1.197, 1.198, 1.204, 1.206, 1.208, 1.209, 1.211.
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.182 loncom/interface/lonhtmlcommon.pm:1.182.4.1
--- loncom/interface/lonhtmlcommon.pm:1.182 Tue Oct 7 10:13:58 2008
+++ loncom/interface/lonhtmlcommon.pm Wed May 20 21:32:53 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.182 2008/10/07 10:13:58 foxr Exp $
+# $Id: lonhtmlcommon.pm,v 1.182.4.1 2009/05/20 21:32:53 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -62,6 +62,31 @@
use Apache::lonnet;
use LONCAPA;
+##############################################
+##############################################
+
+=pod
+
+=item confirm_success
+
+Successful completion of an operation message
+
+=cut
+
+sub confirm_success {
+ my ($message,$failure)=@_;
+ if ($failure) {
+ return '<span class="LC_error">'."\n"
+ .'<img src="/adm/lonIcons/navmap.wrong.gif" /> '."\n"
+ .$message."\n"
+ .'</span>'."\n";
+ } else {
+ return '<span class="LC_success">'."\n"
+ .'<img src="/adm/lonIcons/navmap.correct.gif" /> '."\n"
+ .$message."\n"
+ .'</span>'."\n";
+ }
+}
##############################################
##############################################
@@ -285,7 +310,7 @@
$Str .= 'value="'.$value.'"';
}
if ($checked) {
- $Str .= ' checked="1"';
+ $Str .= ' checked="checked"';
}
$Str .= ' />';
return $Str;
@@ -307,7 +332,7 @@
$Str .= 'value="'.$value.'"';
}
if ($checked eq $value) {
- $Str .= ' checked="1"';
+ $Str .= ' checked="checked"';
}
$Str .= ' />';
return $Str;
@@ -1303,7 +1328,7 @@
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".'<table class="'.$css_class.'"><tr><td>';
@@ -1313,7 +1338,7 @@
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);
#
@@ -1383,8 +1408,12 @@
$Str .= $links.'</td>';
#
if (defined($component)) {
- $Str .= '<td class="'.$css_class.'_component">'.
- &mt($component);
+ $Str .= '<td class="'.$css_class.'_component">';
+ if ($no_mt) {
+ $Str .= $component;
+ } else {
+ $Str .= &mt($component);
+ }
if ($icons ne '') {
$Str .= ' '.$icons;
}
@@ -1465,6 +1494,9 @@
# 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 +1504,7 @@
} else {
$css_class= 'class="LC_pick_box"';
}
+ unshift(@row_count,0);
my $output = <<"END";
<table $css_class>
END
@@ -1479,6 +1512,7 @@
}
sub end_pick_box {
+ shift(@row_count);
my $output = <<"END";
</table>
END
@@ -1494,11 +1528,12 @@
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 .= ':';
@@ -1508,7 +1543,7 @@
<td $css_title_class>
$title
</td>
- <td $css_value_class>
+ <td class="$css_value_class $css_class">
ENDONE
return $output;
}
@@ -1530,6 +1565,9 @@
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 +1575,7 @@
$output = &row_title($title,$css_class);
}
$output .= qq|
- <select name="roles" multiple >\n|;
+ <select name="roles" multiple="multiple" >\n|;
foreach my $role (@$roles) {
my $plrole;
if ($role eq 'ow') {
@@ -1664,7 +1702,7 @@
$output = &row_title($title,$css_class,'LC_pick_box_select');
}
$output .= qq|
- <select name="types" multiple>\n|;
+ <select name="types" multiple="multiple">\n|;
foreach my $status_type (sort(keys(%{$types}))) {
$output .= ' <option value="'.$status_type.'">'.$$types{$status_type}.'</option>';
}