--- loncom/interface/lonhelper.pm	2008/12/21 16:24:49	1.166.2.2
+++ loncom/interface/lonhelper.pm	2008/12/06 12:49:18	1.167
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.166.2.2 2008/12/21 16:24:49 raeburn Exp $
+# $Id: lonhelper.pm,v 1.167 2008/12/06 12:49:18 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -624,9 +624,9 @@ HEADER
             $result .= "<a href=\"$returnPage\">" . &mt("End Helper") . "</a>";
         }
         else {
-            $result .= '<span class="LC_nobreak"><input name="back" type="button" ';
+            $result .= '<nobr><input name="back" type="button" ';
             $result .= 'value="' . $previous . '" onclick="history.go(-1)" /> ';
-            $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></span>';
+            $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></nobr>';
         }
     }
 
@@ -643,9 +643,9 @@ HEADER
             $result .= "<a href=\"$returnPage\">" . &mt('End Helper') . "</a>";
         }
         else {
-            $result .= '<span class="LC_nobreak"><input name="back" type="button" ';
+            $result .= '<nobr><input name="back" type="button" ';
             $result .= 'value="' . $previous . '" onclick="history.go(-1)" /> ';
-            $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></span>';
+            $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></nobr>';
         }
     }
 
@@ -3633,7 +3633,7 @@ sub render {
     
     # Print the granularity, depending on the action
     if ($vars->{GRANULARITY} eq 'whole_course') {
-        $resourceString .= '<li>'.&mt('for <b>all resources in the course</b>').'</li>';
+        $resourceString .= '<li>'.&mt('for [_1]all resources in the course[_2]','<b>','</b>').'</li>';
 	if ($vars->{TARGETS} eq 'course') {
 	    $level = 14; # general course, see lonparmset.pm perldoc
 	} elsif ($vars->{TARGETS} eq 'section') {
@@ -3648,16 +3648,10 @@ sub render {
         $paramlevel = 'general';
     } elsif ($vars->{GRANULARITY} eq 'map') {
         my $navmap = Apache::lonnavmaps::navmap->new();
-        if (defined($navmap)) {
-             my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
-             my $title = $res->compTitle();
-             $symb = $res->symb();
-             $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
-        } else {
-            $resourceString .= '<li>'.&mt('for the map ID [_1] (name unavailable)','<b>'.$vars->{RESOURCE_ID}.'</b>').'</li>';
-            &Apache::lonnet::logthis('Retrieval of map title failed in lonhelper.pm - could not create navmap object for course.');
-
-        }
+        my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
+        my $title = $res->compTitle();
+        $symb = $res->symb();
+        $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
 	if ($vars->{TARGETS} eq 'course') {
 	    $level = 13; # general course, see lonparmset.pm perldoc
 	} elsif ($vars->{TARGETS} eq 'section') {
@@ -3670,18 +3664,13 @@ sub render {
         $affectedResourceId = $vars->{RESOURCE_ID};
         $paramlevel = 'map';
     } else {
+        my $navmap = Apache::lonnavmaps::navmap->new();
+        my $res = $navmap->getById($vars->{RESOURCE_ID});
         my $part = $vars->{RESOURCE_ID_part};
 	if ($part ne 'All Parts' && $part) { $parm_name=~s/^0/$part/; } else { $part=&mt('All Parts'); }
-        my $navmap = Apache::lonnavmaps::navmap->new();
-        if (defined($navmap)) {
-            my $res = $navmap->getById($vars->{RESOURCE_ID});
-            $symb = $res->symb();
-            my $title = $res->compTitle();
-            $resourceString .= '<li>'.&mt('for the resource named [_1] part [_2]',"<b>$title</b>","<b>$part</b>").'</li>';
-        } else {
-            $resourceString .= '<li>'.&mt('for the resource ID [_1] (name unavailable) part [_2]','<b>'.$vars->{RESOURCE_ID}.'</b>',"<b>$part</b>").'</li>';
-            &Apache::lonnet::logthis('Retrieval of resource title failed in lonhelper.pm - could not create navmap object for course.');
-        }
+        $symb = $res->symb();
+        my $title = $res->compTitle();
+        $resourceString .= '<li>'.&mt('for the resource named [_1] part [_2]',"<b>$title</b>","<b>$part</b>").'</li>';
 	if ($vars->{TARGETS} eq 'course') {
 	    $level = 10; # general course, see lonparmset.pm perldoc
 	} elsif ($vars->{TARGETS} eq 'section') {
@@ -3760,7 +3749,7 @@ sub render {
     
     # Print targets
     if ($vars->{TARGETS} eq 'course') {
-        $result .= '<li>'.&mt('for <b>all students in course</b>').'</li>';
+        $result .= '<li>'.&mt('for [_1]all students in course[_2]','<b>','</b>').'</li>';
     } elsif ($vars->{TARGETS} eq 'section') {
         my $section = $vars->{SECTION_NAME};
         $result .= '<li>'.&mt('for section [_1]',"<b>$section</b>").'</li>';