debtags: Make HTML output more pretty

Don't look up the description on the debtags vocabulary in the script
but in the template. Split facet and tag in the script so that we can
merge together multiple tags with the same facet.

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 21bd9852d22019c3494eb69d17eba7ba9cece11d..0f760858f76b291e78594ab7d5130af524a4bb9b 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -119,8 +119,9 @@ sub do_show {
                        debug( "Data search and merging took ".timestr($std) ) if DEBUG;
 
                        my $did = $page->get_newest( 'description' );
-                       my @tags = map { [ $_, $debtags{$_} ] } split(/, /, $page->get_newest( 'tag' ));
+                       my @tags = map { [ split( /::/, $_) ] } split(/, /, $page->get_newest( 'tag' ));
                        $contents{tags} = \@tags;
+                       $contents{debtags_voc} = \%debtags;
 
                        $section = $page->get_newest( 'section' );
                        $contents{section} = $section;

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 43e5ca1c891690b3f5ca2f61170530607143188c..09befc44fcd631fc96e227036530f119c9fdade2 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -146,11 +146,18 @@ Do not install it on a normal Debian system.</p>
     <div id="ptags"><p>
     <a href="[% tags_url %]edit.html?pkg=[% pkg | uri %]">Tags</a>:
   [%- END %]
-  [% IF tag.1 %]
-  <a href="/about/debtags#[% string2id(tag.0) %]">[% tag.1 %]</a>[% ', ' UNLESS loop.last %]
+  [% facet = tag.0;
+     facet_name = debtags_voc.$facet;
+     tag_id = "$tag.0::$tag.1";
+     tag_name = debtags_voc.$tag_id;
+   %]
+  [% facet_name _ ': ' UNLESS old_facet && facet == old_facet %]
+  [% IF tag_name %]
+   <a href="/about/debtags#[% string2id(tag_id) %]">[% tag_name %]</a>[% ', ' UNLESS loop.last %]
   [% ELSE %]
-  [% tag.0 %][% ', ' UNLESS loop.last %]
+  [% tag_id %][% ', ' UNLESS loop.last %]
   [% END %]
+  [% old_facet = facet %]
   [% IF loop.last -%]
     </p>
     </div> <!-- end ptags -->