[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /homework structuretags.pm

[raeburn]

raeburn		Thu Dec 11 04:54:32 2008 EDT

  Modified files:              (Branch: version_2_8_X)
    /loncom/homework	structuretags.pm 
  Log:
  - Backport 1.436, 1.437.
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.434 loncom/homework/structuretags.pm:1.434.2.1
--- loncom/homework/structuretags.pm:1.434	Mon Nov 10 11:44:54 2008
+++ loncom/homework/structuretags.pm	Thu Dec 11 04:54:32 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.434 2008/11/10 11:44:54 foxr Exp $
+# $Id: structuretags.pm,v 1.434.2.1 2008/12/11 04:54:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1295,7 +1295,7 @@
 	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $include = $token->[2]->{'include'};
 	my $exclude = $token->[2]->{'exclude'};
-        my @preferred_languages=&Apache::loncommon::preferred_languages();
+        my @preferred_languages=&Apache::lonlocal::preferred_languages();
 # This should not even happen, since we should at least have the server language
         if (!$preferred_languages[0]) { $preferred_languages[0]='en'; }
 # Now loop over all languages in order of preference
@@ -1907,10 +1907,10 @@
 	my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
 	$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
 
-	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>
-<td>".&mt('Delete:').
-                 &Apache::edit::deletelist($target,$token)
-		 ."</td>";
+	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>"
+                 .'<td><span clas="LC_nobreak">'.&mt('Delete?').' '
+                 .&Apache::edit::deletelist($target,$token)
+                 .'</span></td>';
         unless ($env{'environment.wysiwygeditor'} eq 'on') {
 	    $result .= '<td align="left">'
 		.&Apache::lonhtmlcommon::dragmath_button($areaid,1)