[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm lonhtmlcommon.pm

[bisitz]

bisitz		Sat Dec  6 17:29:34 2008 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonhtmlcommon.pm 
  Log:
  Introduce alternating light grey/dark grey background for pick_boxes
  - Use same logic as it is used for data_tables
  - Added missing padding style for even rows
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.708 loncom/interface/loncommon.pm:1.709
--- loncom/interface/loncommon.pm:1.708	Fri Dec  5 09:41:48 2008
+++ loncom/interface/loncommon.pm	Sat Dec  6 17:29:34 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.708 2008/12/05 09:41:48 bisitz Exp $
+# $Id: loncommon.pm,v 1.709 2008/12/06 17:29:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4698,13 +4698,16 @@
   font-size:90%;
 }
 table.LC_data_table tr.LC_odd_row > td, 
+table.LC_pick_box tr > td.LC_odd_row,
 table.LC_aboutme_port tr td {
   background-color: $data_table_light;
   padding: 2px;
 }
 table.LC_data_table tr.LC_even_row > td,
+table.LC_pick_box tr > td.LC_even_row,
 table.LC_aboutme_port tr.LC_even_row td {
   background-color: $data_table_dark;
+  padding: 2px;
 }
 table.LC_data_table tr.LC_data_table_highlight td {
   background-color: $data_table_darker;
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.192 loncom/interface/lonhtmlcommon.pm:1.193
--- loncom/interface/lonhtmlcommon.pm:1.192	Fri Dec  5 10:23:56 2008
+++ loncom/interface/lonhtmlcommon.pm	Sat Dec  6 17:29:34 2008
@@ -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.193 2008/12/06 17:29:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1465,6 +1465,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 +1475,7 @@
     } else {
 	$css_class= 'class="LC_pick_box"';
     }
+    unshift(@row_count,0);
     my $output = <<"END";
  <table $css_class>
 END
@@ -1479,6 +1483,7 @@
 }
 
 sub end_pick_box {
+    shift(@row_count);
     my $output = <<"END";
        </table>
 END
@@ -1493,12 +1498,13 @@
 }
 
 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 +1514,7 @@
             <td $css_title_class>
 	       $title
             </td>
-            <td $css_value_class>
+            <td class="$css_value_class $css_class">
 ENDONE
     return $output;
 }
@@ -1530,6 +1536,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;