--- loncom/interface/lonmeta.pm 2006/01/04 05:43:19 1.150
+++ loncom/interface/lonmeta.pm 2006/03/16 22:12:17 1.153
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.150 2006/01/04 05:43:19 albertel Exp $
+# $Id: lonmeta.pm,v 1.153 2006/03/16 22:12:17 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -71,7 +71,7 @@ sub get_dynamic_metadata_from_sql {
if (! defined($authordom) || ! defined($author)) {
return ();
}
- my @Fields = ('url','count','course',
+ my @Fields = ('url','count','course','course_list',
'goto','goto_list',
'comefrom','comefrom_list',
'sequsage','sequsage_list',
@@ -447,7 +447,7 @@ sub prettyprint {
($type eq 'comefrom_list') ||
($type eq 'sequsage_list') ||
($type eq 'dependencies')) {
- return '<ul><font size="-1">'.join("\n",map {
+ return '<font size="-1"><ul>'.join("\n",map {
my $url = &Apache::lonnet::clutter($_);
my $title = &Apache::lonnet::gettitle($url);
if ($title eq '') {
@@ -484,18 +484,17 @@ sub prettyprint {
# List of courses
if ($type=~/\_list/) {
my @Courses = split(/\s*\,\s*/,$value);
- my $Str;
+ my $Str='<font size="-1"><ul>';
foreach my $course (@Courses) {
my %courseinfo = &Apache::lonnet::coursedescription($course);
if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') {
next;
}
- if ($Str ne '') { $Str .= '<br />'; }
- $Str .= '<a href="/public/'.$courseinfo{'domain'}.'/'.
+ $Str .= '<li><a href="/public/'.$courseinfo{'domain'}.'/'.
$courseinfo{'num'}.'/syllabus" target="preview">'.
- $courseinfo{'description'}.'</a>';
+ $courseinfo{'description'}.'</a></li>';
}
- return $Str;
+ return $Str.'</ul></font>';
}
# No pretty print found
return $value;
@@ -702,19 +701,17 @@ sub handler {
#
my ($resdomain,$resuser)=
(&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
- my $html=&Apache::lonxml::xmlbegin();
- $r->print($html.'<head><title>'.
- 'Catalog Information'.
- '</title></head>');
+
if ($uri=~m:/adm/bombs/(.*)$:) {
- $r->print(&Apache::loncommon::bodytag('Error Messages'));
+ $r->print(&Apache::loncommon::start_page('Error Messages'));
# Looking for all bombs?
&report_bombs($r,$uri);
} elsif ($uri=~/\/portfolio\//) {
($resdomain,$resuser)=
(&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);
- $r->print(&Apache::loncommon::bodytag
- ('Edit Portfolio File Information','','','',$resdomain));
+ $r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information',
+ undef,
+ {'domain' => $resdomain,}));
if ($env{'form.store'}) {
&present_editable_metadata($r,$uri,'portfolio');
} else {
@@ -722,15 +719,17 @@ sub handler {
}
} elsif ($uri=~/^\/\~/) {
# Construction space
- $r->print(&Apache::loncommon::bodytag
- ('Edit Catalog Information','','','',$resdomain));
+ $r->print(&Apache::loncommon::start_page('Edit Catalog nformation',
+ undef,
+ {'domain' => $resdomain,}));
&present_editable_metadata($r,$uri);
} else {
- $r->print(&Apache::loncommon::bodytag
- ('Catalog Information','','','',$resdomain));
+ $r->print(&Apache::loncommon::start_page('Catalog Information',
+ undef,
+ {'domain' => $resdomain,}));
&present_uneditable_metadata($r,$uri);
}
- $r->print('</body></html>');
+ $r->print(&Apache::loncommon::end_page());
return OK;
}
@@ -794,6 +793,7 @@ sub present_uneditable_metadata {
my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
$uri=~s/\.meta$//;
my $disuri=&Apache::lonnet::clutter($uri);
+ $disuri=~s/^\/adm\/wrapper//;
# version
my $currentversion=&Apache::lonnet::getversion($disuri);
my $versiondisplay='';