[BACK]Return to coursecatalog.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/coursecatalog.pm between versions 1.40 and 1.41

version 1.40, 2008/07/15 19:43:15 version 1.41, 2008/07/17 12:00:28
Line 113  function setCourseId(caller) { Line 113  function setCourseId(caller) {
 }  }
   
 ENDSCRIPT  ENDSCRIPT
         $catjs .= &syllabus_javascript();           $catjs .= &courselink_javascript(); 
         my $numtitles;          my $numtitles;
         if ($env{'form.currcat_0'} eq 'instcode::0') {          if ($env{'form.currcat_0'} eq 'instcode::0') {
             $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,              $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
Line 158  sub course_details { Line 158  sub course_details {
     my %add_entries = (topmargin    => "0",      my %add_entries = (topmargin    => "0",
                        marginheight => "0",);                         marginheight => "0",);
     my $js = '<script type="text/javascript">'."\n".      my $js = '<script type="text/javascript">'."\n".
              &syllabus_javascript().'</script>'."\n";               &courselink_javascript().'</script>'."\n";
     my $start_page =      my $start_page =
         &Apache::loncommon::start_page('Course Catalog',$js,          &Apache::loncommon::start_page('Course Catalog',$js,
                                            {                                             {
Line 181  sub course_details { Line 181  sub course_details {
     $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.      $r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
               '<a href = "javascript:document.coursecatalog.submit()">'.                '<a href = "javascript:document.coursecatalog.submit()">'.
               &mt('Back to course listing').'</a>'.                &mt('Back to course listing').'</a>'.
               &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter','showdetails']).'</form>');                &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter',
                                                          'showdetails','courseid']).'</form>');
     return;      return;
 }  }
   
 sub syllabus_javascript {  sub courselink_javascript {
     return <<"END";      return <<"END";
   
 function ToSyllabus(cdom,cnum) {  function ToSyllabus(cdom,cnum) {
Line 195  function ToSyllabus(cdom,cnum) { Line 196  function ToSyllabus(cdom,cnum) {
     if (cnum == '' || cnum == null) {      if (cnum == '' || cnum == null) {
         return;          return;
     }      }
     document.syllabuslaunch.action = "/public/"+cdom+"/"+cnum+"/syllabus";      document.linklaunch.action = "/public/"+cdom+"/"+cnum+"/syllabus";
     document.syllabuslaunch.submit();      document.linklaunch.submit();
   }
   
   function ToSelfenroll(courseid) {
       if (courseid == '') {
           return;
       }
       document.linklaunch.action = "/adm/selfenroll";
       document.linklaunch.courseid.value = courseid;
       document.linklaunch.submit();
 }  }
   
 END  END
Line 755  sub print_course_listing { Line 765  sub print_course_listing {
     my %domconfig =      my %domconfig =
         &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);          &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
     $output .= &construct_data_table($knownuser,\%courses,$details,undef,$now,\%domconfig,$trails,$allitems);      $output .= &construct_data_table($knownuser,\%courses,$details,undef,$now,\%domconfig,$trails,$allitems);
     $output .= "\n".'<form name="syllabuslaunch" method="post" action="">'.      $output .= "\n".'<form name="linklaunch" method="post" action="">'.
                '<input type="hidden" name="backto" value="coursecatalog" />'.                 '<input type="hidden" name="backto" value="coursecatalog" />'.
                &Apache::lonhtmlcommon::echo_form_input(['catalogfilter']).'</form>';                 '<input type="hidden" name="courseid" value="" />'.
                  &Apache::lonhtmlcommon::echo_form_input(['catalogfilter','courseid']).'</form>';
     return $output;      return $output;
 }  }
   
Line 1084  sub courseinfo_row { Line 1095  sub courseinfo_row {
             if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) {              if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) {
                 $output .= '<td>'.&mt('Starts: [_1]','<span class="LC_cusr_emph">'.$showstart.'</span>').'<br />'.&mt('Ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>').'</td>';                  $output .= '<td>'.&mt('Starts: [_1]','<span class="LC_cusr_emph">'.$showstart.'</span>').'<br />'.&mt('Ends: [_1]','<span class="LC_cusr_emph">'.$showend.'</span>').'</td>';
             } else {               } else { 
                 $output .= '<td><a href="/adm/selfenroll?cid='.$course.'">'.&mt('Enroll in course').'</a></td>';                  $output .= '<td><a href="javascript:ToSelfenroll('."'$course'".')">'.&mt('Enroll in course').'</a></td>';
             }              }
             $selfenroll = 1;              $selfenroll = 1;
         }          }
Removed from v.1.40  
changed lines
  Added in v.1.41

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>