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

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 25 Apr 2006 23:12:34 -0000


albertel		Tue Apr 25 19:12:34 2006 EDT

  Modified files:              
    /loncom/interface	lonmsgdisplay.pm 
  Log:
  - switch nested tables to LC_data_table
  
  
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.15 loncom/interface/lonmsgdisplay.pm:1.16
--- loncom/interface/lonmsgdisplay.pm:1.15	Tue Apr 25 17:25:13 2006
+++ loncom/interface/lonmsgdisplay.pm	Tue Apr 25 19:12:34 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.15 2006/04/25 21:25:13 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.16 2006/04/25 23:12:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -612,7 +612,7 @@
     my $numblocked = 0;
     &blockcheck(\%setters,\$startblock,\$endblock);
     $r->print(<<ENDDISHEADER);
-<script>
+<script type="text/javascript">
     function checkall() {
 	for (i=0; i<document.forms.disall.elements.length; i++) {
             if 
@@ -1286,28 +1286,19 @@
 sub display_blocker_status {
     my ($r,$records,$ltext) = @_;
     my $parmcount = 0;
-    my @bgcols = ("#eeeeee","#dddddd");
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $env{'user.domain'});
+  
     my %lt = &Apache::lonlocal::texthash(
         'modi' => 'Modify',
         'canc' => 'Cancel',
     );
     $r->print(<<"END");
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="$color">
-        <td><b>$$ltext{'dura'}</b></td>
-        <td><b>$$ltext{'setb'}</b></td>
-        <td><b>$$ltext{'even'}</b></td>
-        <td><b>$$ltext{'actn'}?</b></td>
-       </tr>
+<table class="LC_data_table">
+  <tr>
+    <th>$$ltext{'dura'}</th>
+    <th>$$ltext{'setb'}</th>
+    <th>$$ltext{'even'}</th>
+    <th>$$ltext{'actn'}?</th>
+  </tr>
 END
     foreach (sort keys %{$records}) {
         my $iter = $parmcount%2;
@@ -1321,7 +1312,7 @@
 	my ($setuname,$setudom,$title) = &parse_block_record($$records{$_});
         my $settername = &Apache::loncommon::plainname($setuname,$setudom);
         $r->print(<<"END");
-       <tr bgcolor="$bgcols[$iter]">
+       <tr>
         <td>$$ltext{'star'}:&nbsp;$startform<br/>$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
         <td>$settername</td>
         <td><input type="text" name="title_$parmcount" size="15" value="$title" /><input type="hidden" name="key_$parmcount" value="$_" /></td>
@@ -1331,12 +1322,6 @@
         $parmcount ++;
     }
     $r->print(<<"END");
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
 </table>
 <br />
 <br />
@@ -1366,9 +1351,6 @@
                    'checked=true;"';
     my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange);
     my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $env{'user.domain'});
     my %lt = &Apache::lonlocal::texthash(
         'addb' => 'Add block',
         'exam' => 'e.g., Exam 1',
@@ -1376,30 +1358,18 @@
     );
     $r->print(<<"END");
 <h4>$lt{'addn'}</h4> 
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="#CCCCFF">
-        <td><b>$$ltext{'dura'}</b></td>
-        <td><b>$$ltext{'even'} $lt{'exam'}</b></td>
-        <td><b>$$ltext{'actn'}?</b></td>
-       </tr>
-       <tr bgcolor="#eeeeee">
-        <td>$$ltext{'star'}:&nbsp;$startform<br />$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
-        <td><input type="text" name="title_$parmcount" size="15" value="" /></td>
-        <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
+ <table class="LC_data_table">
+   <tr>
+     <th>$$ltext{'dura'}</th>
+     <th>$$ltext{'even'} $lt{'exam'}</th>
+     <th>$$ltext{'actn'}?</th>
+   </tr>
+   <tr>
+     <td>$$ltext{'star'}:&nbsp;$startform<br />$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
+     <td><input type="text" name="title_$parmcount" size="15" value="" /></td>
+     <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
+   </tr>
+  </table>
 END
     return;
 }
@@ -1453,9 +1423,6 @@
 
 sub build_block_table {
     my ($r,$startblock,$endblock,$setters) = @_;
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $env{'user.domain'});
     my %lt = &Apache::lonlocal::texthash(
         'cacb' => 'Currently active communication blocks',
         'cour' => 'Course',
@@ -1464,18 +1431,12 @@
     ); 
     $r->print(<<"END");
 <br /<br />$lt{'cacb'}:<br /><br />
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="$color">
-        <td><b>$lt{'cour'}</b></td>
-        <td><b>$lt{'dura'}</b></td>
-        <td><b>$lt{'blse'}</b></td>
-       </tr>
+<table class="LC_data_table">
+<tr>
+ <th>$lt{'cour'}</th>
+ <th>$lt{'dura'}</th>
+ <th>$lt{'blse'}</th>
+</tr>
 END
     foreach (keys %{$setters}) {
         my %courseinfo=&Apache::lonnet::coursedescription($_);
@@ -1491,7 +1452,7 @@
                       ')</td></tr>');
         }
     }
-    $r->print('</table></td></tr></table></td></tr></table>');
+    $r->print('</table>');
 }
 
 # ----------------------------------------------------------- Display a message