--- loncom/interface/coursecatalog.pm 2006/10/12 23:15:33 1.6
+++ loncom/interface/coursecatalog.pm 2006/10/16 19:39:51 1.7
@@ -28,11 +28,11 @@ use strict;
use lib qw(/home/httpd/lib/perl);
use Apache::Constants qw(:common);
use Apache::loncommon;
+use Apache::lonhtmlcommon;
use Apache::lonnet;
use Apache::lonlocal;
use Apache::courseclassifier;
use Apache::lonacc;
-use lib '/home/httpd/lib/perl/';
use LONCAPA;
sub handler {
@@ -46,6 +46,52 @@ sub handler {
&Apache::lonlocal::get_language_handle($r);
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sortby']);
my $codedom = $Apache::lonnet::perlvar{'lonDefDomain'};
+ my $formname = 'coursecatalog';
+ my $domdesc = $Apache::lonnet::domaindescription{$codedom};
+
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ if ($env{'form.coursenum'} ne '') {
+ &course_details($r,$codedom,$formname,$domdesc);
+ } else {
+ &course_selector($r,$codedom,$formname,$domdesc);
+ if ($env{'form.state'} eq 'listing') {
+ $r->print('
'.&print_course_listing($codedom).'
');
+ }
+ }
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+}
+
+sub course_details {
+ my ($r,$codedom,$formname,$domdesc) = @_;
+ my $output;
+ my %add_entries = (topmargin => "0",
+ marginheight => "0",);
+ my $start_page =
+ &Apache::loncommon::start_page('Course Catalog','',
+ {
+ 'add_entries' => \%add_entries,
+ 'no_inline_link' => 1,});
+ $r->print($start_page);
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Select courses"},
+ {href=>"javascript:document.$formname.submit()",
+ text=>"Course listing"},
+ {text=>"Course details"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Details'));
+ $r->print('
'.&mt('Detailed course information:').'
'.
+ '
');
+}
+
+sub course_selector {
+ my ($r,$codedom,$formname,$domdesc) = @_;
my %coursecodes = ();
my %codes = ();
my @codetitles = ();
@@ -63,8 +109,6 @@ sub handler {
my $totcodes = 0;
my $jscript = '';
my ($numtitles,$lasttitle);
- my $formname = 'coursecatalog';
- my $domdesc = $Apache::lonnet::domaindescription{$codedom};
$totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom,$totcodes);
if ($totcodes > 0) {
$format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
@@ -83,7 +127,7 @@ sub handler {
for (my $k=0; $k<$lasttitle; $k++) {
my $cat = $codetitles[$k];
my $level = 1;
- $level = &recurse_options($codetitles[$k],$idlist{$codetitles[$k]},$level,$cat,\%cat_items,\@data,\%by_year,\%by_sem,\%by_dept); }
+ $level = &recurse_options($codetitles[$k],$idlist{$codetitles[$k]},$level,$cat,\%cat_items,\@data,\%by_year,\%by_sem,\%by_dept); }
$scripttext .= &build_javascript(\%by_year,\%by_sem,\%by_dept,\%cat_order,\@codetitles);
$jscript .= &javascript_select_filler($formname,$scripttext,\@codetitles,$longtitles_str,$allidlist);
}
@@ -115,25 +159,42 @@ function setElements() {
$jscript .= '}';
$jscript .= qq|
function changeSort(caller) {
- document.coursecatalog.sortby.value = caller;
- document.coursecatalog.submit();
+ document.$formname.sortby.value = caller;
+ document.$formname.submit();
+}
+function setCourseId(caller) {
+ document.$formname.coursenum.value = caller;
+ document.$formname.submit();
}\n|;
}
my $js = '';
my %add_entries = (topmargin => "0",
- marginheight => "0",
- onLoad =>"setElements()",);
+ marginheight => "0",);
+ if ($env{'form.state'} eq 'listing') {
+ $add_entries{'onLoad'} = 'setElements()';
+ }
my $start_page =
&Apache::loncommon::start_page('Course Catalog',$js,
- {
+ {
'add_entries' => \%add_entries,
'no_inline_link' => 1,});
$r->print($start_page);
-
+ if ($env{'form.state'} eq 'listing') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Select courses"},
+ {text=>"Course listing"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing'));
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Select courses"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses'));
+ }
$r->print(''.&mt('Display information about official [_1] classes for which LON-CAPA courses have been created:',$domdesc).'
');
$r->print(&mt('Choose which course(s) to list.
'));
- $r->print('