--- loncom/interface/lonsyllabus.pm 2006/03/06 22:17:48 1.45
+++ loncom/interface/lonsyllabus.pm 2006/03/15 19:41:26 1.48
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.45 2006/03/06 22:17:48 www Exp $
+# $Id: lonsyllabus.pm,v 1.48 2006/03/15 19:41:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,38 +41,97 @@ use Apache::lonspeller();
sub handler {
my $r = shift;
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ return OK if $r->header_only;
+ my $target=$env{'form.grade_target'};
# --------------------------------------------------- Get course info from URL
my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
+# ------------------------------------------------------------ Get query string
+ &Apache::loncommon::get_unprocessed_cgi
+ ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit','wrapperdisplay']);
# ----------------------------------------------------- Is this even a course?
my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
if ($homeserver eq 'no_host') {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- $r->print('
'.&mt('No syllabus available').'');
+ $r->print(&Apache::loncommon::startpage('No syllabus available').
+ &mt('No syllabus available').
+ &Apache::loncommon::end_page());
return OK;
}
# ------------------------------------- There is such a course, get environment
my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
-
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- return OK if $r->header_only;
+
# ------------------------------------------------------------ Print the screen
- my $target=$env{'form.grade_target'};
- my $feedurl='feed://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss';
+ my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss';
if ($target ne 'tex') {
my $html=&Apache::lonxml::xmlbegin();
+ my $head=&Apache::loncommon::headtag('The LearningOnline Network with CAPA');
$r->print(<
-The LearningOnline Network with CAPA
+$head
ENDDOCUMENT
} else {
$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
}
+# ----------------------------------------------------- Force menu registration
+ my $addentries='';
+ if ($env{'form.register'}) {
+ $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
+ '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
+ $r->print(&Apache::lonmenu::registerurl(1));
+ }
+# -------------------------------------------------- Let's see who handles this
+ my $externalsyllabus=$courseenv{'externalsyllabus'};
+ if ($externalsyllabus=~/\w/) {
+ $r->print(&Apache::loncommon::endheadtag());
+ if ($env{'form.wrapperdisplay'} eq 'menu') {
+#
+# Producing the menu buttons
+#
+ $r->print(''.
+ &Apache::lonmenu::menubuttons(1,'web',1).
+ &Apache::loncommon::end_page());
+ } else {
+ if ($env{'browser.interface'} eq 'textual') {
+#
+# ssi-based rendering for text-based interface
+#
+ $r->print(''.
+ &Apache::lonmenu::menubuttons(1).
+ &Apache::lonnet::ssi_body($externalsyllabus).
+ &Apache::loncommon::end_page());
+ } elsif ($env{'environment.remote'} eq 'off') {
+#
+# This is inline remote
+#
+ $r->print(<
+
+
+
+
+ENDDOCUMENTINL
+ } else {
+#
+# frame-based rendering for graphical interface
+#
+ $r->print(<
+
+
+
+
+ENDDOCUMENT
+ }
+ }
+ return OK;
+ }
+# ------------------------------ The buck stops here: internal syllabus display
# --------------------------------------------------------- The syllabus fields
my %syllabusfields=&Apache::lonlocal::texthash(
'aaa_instructorinfo' => 'Instructor Information',
@@ -90,17 +149,6 @@ ENDDOCUMENT
'jjj_weblinks' => 'Web Links',
'kkk_textbook' => 'Textbook',
'lll_includeurl' => 'URLs To Include in Syllabus');
-
-# ------------------------------------------------------------ Get query string
- &Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']);
-# ----------------------------------------------------- Force menu registration
- my $addentries='';
- if ($env{'form.register'}) {
- $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
- '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
- $r->print(&Apache::lonmenu::registerurl(1));
- }
# --------------------------------------------------------------- Force Student
my $forcestudent='';
if ($env{'form.forcestudent'}) { $forcestudent='student'; };
@@ -110,8 +158,8 @@ ENDDOCUMENT
# ----------------------------------------------------------------- Make header
if ($target ne 'tex') {
$r->print(&Apache::lonhtmlcommon::htmlareaheaders().
- ''.&Apache::loncommon::bodytag
- ("Syllabus",$forcestudent,$addentries,'',$cdom,$env{'form.register'}));
+ &Apache::loncommon::endheadtag().
+ &Apache::loncommon::bodytag("Syllabus",$forcestudent,$addentries,'',$cdom,$env{'form.register'}));
$r->print(''.$courseenv{'description'}.' '.
$Apache::lonnet::domaindescription{$cdom}.' ');
} else {
@@ -186,6 +234,7 @@ ENDDOCUMENT
.' http://'.
$Apache::lonnet::hostname{$homeserver}.$r->uri.' '.
&Apache::loncommon::help_open_topic('Syllabus_ExtLink').''.
+ ''.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').' ').'
'.
''.
&mt('Show Public View').' '.
&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
@@ -328,7 +377,11 @@ ENDDOCUMENT
$r->print('No syllabus information provided.');
if ($target ne 'tex') {$r->print('
');}
}
- if ($target ne 'tex') {$r->print('