--- loncom/interface/coursecatalog.pm	2010/10/07 14:45:04	1.53.4.7
+++ loncom/interface/coursecatalog.pm	2010/03/22 20:11:22	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.53.4.7 2010/10/07 14:45:04 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.59 2010/03/22 20:11:22 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -181,43 +181,24 @@ sub course_details {
              &courselink_javascript().'</script>'."\n";
     my $start_page =
         &Apache::loncommon::start_page('Course/Community Catalog',$js,
-                                           {
-                                             'add_entries' => \%add_entries,
-                                             'no_inline_link'   => 1,});
+                                           {'add_entries' => \%add_entries, });
     $r->print($start_page);
     if ($env{'form.numtitles'} > 0) {
         &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
                   text=>"Course/Community Catalog"});
     }
-    my $brtextone = 'Course listing';
-    my $brtexttwo = 'Course details';
-    if ($env{'form.currcat_0'} eq 'communities::0') {
-        $brtextone = 'Community listing';
-        $brtexttwo = 'Community details';
-    }
     &Apache::lonhtmlcommon::add_breadcrumb
              ({href=>"javascript:document.$formname.submit()",
-              text=>$brtextone},
-             {text=>$brtexttwo});
+              text=>"Course listing"},
+             {text=>"Course details"});
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
-    $r->print('<br />');
-    if ($env{'form.currcat_0'} eq 'communities::0') {
-        $r->print(&mt('Detailed community information:'));
-    } else {
-        $r->print(&mt('Detailed course information:'));
-    }
-    $r->print('<br /><br />'.
+    $r->print('<br />'.&mt('Detailed course information:').'<br /><br />'.
               &print_course_listing($codedom,undef,$trails,$allitems).
               '<br /><br />');
     $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
-              '<a href = "javascript:document.coursecatalog.submit()">');
-    if ($env{'form.currcat_0'} eq 'communities::0') {
-        $r->print(&mt('Back to community listing'));
-    } else {
-        $r->print(&mt('Back to course listing'));
-    }
-    $r->print('</a>'.
+              '<a href = "javascript:document.coursecatalog.submit()">'.
+              &mt('Back to course listing').'</a>'.
               &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
                                                        'showdetails','courseid']).'</form>');
     return;
@@ -306,24 +287,18 @@ sub instcode_course_selector {
 sub cat_header {
     my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_;
     my $start_page =
-        &Apache::loncommon::start_page('Course/Community Catalog',$js,
-                                       {
-                                         'add_entries' => $add_entries,
-                                         'no_inline_link'   => 1,});
+        &Apache::loncommon::start_page('Other',$js,
+                                       { 'add_entries' => $add_entries, });
     $r->print($start_page);
-    my $brtext = 'Course listing';
-    if ($env{'form.currcat_0'} eq 'communities::0') {
-        $brtext = 'Community listing';
-    }
     if ($env{'form.state'} eq 'listing') {
         if ($numtitles > 0) {
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
                   text=>"Course/Community Catalog"},
-                 {text=>$brtext});
+                 {text=>"Course listing"});
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb
-            ({text=>$brtext});
+            ({text=>"Course listing"});
         }
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb
@@ -332,7 +307,7 @@ sub cat_header {
     }
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
     my $onchange;
-    unless (($env{'browser.interface'} eq 'textual') || ($env{'form.interface'} eq 'textual')) {
+    unless ($env{'form.interface'} eq 'textual') {
         $onchange = 'this.form.submit()';
     }
     $r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
@@ -387,7 +362,7 @@ sub category_breadcrumbs {
     } else {
         $catlinks .= &mt('Official courses (with institutional codes)');
                      $env{'form.currcat_0'} = 'instcode::0';
-        $currcat_str .= '<input type="hidden" name="currcat_0" value="'.$env{'form.currcat_0'}.'" />';
+         $currcat_str .= '<input type="hidden" name="currcat_0" value="'.$env{'form.currcat_0'}.'" />';
     }
     if ($deeper) {
         for (my $i=1; $i<=$deeper; $i++) {
@@ -402,7 +377,7 @@ sub category_breadcrumbs {
                     $catlinks .= '<option value="">'.&mt('De-select').'</option>';
                     for (my $j=0; $j<@{$cats[$shallower]{$container}}; $j++) {
                         my $name = $cats[$shallower]{$container}[$j];
-                        my $item = &escape($name).':'.&escape($container).':'.$shallower;
+                        my $item = &escape($name).':'.$container.':'.$shallower;
                         my $selected = '';
                         if ($item eq $env{'form.currcat_'.$shallower}) {
                             $selected = ' selected="selected"';
@@ -655,11 +630,7 @@ sub print_course_listing {
                                                  $env{'form.coursenum'},
                                                  undef,undef,'.',1);
         if (keys(%courses) == 0) {
-            if ($env{'form.currcat_0'} eq 'communities::0') {
-                $output .= &mt('The courseID provided does not match a community in this domain.');
-            } else {
-                $output .= &mt('The courseID provided does not match a course in this domain.');
-            }
+            $output .= &mt('The courseID provided does not match a course in this domain.');
             return $output;
         }
     } else {
@@ -728,14 +699,10 @@ sub construct_data_table {
     }
     if ($knownuser) {
         if ($details) {
-            if ($env{'form.currcat_0'} eq 'communities::0') {
-                $output .= '<th>'.&mt('Default Access Dates for Members').'</th>';
-            } else {
-                $output .=
-                    '<th>'.&mt('Default Access Dates for Students').'</th>'.
-                    '<th>'.&mt('Student Counts').'</th>'.
-                    '<th>'.&mt('Auto-enrollment of[_1]registered students','<br />').'</th>';
-            }
+            $output .=
+              '<th>'.&mt('Default Access Dates for Students').'</th>'.
+              '<th>'.&mt('Student Counts').'</th>'.
+              '<th>'.&mt('Auto-enrollment of[_1]registered students','<br />').'</th>';
         } else {
             $output .= '<th>'.&mt('Details').'</th>';
         }
@@ -1004,14 +971,10 @@ sub courseinfo_row {
                '<td>'.$ownerlast.'</td>';
     if ($knownuser) {
         if ($details) {
-            if ($env{'form.currcat_0'} eq 'communities::0') {
-                $output .= '<td>'.$accessdates.'</td>';
-            } else {
-                $output .=
-                    '<td>'.$accessdates.'</td>'.
-                    '<td>'.$counts.'</td>'.
-                    '<td>'.$autoenrollment.'</td>';
-            }
+            $output .=
+               '<td>'.$accessdates.'</td>'. 
+               '<td>'.$counts.'</td>'.
+               '<td>'.$autoenrollment.'</td>';
         } else {
             $output .= "<td><a href=\"javascript:setCourseId('$cnum')\">".&mt('Show more details').'</a></td>';
         }