[Rt-commit] r14574 - in rtfm/trunk: .

[falcone at bestpractical.com]

Author: falcone
Date: Mon Jul 28 12:29:25 2008
New Revision: 14574

Modified:
   rtfm/trunk/   (props changed)
   rtfm/trunk/html/RTFM/Topics.html

Log:
 r36291 at ketch:  falcone | 2008-07-28 12:29:19 -0400
 * add back the showall link to show articles in a topic
 * make the H2 of the article list more obvious
 * let you see articles in higher level topics


Modified: rtfm/trunk/html/RTFM/Topics.html
==============================================================================
--- rtfm/trunk/html/RTFM/Topics.html	(original)
+++ rtfm/trunk/html/RTFM/Topics.html	Mon Jul 28 12:29:25 2008
@@ -127,7 +127,7 @@
 
 % if (@articles) {
 %   if ($id) {
-<h2><&|/l&>Articles in this topic</&></h2>
+<h2><&|/l, $currtopic->Name&>Articles in [_1]</&></h2>
 %   } elsif ($class) {
 <h2><&|/l&>Articles with no topics</&></h2>
 %   }
@@ -136,11 +136,8 @@
 <li><a href="Article/Display.html?id=<% $a->Id %>"><% $a->Name || loc("(no name)") %></a></li>
 %   }
 </ul>
-% } else {
-%#<i><&|/l&>No articles found in this topic</&></i>
 % }
 
-
 <%init>
 my @Actions;
 my $Classes;
@@ -241,7 +238,7 @@
         my $topic_info = $topic->Name() || loc("(no name)");
         $topic_info .= ": " . $topic->Description() if $topic->Description;
 
-        if ($haschild) {
+        if ($haschild) { # has topics below it
             $query  = "Topics.html?id=" . $topic->Id . "&class=" . $currclass_id;
             $output = qq(<li><a href="$query">$topic_info</a>);
         } else {
@@ -252,7 +249,9 @@
         $Articles->Limit( FIELD => 'ObjectType', VALUE => 'RT::FM::Article' );
         $Articles->Limit( FIELD => 'Topic',      VALUE => $topic->Id );
         if ( $Articles->Count ) {
-            $output .= " (" . loc( "[quant,_1,article]", $Articles->Count ) . ")"
+            my $article_text = " (" . loc( "[quant,_1,article]", $Articles->Count ) . ")";
+            my $query  = "Topics.html?id=" . $topic->Id . "&class=$currclass_id&showall=1";
+            $output .= qq(<a href="$query">$article_text</a>);
         }
 
         $output .= "</li>\n";