[Rt-commit] r3469 - in rtfm/branches/2.1-TESTING: . html/RTFM html/RTFM/Article

[alexmv at bestpractical.com]

Author: alexmv
Date: Wed Jul 13 15:51:56 2005
New Revision: 3469

Modified:
   rtfm/branches/2.1-TESTING/   (props changed)
   rtfm/branches/2.1-TESTING/html/RTFM/Article/Search.html
   rtfm/branches/2.1-TESTING/html/RTFM/Topics.html
Log:
 r5017 at zoq-fot-pik:  chmrr | 2005-07-13 15:53:17 -0400
  * Show count of articles in topic browsing
  * Rework pre-search page to be loc'd and like pre-create page


Modified: rtfm/branches/2.1-TESTING/html/RTFM/Article/Search.html
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Article/Search.html	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Article/Search.html	Wed Jul 13 15:51:56 2005
@@ -22,10 +22,9 @@
 %   my $Classes=new RT::FM::ClassCollection($session{'CurrentUser'});
 %   $Classes->UnLimit;
 
-<&|/l&>Select a class to search:</&>
 <ul>
 % while (my $class = $Classes->Next) {
-<li><a href="<%$RT::WebPath%>/RTFM/Article/Search.html?<% $m->comp('/Elements/QueryString', %filtered, Class => $class->id) %>"><% $class->Name %></a></li>
+<li><a href="<%$RT::WebPath%>/RTFM/Article/Search.html?<% $m->comp('/Elements/QueryString', %filtered, Class => $class->id) %>"><&|/l, $class->Name&>in class [_1]</&></a></li>
 % }  
 </ul>
 

Modified: rtfm/branches/2.1-TESTING/html/RTFM/Topics.html
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Topics.html	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Topics.html	Wed Jul 13 15:51:56 2005
@@ -175,6 +175,11 @@
 	$output .= ": " . $topic->Description() if $topic->Description();
 	$output .= "</a>";
 	
+        my $Articles = RT::FM::ObjectTopicCollection->new($session{'CurrentUser'});
+        $Articles->Limit(FIELD => 'ObjectType', VALUE => 'RT::FM::Article');
+        $Articles->Limit(FIELD => 'Topic', VALUE => $topic->Id);
+        $output .= " (".loc("[quant,_1,article]", $Articles->Count).")" if $Articles->Count;
+
 	if ($haschild) {
         #  Commented out by Jesse, since it seems confusing
         #