--- test/html-webhacc/WebHACC/Result.pm	2008/07/21 05:24:32	1.3
+++ test/html-webhacc/WebHACC/Result.pm	2008/08/02 06:07:11	1.7
@@ -53,17 +53,7 @@
 
   my $class = qq[level-$error_level layer-$error_layer];
  
-  $out->start_tag ('dt', class => $class);
-  my $has_location;
-
-  ## URL
-  
-  if (defined $opt{url}) {
-    $out->url ($opt{url});
-    $has_location = 1;
-  }
-
-  ## Line & column number
+  ## Line & column numbers (prepare values)
 
   my $line;
   my $column;
@@ -72,7 +62,7 @@
     $line = $opt{node}->get_user_data ('manakai_source_line');
     if (defined $line) {
       $column = $opt{node}->get_user_data ('manakai_source_column');
-    } else {
+    } elsif ($opt{node}->isa ('Message::IF::Node')) {
       if ($opt{node}->node_type == $opt{node}->ATTRIBUTE_NODE) {
         my $owner = $opt{node}->owner_element;
         if ($owner) {
@@ -97,14 +87,33 @@
       $column = $opt{column};
     }
   }
+  $line = $line - 1 || 1
+      if defined $line and not (defined $column and $column > 0);
+
+  $out->start_tag ('dt', class => $class,
+                   'data-type' => $opt{type},
+                   'data-level' => $error_level,
+                   'data-layer' => $error_layer,
+                   ($line ? ('data-line' => $line) : ()),
+                   ($column ? ('data-column' => $column) : ()));
+  my $has_location;
+
+  ## URL
+  
+  if (defined $opt{url}) {
+    $out->url ($opt{url});
+    $has_location = 1;
+  }
+
+  ## Line & column numbers (real output)
  
   if (defined $line) {
     if (defined $column and $column > 0) {
-      $out->xref ('Line ' . $line, target => 'line-' . $line);
-      $out->text (' column ' . $column);
+      $out->xref ('Line #', text => $line, target => 'line-' . $line);
+      $out->text (' ');
+      $out->nl_text ('column #', text => $column);
     } else {
-      $line = $line - 1 || 1;
-      $out->xref ('Line ' . $line, target => 'line-' . $line);
+      $out->xref ('Line #', text => $line, target => 'line-' . $line);
     }
     $has_location = 1;
   }
@@ -120,10 +129,11 @@
   if (defined $opt{index}) {
     if ($opt{index_has_link}) {
       $out->html (' ');
-      $out->xref ('Index ' . (0+$opt{index}),
+      $out->xref ('Index #', text => (0+$opt{index}),
                   target => 'index-' . (0+$opt{index}));
     } else {
-      $out->text (' Index ' . (0+$opt{index}));
+      $out->html (' ');
+      $out->nl_text ('Index #', text => (0+$opt{index}));
     }
     $has_location = 1;
   }
@@ -152,24 +162,49 @@
     }
     
     unless ($has_location) {
-      $out->text ('No location information available');
+      $out->text ('Unknown location');
     }
   }
  
   $out->start_tag ('dd', class => $class);
-  $out->text ($error_type_text);
+
+  ## Error level
+  
+  if ($error_level eq 'm') {
+    $out->html (qq[<strong><a href="../error-description#level-m"><em class=rfc2119>MUST</em>-level
+        error</a></strong>: ]);
+  } elsif ($error_level eq 's') {
+    $out->html (qq[<strong><a href="../error-description#level-s"><em class=rfc2119>SHOULD</em>-level
+        error</a></strong>: ]);
+  } elsif ($error_level eq 'w') {
+    $out->html (qq[<strong><a href="../error-description#level-w">Warning</a></strong>: ]);
+  } elsif ($error_level eq 'u') {
+    $out->html (qq[<strong><a href="../error-description#level-u">Not
+        supported</a></strong>: ]);
+  } elsif ($error_level eq 'i') {
+    $out->html (qq[<strong><a href="../error-description#level-i">Information</a></strong>: ]);
+  }
+
+  ## Error message
+
+  $out->nl_text ($error_type_text, node => $opt{node}, text => $opt{text});
+
+  ## Additional error description
 
   if (defined $opt{text}) {
     $out->html (' (<q>');
     $out->text ($opt{text});
     $out->html ('</q>)');
   }
+  
+  ## Link to a long description
 
   my $fragment = $opt{type};
   $fragment =~ tr/ /-/;
   $fragment = $out->encode_url_component ($fragment);
   $out->text (' [');
-  $out->link ('Description', url => '../error-description#' . $fragment);
+  $out->link ('Description', url => '../error-description#' . $fragment,
+              rel => 'help');
   $out->text (']');
 
 
@@ -293,33 +328,4 @@
   $out->end_section;
 } # generate_result_section
 
-sub get_error_level_label ($) {
-  my $self = shift;
-  my $err = shift;
-
-  my $r = '';
-
-  if (not defined $err->{level} or $err->{level} eq 'm') {
-    $r = qq[<strong><a href="../error-description#level-m"><em class=rfc2119>MUST</em>-level
-        error</a></strong>: ];
-  } elsif ($err->{level} eq 's') {
-    $r = qq[<strong><a href="../error-description#level-s"><em class=rfc2119>SHOULD</em>-level
-        error</a></strong>: ];
-  } elsif ($err->{level} eq 'w') {
-    $r = qq[<strong><a href="../error-description#level-w">Warning</a></strong>:
-        ];
-  } elsif ($err->{level} eq 'u' or $err->{level} eq 'unsupported') {
-    $r = qq[<strong><a href="../error-description#level-u">Not
-        supported</a></strong>: ];
-  } elsif ($err->{level} eq 'i') {
-    $r = qq[<strong><a href="../error-description#level-i">Information</a></strong>: ];
-  } else {
-    my $elevel = htescape ($err->{level});
-    $r = qq[<strong><a href="../error-description#level-$elevel">$elevel</a></strong>:
-        ];
-  }
-
-  return $r;
-} # get_error_level_label
-
 1;