--- loncom/interface/lonmeta.pm	2009/12/01 18:07:50	1.237
+++ loncom/interface/lonmeta.pm	2012/10/29 17:38:56	1.247
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.237 2009/12/01 18:07:50 bisitz Exp $
+# $Id: lonmeta.pm,v 1.247 2012/10/29 17:38:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -638,7 +638,7 @@ sub prettyinput {
             
             if ($values) {
                 if ($only_one) {
-                    $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,%meta_options));
+                    $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,\%meta_options));
                 } else {
                     $output .= (&Apache::loncommon::multiple_select_form('new_'.$type,\@cur_values_inst,undef,\%meta_options));
                 }
@@ -744,8 +744,14 @@ sub prettyinput {
 
 # Create pageheader
 sub pageheader {
-    my $output = &Apache::lonhtmlcommon::breadcrumbs();
-
+    my $output = '';
+    # No CSTR? Include breadcrumbs
+    if ($env{'request.state'} ne 'construct') {
+        # loncommon::bodytag already includes breadcrumbs for CSTR
+        # by calling lonmenu::innerregister
+        $output = &Apache::lonhtmlcommon::breadcrumbs();
+    }
+    # CSTR? Include CSTR header
     if ($env{'request.state'} eq 'construct') {
           $output .= &Apache::loncommon::head_subbox(
                          &Apache::loncommon::CSTR_pageheader());
@@ -773,7 +779,7 @@ sub handler {
     if ($env{'request.state'} eq 'construct') {
         &Apache::lonhtmlcommon::add_breadcrumb({
             'text'  => 'Construction Space',
-            'href'  => &Apache::loncommon::authorspace(),
+            'href'  => &Apache::loncommon::authorspace($uri),
         });
     }
 
@@ -822,7 +828,7 @@ sub handler {
 						 {'domain' => $resdomain,}));
         $r->print(&pageheader());
         &present_editable_metadata($r,$uri,'groups');    
-    } elsif ($uri=~m|^/~|) { 
+    } elsif ($uri=~m|^/priv|) { 
         # Construction space
         &Apache::lonhtmlcommon::add_breadcrumb({
             'text'  => 'Edit Metadata',
@@ -840,10 +846,14 @@ sub handler {
             'text'  => 'Metadata',
             'href'  => '',
         });
-        $r->print(&Apache::loncommon::start_page('Metadata',
-						 undef,
-						 {'domain' => $resdomain,}));
-        $r->print(&pageheader());
+        $r->print(
+            &Apache::loncommon::start_page(
+                'Metadata',
+                undef,
+                {'domain' => $resdomain,
+                'only_body' => 1,})
+           .'<h1>'.&mt('Metadata').'</h1>'
+        );
         &present_uneditable_metadata($r,$uri);
     }
     $r->print(&Apache::loncommon::end_page());
@@ -864,20 +874,44 @@ sub report_bombs {
     $uri = &Apache::lonnet::declutter($uri);
     $r->print('<h1>'.&Apache::lonnet::clutter($uri).'</h1>');
     my ($domain,$author)=($uri=~/^($match_domain)\/($match_username)\//);
-    if (&Apache::loncacc::constructaccess('/~'.$author.'/',$domain)) {
-	if ($env{'form.clearbombs'}) {
-	    &Apache::lonmsg::clear_author_res_msg($uri);
-	}
-        my $clear=&mt('Clear all Messages in Subdirectory');
-        my $cancel=&mt('Back to Directory');
-        my $cancelurl=$uri;
-        $cancelurl=~s/^\Q$domain\E/\/priv/;
-        $r->print(<<ENDCLEAR);
-<form method="post">
-<input type="submit" name="clearbombs" value="$clear" />
-<a href="$cancelurl">$cancel</a>
-</form><hr />
-ENDCLEAR
+    if (!&Apache::lonnet::constructaccess('/priv/'.$domain.'/'.$author.'/')) {
+        $r->print('<p class="LC_error">'.&mt('Not authorized').'</p>');
+        return;
+    }
+
+    my $showbuttons=1;
+    my $message='';
+    if ($env{'form.clearbombs'}) {
+        my $rc=&Apache::lonmsg::clear_author_res_msg($uri);
+        if ($rc eq 'ok') {
+                $message=&Apache::lonhtmlcommon::confirm_success(
+                    &mt('Messages cleared.'));
+                $showbuttons=0;
+        } else {
+                $message=&Apache::lonhtmlcommon::confirm_success(
+                             &mt('Error clearing messages'),1)
+                        .'<br />'.&mt('Error: [_1]',$rc);
+        }
+    }
+
+    if ($message) {    
+        $message=&Apache::loncommon::confirmwrapper($message);
+        $r->print($message);
+    }
+
+    my $cancelurl=$uri;
+    $cancelurl=~s/^\Q$domain\E/\/priv\/$domain/;
+
+    if ($showbuttons) {
+        $r->print(
+            '<form method="post" action="">'.
+            '<input type="submit" name="clearbombs" value="'.
+                &mt('Clear all Messages in Subdirectory').'" />'.
+            ' <a href="'.$cancelurl.'">'.
+                &mt('Back to Source Directory').'</a>'.
+            '</form><hr />'
+        );
+        # Display all bombs of subdirectory
         my %brokenurls = 
             &Apache::lonmsg::all_url_author_res_msg($author,$domain);
         foreach my $key (sort(keys(%brokenurls))) {
@@ -889,7 +923,12 @@ ENDCLEAR
             }
         }
     } else {
-        $r->print(&mt('Not authorized'));
+            my $functions=&Apache::lonhtmlcommon::start_funclist('Actions');
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                            '<a href="'.$cancelurl.'">'.
+                            &mt('Back to Source Directory').'</a>');
+            $functions .= &Apache::lonhtmlcommon::end_funclist();
+            $r->print('<p>'.$functions.'</p>');
     }
     return;
 }
@@ -1043,7 +1082,7 @@ sub print_dynamic_metadata {
     }
     #
     # Assessment statistics
-    if ($uri=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+    if ($uri=~/$LONCAPA::assess_re/) {
         if (exists($dynmeta{'stdno'}) ||
             exists($dynmeta{'avetries'}) ||
             exists($dynmeta{'difficulty'}) ||
@@ -1082,6 +1121,7 @@ sub print_dynamic_metadata {
                      .'<th>'.&mt('Course').'</th>'
                      .'<th>'.&mt('Section(s)').'</th>'
                      .'<th>'.&mt('Num Students').'</th>'
+                     .'<th>'.&mt('Part').'</th>'
                      .'<th>'.&mt('Mean Tries').'</th>'
                      .'<th>'.&mt('Degree of Difficulty').'</th>'
                      .'<th>'.&mt('Degree of Discrimination').'</th>'
@@ -1104,6 +1144,8 @@ sub print_dynamic_metadata {
                     '<td align="right">'.$data->{'sections'}.'</td>';
                 $table .=
                     '<td align="right">'.$data->{'stdno'}.'</td>';
+                $table .=
+                    '<td align="right">'.$data->{'part'}.'</td>';
                 foreach my $item ('avetries','difficulty','disc') {
                     $table .= '<td align="right">';
                     if (exists($data->{$item})) {
@@ -1180,7 +1222,7 @@ sub print_dynamic_metadata {
         my $bombs = &Apache::lonmsg::retrieve_author_res_msg($uri);
         if (defined($bombs) && $bombs ne '') {
             $r->print('<a name="bombs" />'
-                     .'<h4 class="LC_error">'.&mt('Error Messages').'</h4>'
+                     .'<h4 class="LC_warning">'.&mt('Error Messages').'</h4>'
                      .'<div>('
                      .&mt('visible to author and co-authors only')
                      .')</div>'
@@ -1263,47 +1305,66 @@ sub present_editable_metadata {
     $target=~s/\.meta$//;
     my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
     if ($bombs) {
-        my $showdel=1;
+        # Display Bombs, not Metadata
+        $r->print("<h1>$disuri</h1>");
+        my $showbuttons=1;
+        my $message='';
+        my $rc='';
         if ($env{'form.delmsg'}) {
-            if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') {
-                $bombs=&mt('Messages deleted.');
-		$showdel=0;
+            $rc=&Apache::lonmsg::del_url_author_res_msg($target);
+            if ($rc eq 'ok') {
+                $message=&Apache::lonhtmlcommon::confirm_success(
+                             &mt('Messages deleted.'));
+		$showbuttons=0;
             } else {
-                $bombs=&mt('Error deleting messages');
+                $message=&Apache::lonhtmlcommon::confirm_success(
+                             &mt('Error deleting messages'), 1)
+                        .'<br />'.&mt('Error: [_1]',$rc);
             }
         }
         if ($env{'form.clearmsg'}) {
 	    my $cleardir=$target;
-	    $cleardir=~s/\/[^\/]+$/\//;
-            if (&Apache::lonmsg::clear_author_res_msg($cleardir) eq 'ok') {
-                $bombs=&mt('Messages cleared.');
-		$showdel=0;
+	    $cleardir=~s/\/[^\/]+$/\//; # Extract dir: keep path, remove filename
+            $rc=&Apache::lonmsg::clear_author_res_msg($cleardir);
+            if ($rc eq 'ok') {
+                $message=&Apache::lonhtmlcommon::confirm_success(
+                    &mt('Messages cleared.'));
+		$showbuttons=0;
             } else {
-                $bombs=&mt('Error clearing messages');
+                $message=&Apache::lonhtmlcommon::confirm_success(
+                             &mt('Error clearing messages'),1)
+                        .'<br />'.&mt('Error: [_1]',$rc);
             }
         }
-        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(<<ENDBOMBS);
-<h1>$disuri</h1>
-<form method="post" action="" name="defaultmeta">
-ENDBOMBS
-        if ($showdel) {
-	    $r->print(<<ENDDEL);
-<input type="submit" name="delmsg" value="$del" />
-<input type="submit" name="clearmsg" value="$clear" />
-ENDDEL
+        if ($message) {
+            $message=&Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
+        }
+
+        $r->print('<form method="post" action="" name="defaultmeta">');
+        if ($showbuttons) {
+            $r->print(
+                '<input type="submit" name="delmsg" value="'.
+                &mt('Delete Messages for this Resource').'" />'.
+                '<input type="submit" name="clearmsg" value="'.
+                &mt('Clear all Messages in Subdirectory').'" />'
+               .'<br />'.$bombs
+            );
         } else {
-            $r->print('<p><a href="'.$disuri.'">'.$goback.'</a></p>');
-	    if ($env{'form.clearmsg'}) {
-		my ($diruri) = ($disuri =~ m{(.*/)[^/]*});
-		$r->print('<p><a href="'.$diruri.'">'.
-			  &mt('Back To Directory').'</a></p>');
-	    }
-	}
-	$r->print('<br />'.$bombs);
+            my $functions=&Apache::lonhtmlcommon::start_funclist('Actions');
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                            '<a href="'.$disuri.'">'.
+                            &mt('Back to Source File').'</a>');
+            my ($diruri) = ($disuri =~ m{(.*/)[^/]*});
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                            '<a href="'.$diruri.'">'.
+                            &mt('Back to Source Directory').'</a>');
+            $functions .= &Apache::lonhtmlcommon::end_funclist();
+            $r->print('<p>'.$functions.'</p>');
+        }
     } else {
+
+        # Display Metadata, not Bombs
         my $displayfile=&mt('Metadata for [_1]',$disuri);
         if ($disuri=~/\/default$/) {
             my $dir=$disuri;