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

[raeburn]

raeburn		Mon Jan 25 20:56:41 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	lonmsgdisplay.pm 
  Log:
  - Remove two instances of extra trailing concatenators (added in 1.124.4.5).
  - Backport 1.142, 1.146.
  
  
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.124.4.5 loncom/interface/lonmsgdisplay.pm:1.124.4.6
--- loncom/interface/lonmsgdisplay.pm:1.124.4.5	Mon Jan 25 19:30:59 2010
+++ loncom/interface/lonmsgdisplay.pm	Mon Jan 25 20:56:40 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.124.4.5 2010/01/25 19:30:59 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.124.4.6 2010/01/25 20:56:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -532,7 +532,7 @@
             $bcc_curr_hdr = &mt('Bcc: course members with current access');
         }
         $result .= '<fieldset id="LC_activeusers"><legend>'
-                   .'<b>'.$bcc_curr_hdr.'</b>'.
+                   .'<b>'.$bcc_curr_hdr.'</b>'
                    .'</legend>'
                    .'<form name="activeusers">';
         $result .= $tmptext.'</form></fieldset><br />';
@@ -553,7 +553,7 @@
             $bcc_prev_hdr = &mt('Bcc: course members with expired access');
         }
         $result .= '<fieldset id="LC_previoususers"><legend>'
-                   .'<b>'.$bcc_prev_hdr.'</b>'.
+                   .'<b>'.$bcc_prev_hdr.'</b>'
                    .'</legend>'
                    .'<form name="previoususers">';
        $result .= $tmptext.'</form></fieldset><br />';
@@ -574,7 +574,7 @@
             $bcc_future_hdr = &mt('Bcc: course members with future access');
         }
         $result .= '<fieldset id="LC_futureusers"><legend>'
-                   .'<b>'.$bcc_future_hdr.'</b>'.
+                   .'<b>'.$bcc_future_hdr.'</b>'
                    .'</legend>'
                    .'<form name="futureusers">';
        $result .= $tmptext.'</form></fieldset>';
@@ -2195,7 +2195,7 @@
     <th>$ltext->{'setb'}</th>
     <th>$ltext->{'even'}</th>
     <th>$ltext->{'blck'}</th>
-    <th>$ltext->{'actn'}?</th>
+    <th>$ltext->{'actn'}</th>
   </tr>
 END
     foreach my $record (sort(keys(%{$records}))) {
@@ -2225,11 +2225,16 @@
             if ($blocks->{$block} eq 'on') {
                 $blockstatus = 'checked="checked"';
             }
-            $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');
+            $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label></span><br />');
         }
         $r->print(<<"END");
-        </td>      
-        <td><label>$lt{'modi'}?&nbsp;<input type="checkbox" name="modify_$parmcount" /></label><br /><label>$lt{'canc'}?&nbsp;&nbsp;<input type="checkbox" name="cancel_$parmcount" /></label>
+        </td>
+        <td><span class="LC_nobreak"><label>
+        <input type="checkbox" name="modify_$parmcount" />$lt{'modi'}
+        </label></span><br /><span class="LC_nobreak">
+        <label>
+        <input type="checkbox" name="cancel_$parmcount" />$lt{'canc'}
+        </label></span>
 END
         $r->print(&Apache::loncommon::end_data_table_row());
         $parmcount++;
@@ -2266,7 +2271,7 @@
      <th>$ltext->{'dura'}</th>
      <th>$ltext->{'even'} $lt{'exam'}</th>
      <th>$ltext->{'blck'}</th>
-     <th>$ltext->{'actn'}?</th>
+     <th>$ltext->{'actn'}</th>
    </tr>
 END
     $r->print(&Apache::loncommon::start_data_table_row());
@@ -2276,11 +2281,13 @@
      <td>
 END
     foreach my $block (@{$typeorder}) {
-        $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label><br />');
+        $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label></span><br />');
      }
      $r->print(<<"END");
-     </td> 
-     <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
+     </td>
+     <td><span class="LC_nobreak"><label>
+     <input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}
+     </label></span></td>
 END
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());