--- loncom/interface/lonmeta.pm 2005/07/08 10:39:49 1.98 +++ loncom/interface/lonmeta.pm 2005/07/15 12:57:53 1.100 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.98 2005/07/08 10:39:49 www Exp $ +# $Id: lonmeta.pm,v 1.100 2005/07/15 12:57:53 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -17,7 +17,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU General Public License # along with LON-CAPA; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # @@ -33,7 +33,7 @@ use LONCAPA::lonmetadata(); use Apache::Constants qw(:common); use Apache::lonnet; use Apache::loncommon(); -use Apache::lonhtmlcommon(); +use Apache::lonhtmlcommon(); use Apache::lonmsg; use Apache::lonpublisher; use Apache::lonlocal; @@ -288,6 +288,27 @@ sub fieldnames { return &Apache::lonlocal::texthash(%fields); } +sub select_course { + my ($r)=@_; + $r->print('

Instructor Selected Meta-Data


'); + $r->print('
'); + $r->print('Select your course
'.$env{'user.domain'}); + $r->print(''); + $r->print('
'); + + foreach my $key (keys %env) { + if ($key =~ /\.metadata\./) { + $r->print(''); + } + } + $r->print('
'); + $r->print(''); + $r->print(''); + return 'ok'; +} # Pretty printing of metadata field sub prettyprint { @@ -548,6 +569,7 @@ sub handler { $r->print(&Apache::loncommon::bodytag ('Edit Portfolio File Information','','','',$resdomain)); &present_editable_metadata($r,$uri,'portfolio'); + &select_course($r); } elsif ($uri=~/^\/\~/) { # Construction space @@ -903,9 +925,11 @@ sub present_editable_metadata { $target=~s/\.meta$//; my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target); if ($bombs) { + my $showdel=1; if ($env{'form.delmsg'}) { if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') { $bombs=&mt('Messages deleted.'); + $showdel=0; } else { $bombs=&mt('Error deleting messages'); } @@ -915,19 +939,27 @@ sub present_editable_metadata { $cleardir=~s/\/[^\/]+$/\//; if (&Apache::lonmsg::clear_author_res_msg($cleardir) eq 'ok') { $bombs=&mt('Messages cleared.'); + $showdel=0; } else { $bombs=&mt('Error clearing messages'); } } my $del=&mt('Delete Messages for this Resource'); my $clear=&mt('Clear all Messages in Subdirectory'); + my $goback=&mt('Back to Source File'); $r->print(<$disuri
+ENDBOMBS + if ($showdel) { + $r->print(< -
$bombs -ENDBOMBS +ENDDEL + } else { + $r->print(''.$goback.''); + } + $r->print('
'.$bombs); } else { my $displayfile='Catalog Information for '.$disuri; if ($disuri=~/\/default$/) {