[LON-CAPA-cvs] cvs: loncom /interface lonmeta.pm

[bisitz]

bisitz		Tue Apr 21 15:23:18 2009 EDT

  Modified files:              
    /loncom/interface	lonmeta.pm 
  Log:
  Optimized screen output for dynamical metadata:
  - Now always show (same) sub headline
  - In case of no data: inform about this in separate text paragraph instead of different or no headline
  - Exception for error messages: Only show error paragraph, if errors exist (don't show "no errors" message anymore)
  - Added error style to error message headline
  - Moved info texts "visible to author and co-authors only" below headline instead of inclusion in headline
  - Added some comments
  
  
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.229 loncom/interface/lonmeta.pm:1.230
--- loncom/interface/lonmeta.pm:1.229	Sat Apr  4 20:06:37 2009
+++ loncom/interface/lonmeta.pm	Tue Apr 21 15:23:18 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.229 2009/04/04 20:06:37 bisitz Exp $
+# $Id: lonmeta.pm,v 1.230 2009/04/21 15:23:18 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -968,13 +968,13 @@
     my %dynmeta=&dynamicmeta($uri);
     #
     # General Access and Usage Statistics
+    $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>');
     if (exists($dynmeta{'count'}) ||
         exists($dynmeta{'sequsage'}) ||
         exists($dynmeta{'comefrom'}) ||
         exists($dynmeta{'goto'}) ||
         exists($dynmeta{'course'})) {
-        $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>'.
-                  &Apache::lonhtmlcommon::start_pick_box());
+        $r->print(&Apache::lonhtmlcommon::start_pick_box());
         my @counts = ('count','sequsage','sequsage_list',
                       'comefrom','comefrom_list','goto',
                       'goto_list','course','course_list');
@@ -990,7 +990,10 @@
         }
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
     } else {
-        $r->print('<h4>'.&mt('No Access or Usages Statistics are available for this resource.').'</h4>');
+        $r->print('<p>'
+                 .&mt('No Access or Usages Statistics are available for this resource.')
+                 .'</p>'
+        );
     }
     #
     # Assessment statistics
@@ -1021,12 +1024,13 @@
             }
             $r->print(&Apache::lonhtmlcommon::end_pick_box());
         }
+        #
+        # New assessment statistics
+        $r->print('<h4>'
+                 .&mt('Recent Detailed Assessment Statistical Data')
+                 .'</h4>'
+        );
         if (exists($dynmeta{'stats'})) {
-            #
-            # New assessment statistics
-            $r->print('<h4>'.
-                      &mt('Recent Detailed Assessment Statistical Data').
-                      '</h4>');
             my $table=&Apache::loncommon::start_data_table()
                      .&Apache::loncommon::start_data_table_header_row()
                      .'<th>'.&mt('Course').'</th>'
@@ -1072,7 +1076,10 @@
             $table .= &Apache::loncommon::end_data_table().$/;
             $r->print($table);
         } else {
-            $r->print(&mt('No new dynamic data found.'));
+            $r->print('<p>'
+                     .&mt('No new dynamic data found.')
+                     .'</p>'
+            );
         }
     } else {
         $r->print('<h4>'.
@@ -1081,14 +1088,14 @@
     }
 
     #
-    #
+    # Evaluation Data
+    $r->print('<h4>'.&mt('Evaluation Data').'</h4>');
     if (exists($dynmeta{'clear'})   || 
         exists($dynmeta{'depth'})   || 
         exists($dynmeta{'helpful'}) || 
         exists($dynmeta{'correct'}) || 
         exists($dynmeta{'technical'})){ 
-        $r->print('<h4>'.&mt('Evaluation Data').'</h4>'.
-                  &Apache::lonhtmlcommon::start_pick_box());
+        $r->print(&Apache::lonhtmlcommon::start_pick_box());
         my @criteria = ('clear','depth','helpful','correct','technical');
         my $rownum = 0;
         foreach my $item (@criteria) {
@@ -1102,27 +1109,40 @@
         }
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
     } else {
-        $r->print('<h4>'.&mt('No Evaluation Data is available for this resource.').'</h4>');
+        $r->print('<p>'
+                 .&mt('No Evaluation Data is available for this resource.')
+                 .'</p>'
+        );
     }
+    # Evaluation Comments
     $uri=~/^\/res\/($match_domain)\/($match_username)\//; 
     if ((($env{'user.domain'} eq $1) && ($env{'user.name'} eq $2))
         || ($env{'user.role.ca./'.$1.'/'.$2})) {
+        $r->print('<h4>'.&mt('Evaluation Comments').'</h4>'
+                 .'<div>('
+                 .&mt('visible to author and co-authors only')
+                 .')</div>'
+        );
         if (exists($dynmeta{'comments'})) {
-            $r->print('<h4>'.&mt('Evaluation Comments').' ('.
-                      &mt('visible to author and co-authors only').
-                      ')</h4>'.
-                      '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
+            $r->print('<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
         } else {
-            $r->print('<h4>'.&mt('There are no Evaluation Comments on this resource.').'</h4>');
+            $r->print('<p>'
+                     .&mt('There are no Evaluation Comments on this resource.')
+                     .'</p>'
+            );
         }
         my $bombs = &Apache::lonmsg::retrieve_author_res_msg($uri);
         if (defined($bombs) && $bombs ne '') {
-            $r->print('<a name="bombs" /><h4>'.&mt('Error Messages').' ('.
-                      &mt('visible to author and co-authors only').')'.
-                      '</h4>'.$bombs);
-        } else {
-            $r->print('<h4>'.&mt('There are currently no Error Messages for this resource.').'</h4>');
-        }
+            $r->print('<a name="bombs" />'
+                     .'<h4 class="LC_error">'.&mt('Error Messages').'</h4>'
+                     .'<div>('
+                     .&mt('visible to author and co-authors only')
+                     .')</div>'
+                     .$bombs
+            );
+        } #else {
+        #    $r->print('<h4>'.&mt('There are currently no Error Messages for this resource.').'</h4>');
+        #}
     }
     #
     # All other stuff